graphics/tuxpaint: Updated for version 0.9.31.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

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

3 files changed, 7 insertions, 50 deletions

diff --git a/graphics/tuxpaint/README b/graphics/tuxpaint/README
index 8d4a427dac96..9efd841a1ccc 100644
--- a/graphics/tuxpaint/README
+++ b/graphics/tuxpaint/README
@@ -8,10 +8,3 @@ a very limited tool-set. However, it provides a much simpler interface,
 and has entertaining, child-oriented additions such as sound effects.
 tuxpaint-config is now also included as a gui tool to configure
 tuxpaint.
-
-Note: Please uninstall inkscape before creating this package if you
-want to avoid a couple of file artifacts outside the package directory.
-inkscape can be reinstalled once this package is created.
-This is the sdl2 version of the program. Note: dependencies have changed
-note: this build update (3) is needed for using SDL2_Pango>0.9.0
-
diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild
index 93e023b6e0ca..59d095be6bfa 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -4,27 +4,18 @@
 
 # Written by Pablo Santamaria (pablosantamaria@gmail.com)
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
-# Taken over maintenance (and some updates) by Tim Dickson (dickson.tim@googlemail.com)
+# re-written by Tim Dickson (dickson.tim@googlemail.com)
 # added tuxpaint-config 2019-02-11
 
-# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
-# - update for v0.9.27 and config v0.0.18.
-# - fix parallel builds.
-# - stop spamming the real /usr (ugh).
-# 20220610  tim dickson: updated to 0.9.28 . sticking with sdl1 version for now
-# 20220629 tim dickson: changed to the sdl2 version
-# 20220820 tim dickson: added patch to work with newer SDL2_Pango. should be fixed upstream in next release
-# 20230111 bkw: Modified by SlackBuilds.org: BUILD=4, just to force a
-# rebuild after libunibreak update to 5.1.
-# 20230407 tim: update to 0.9.29 and 0.0.20
-# 20230519 tim: update to 0.9.31 and 0.0.22
+# previous update history cleaned out.
+# 29239721 tun: update to 0.9.31 and 0.0.22 (fixed upstream makefile)
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tuxpaint
 VERSION=${VERSION:-0.9.31}
 CONFVER=${CONFVER:-0.0.22}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -64,12 +55,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-sdl2
+rm -rf $PRGNAM-$VERSION
 rm -rf $PRGNAM-config-$CONFVER
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-#prevent out-of-tree file if inkscape is installed
-export INKSCAPE_PROFILE_DIR=${pwd}/.tmp.inkscape
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,12 +66,6 @@ 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 {} \+
 
-# 20220226 bkw: FFS, do NOT attempt to install icons and .desktop
-# using the xdg-icon-resource and xdg-desktop-menu tools: these don't
-# support DESTDIR or any other way to control where the files get
-# installed (meaning they install to the real /usr, not $PKG/usr).
-sed -i '/^linux_ARCH_INSTALL/s,install-xdg ,,' Makefile
-
 make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
 make \
   MAN_PREFIX=$PKG/usr/man \
@@ -91,23 +74,11 @@ make \
   DEVDOC_PREFIX=$PKG/usr/doc/$PRGNAM-$VERSION \
   PREFIX=/usr \
   LIBDIRSUFFIX=$LIBDIRSUFFIX \
+  PACKAGE_ONLY=yes \
   DESTDIR=$PKG \
   install
 
 mv $PKG/etc/tuxpaint/tuxpaint.conf $PKG/etc/tuxpaint/tuxpaint.conf.new
-mkdir -p $PKG/usr/share/applications
-cp src/$PRGNAM.desktop $PKG/usr/share/applications/
-
-# 20220226 bkw: install the icons correctly, to $PKG. Not only were
-# they going to the real /usr, they were incorrectly named!
-for i in data/images/icon*x*.png; do
-  px="$( basename $i | cut -dx -f2 | cut -d. -f1 )"
-  size=${px}x${px}
-  dir=$PKG/usr/share/icons/hicolor/$size/apps
-  mkdir -p $dir
-  cp -a $i $dir/$PRGNAM.png
-done
-
 #
 #now for tuxpaint-config
 #
@@ -115,11 +86,6 @@ cd ..
 tar xvf $CWD/$PRGNAM-config-$CONFVER.tar.gz
 cd $PRGNAM-config-$CONFVER
 
-# 20220226 bkw: fix parallel builds.
-mkdir trans
-#fix X11 location
-sed -i 's_X11R6/i_/i_g' Makefile
-
 make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
 make \
   MAN_PREFIX=/usr/man \
@@ -137,8 +103,6 @@ chmod 0644 $PKG/usr/man/*/*/tuxpaint.1.gz
 chmod 0644 $PKG/usr/man/man1/*.gz
 find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \+ 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-#remove binary plugin examples that shouldn't be in doc, and unneeded install doc.
-rm -f $PKG/usr/doc/$PRGNAM-$VERSION/en/*.so $PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.txt
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index 3ada62e1382b..541efc98756f 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,6 +1,6 @@
 PRGNAM="tuxpaint"
 VERSION="0.9.31"
-HOMEPAGE="http://www.tuxpaint.org"
+HOMEPAGE="https://www.tuxpaint.org"
 DOWNLOAD="https://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.31.tar.gz \
           https://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.22.tar.gz"
 MD5SUM="af0877815de9f5ea0c8de1cd95710b6c \