graphics/birdfont: Updated for version 2.33.1.

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

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

3 files changed, 81 insertions, 8 deletions

diff --git a/graphics/birdfont/birdfont.SlackBuild b/graphics/birdfont/birdfont.SlackBuild
index afd0a23ca9..7936b2e107 100644
--- a/graphics/birdfont/birdfont.SlackBuild
+++ b/graphics/birdfont/birdfont.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for birdfont
 
-# Copyright 2020-2022 Giancarlo Dessì, Cagliari, IT
+# Copyright 2020-2023 Giancarlo Dessi, Cagliari, IT
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=birdfont
-VERSION=${VERSION:-2.32.3}
+VERSION=${VERSION:-2.33.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -43,7 +43,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -69,6 +69,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
+
+patch -p1 < $CWD/install-path.patch
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -76,12 +79,16 @@ 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 {} \;
 
-./configure --prefix=$PKG/usr 
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure --prefix=/usr --dest=/
 ./build.py
 ./install.py
 
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
diff --git a/graphics/birdfont/birdfont.info b/graphics/birdfont/birdfont.info
index c5e613d6cc..4b8142617b 100644
--- a/graphics/birdfont/birdfont.info
+++ b/graphics/birdfont/birdfont.info
@@ -1,10 +1,10 @@
 PRGNAM="birdfont"
-VERSION="2.32.3"
+VERSION="2.33.1"
 HOMEPAGE="https://birdfont.org"
-DOWNLOAD="https://birdfont.org/releases/birdfont-2.32.3.tar.xz"
-MD5SUM="33af70145d2aba82dad39f98059197f7"
+DOWNLOAD="https://birdfont.org/releases/birdfont-2.33.1.tar.xz"
+MD5SUM="ce334d0bbd36620876703d39fa661060"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk libxmlbird"
-MAINTAINER="Giancarlo Dessì"
+MAINTAINER="Giancarlo Dessi"
 EMAIL="slack@giand.it"
diff --git a/graphics/birdfont/install-path.patch b/graphics/birdfont/install-path.patch
new file mode 100644
index 0000000000..db13ae6077
--- /dev/null
+++ b/graphics/birdfont/install-path.patch
@@ -0,0 +1,66 @@
+This patch does not fix any bug. It solves some issues given by the build from sources
+using the packaging standard in Slackbuilds.org that sets '/tmp/SBo/package-application'
+as directory of installation ($PKG variable)
+Do not apply if you install birdfont with a slackbuild modified using another path
+for $PKG
+
+--- ./install.py	2023-08-07 21:01:22.000000000 +0200
++++ ./install.py	2023-09-05 18:30:08.552843554 +0200
+@@ -47,6 +47,6 @@
+ 	f = getDest (file, dir)
+ 	print ("install: " + f)
+-	run ('install -d ' + dest + prefix + dir)
+-	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + prefix + dir + '/')
++	run ('install -d ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir)
++	run ('install -m ' + str(mode) + ' ' + file + ' ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir + '/')
+ 	installed.write (f + "\n")
+ 
+@@ -54,11 +54,11 @@
+ 	f = getDestRoot (file, dir)
+ 	print ("install: " + f)
+-	run ('install -d ' + dest + dir)
+-	run ('install -m ' + str(mode) + ' ' + file + ' ' + dest + dir + '/')
++	run ('install -d ' + '/tmp/SBo/package-birdfont/' + dest + dir)
++	run ('install -m ' + str(mode) + ' ' + file + ' ' + '/tmp/SBo/package-birdfont/' + dest + dir + '/')
+ 
+ def link (dir, file, linkname):
+ 	f = getDest (linkname, dir)
+ 	print ("install link: " + f)
+-	run ('cd ' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname)
++	run ('cd ' + '/tmp/SBo/package-birdfont/' + dest + prefix + dir + ' && ln -sf ' + file + ' ' + linkname)
+ 	installed.write (f + "\n")
+ 	
+@@ -162,13 +162,13 @@
+         install ('build/bin/libbirdfont.so.' + '${LIBbirdfont_VERSION}', '/lib', 644)
+ elif os.path.isfile ('build/bin/libbirdfont.so.' + version.SO_VERSION):
+-	install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
++	install ('build/bin/libbirdfont.so.' + version.SO_VERSION, libdir, 755)
+ 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
+ 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
+ elif os.path.isfile ('build/libbirdfont.so.' + version.SO_VERSION):
+-	install ('build/libbirdfont.so.' + version.SO_VERSION, libdir, 644)
++	install ('build/libbirdfont.so.' + version.SO_VERSION, libdir, 755)
+ 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so.' + version.SO_VERSION_MAJOR)
+ 	link (libdir, 'libbirdfont.so.' + version.SO_VERSION, ' libbirdfont.so')
+ elif os.path.isfile ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib'):
+-	install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 644)
++	install ('build/bin/libbirdfont.' + version.SO_VERSION + '.dylib', libdir, 755)
+ 	link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib.' + version.SO_VERSION_MAJOR)
+ 	link (libdir, 'libbirdfont.' + version.SO_VERSION + '.dylib', ' libbirdfont.dylib')
+@@ -180,13 +180,13 @@
+         install ('build/bin/libbirdgems.so.' + '${LIBbirdgems_VERSION}', '/lib', 644)
+ elif os.path.isfile ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
+-        install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
++        install ('build/bin/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 755)
+         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
+         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
+ elif os.path.isfile ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION):
+-        install ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 644)
++        install ('build/libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, libdir, 755)
+         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
+         link (libdir, 'libbirdgems.so.' + version.LIBBIRDGEMS_SO_VERSION, ' libbirdgems.so')
+ elif os.path.isfile ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib'):
+-        install ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', libdir, 644)
++        install ('build/bin/libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', libdir, 755)
+         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib.' + version.LIBBIRDGEMS_SO_VERSION_MAJOR)
+         link (libdir, 'libbirdgems.' + version.LIBBIRDGEMS_SO_VERSION + '.dylib', ' libbirdgems.dylib')