graphics/tuxpaint: Updated for version 0.9.29.

Signed-off-by: bedlam <dave@slackbuilds.org>

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

3 files changed, 11 insertions, 32 deletions

diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild
index c9fbc1d73e2ca..bee7ee83aec6c 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -16,13 +16,14 @@
 # 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
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tuxpaint
-VERSION=${VERSION:-0.9.28}
-CONFVER=${CONFVER:-0.0.19}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-0.9.29}
+CONFVER=${CONFVER:-0.0.20}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -64,8 +65,8 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION-sdl2
 rm -rf $PRGNAM-config-$CONFVER
-tar xvf $CWD/$PRGNAM-$VERSION-sdl2.tar.gz
-cd $PRGNAM-$VERSION-sdl2
+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 .
@@ -83,9 +84,6 @@ mkdir trans
 # support DESTDIR or any other way to control where the files get
 # installed (meaning they install to the real /usr, not $PKG/usr).
 
-#patch to fix working with newer SDL2_Pango. remove for next version update
-patch <$CWD/tuxpaint_SDL2_Pango.patch
-
 sed -i '/^linux_ARCH_INSTALL/s,install-xdg ,,' Makefile
 
 make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index c89e9609eedff..64ac53a79a414 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,10 +1,10 @@
 PRGNAM="tuxpaint"
-VERSION="0.9.28"
+VERSION="0.9.29"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.28-sdl2.tar.gz \
-          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.19.tar.gz"
-MD5SUM="267cc6280b66bd32d77133e3562f8da4 \
-        f732341c88761e756581264960553198"
+DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.29.tar.gz \
+          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.20.tar.gz"
+MD5SUM="c8efd4768204627e5c0e4b33034dd0eb \
+        4573eb54293060c02f86d4b4623481f8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libpaper SDL2_Pango fltk pngquant libunibreak"
diff --git a/graphics/tuxpaint/tuxpaint_SDL2_Pango.patch b/graphics/tuxpaint/tuxpaint_SDL2_Pango.patch
deleted file mode 100644
index 11011b49fefb8..0000000000000
--- a/graphics/tuxpaint/tuxpaint_SDL2_Pango.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -294,6 +294,7 @@
- 
- # SDL Pango is needed to render complex scripts like Thai and Arabic
- SDL2_PANGO_LIB:=$(call linktest,SDL2_Pango,-lSDL2_Pango,$(SDL_LIBS))
-+SDL2_PANGO_CFLAGS:=$(shell $(PKG_CONFIG) --cflags SDL2_Pango)
- NOPANGOFLAG:=$(if $(SDL2_PANGO_LIB),,-DNO_SDLPANGO$(warning -lSDL2_Pango failed, no scripts for you!))
- 
- SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL2_PANGO_LIB)
-@@ -341,6 +342,7 @@
- 	-Waggregate-return \
- 	-Wstrict-prototypes -Wmissing-prototypes \
- 	$(shell src/test-option.sh -Wstrict-aliasing=2) \
-+    $(SDL2_PANGO_CFLAGS) \
- 	$(ARCH_CFLAGS)
- 
- DEFS:=-DVER_DATE=\"$(VER_DATE)\" -DVER_VERSION=\"$(VER_VERSION)\" \
-