graphics/mtpaint: Updated for version 3.49.29.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 35 deletions

diff --git a/graphics/mtpaint/README b/graphics/mtpaint/README
index ac2825e45a..14a8a222ae 100644
--- a/graphics/mtpaint/README
+++ b/graphics/mtpaint/README
@@ -7,6 +7,7 @@ painting and palette manipulation tools. It also can handle JPEG, GIF,
 TIFF, BMP, XPM, and XBM files.
 
 NOTES:
-mtPaint comes with its own file and color selector widgets. To use the
-GTK default ones, pass TKWIDGETS=yes to the script. If you want this
-to build as a GTK1 app, pass GTK1=yes
+If you want this to build as a GTK3 app, pass GTK3=yes. mtPaint comes
+with its own file and color selector widgets. To use the GTK2 default
+ones, pass TKWIDGETS=yes to the script. This will have no effect with
+GTK3=yes.
diff --git a/graphics/mtpaint/mtpaint.SlackBuild b/graphics/mtpaint/mtpaint.SlackBuild
index ecffc07a7e..a9fcdd8169 100644
--- a/graphics/mtpaint/mtpaint.SlackBuild
+++ b/graphics/mtpaint/mtpaint.SlackBuild
@@ -24,10 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mtpaint
-VERSION=${VERSION:-3.40}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-3.49.29}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+DIRVER=mtPaint
+COMMIT=ff0a801413e612f74fe4c5d251e4bf36c6628013
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -55,8 +58,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "$GTK1" = yes ]; then
-  GTK1=gtk1
+if [ "$GTK3" = yes ]; then
+  GTK3=gtk3
 fi
 
 if [ "$TKWIDGETS" = yes ]; then
@@ -68,10 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
-unzip $CWD/${PRGNAM}_handbook-$VERSION.zip
+rm -rf $DIRVER-$VERSION
+tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz
+cd $DIRVER-$COMMIT
 
 chown -R root:root .
 find -L . \
@@ -80,22 +82,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Bring deprecated function call into conformance with libpng14
-sed -i 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c
-
-# Fix build with giflib-5.1 (thanks to Arch)
-sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c
-sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c
-sed -i 's:EGifCloseFile(giffy):EGifCloseFile(giffy, NULL):g' src/png.c
-sed -i 's:DGifCloseFile(giffy):DGifCloseFile(giffy, NULL):g' src/png.c
-sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c
-sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c
-
 # If you do not want the international language support, remove 'intl'
 # from the line below.
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure cflags intl man $GTK1 $TKWIDGETS \
+./configure cflags intl man $GTK3 $TKWIDGETS \
   --prefix=/usr \
   --mandir=/usr/man/man1 \
   --docdir=/usr/doc/$PRGNAM-$VERSION
@@ -103,12 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
-# Install the handbook
-cd ${PRGNAM}_handbook-$VERSION
-make DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION install
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION/COPYING.handbook
-cd ..
-
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a NEWS README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/mtpaint/mtpaint.info b/graphics/mtpaint/mtpaint.info
index 3727894968..b4f8b4e6d4 100644
--- a/graphics/mtpaint/mtpaint.info
+++ b/graphics/mtpaint/mtpaint.info
@@ -1,10 +1,8 @@
 PRGNAM="mtpaint"
-VERSION="3.40"
-HOMEPAGE="http://mtpaint.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/mtpaint/mtpaint-3.40.tar.bz2 \
-          http://downloads.sourceforge.net/mtpaint/mtpaint_handbook-3.40.zip"
-MD5SUM="957c8035dd62c6bfdb594cd0a4467d22 \
-        d375790c951a90329e708c6ffc517b44"
+VERSION="3.49.29"
+HOMEPAGE="https://github.com/wjaguar/mtPaint/"
+DOWNLOAD="https://github.com/wjaguar/mtPaint/archive/ff0a801/mtpaint-ff0a801413e612f74fe4c5d251e4bf36c6628013.tar.gz"
+MD5SUM="d4c526bd7f2ee4d4ac68340f461f5dfa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""