summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-09-19 18:57:24 +0000
committerEric Hameleers <alien@slackware.com>2021-09-20 08:59:58 +0200
commit31debcee0bc3a19ea00d23d403be3d0d0facd4f8 (patch)
tree9f43bb893bae42501334c4fcefd09d078c6fb5e4 /source/l
parentbcf11b40a875d66fb8c56b631d8065371f9338f7 (diff)
downloadcurrent-31debcee0bc3a19ea00d23d403be3d0d0facd4f8.tar.gz
Sun Sep 19 18:57:24 UTC 202120210919185724
a/kernel-firmware-20210919_d526e04-noarch-1.txz: Upgraded. l/gd-2.3.3-x86_64-2.txz: Rebuilt. Applied upstream patch to restore macros used while building PHP. Thanks to nobodino. l/gjs-1.68.4-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_8-x86_64-1.txz: Upgraded. l/python-charset-normalizer-2.0.6-x86_64-1.txz: Upgraded. xfce/xfce4-whiskermenu-plugin-2.6.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
-rwxr-xr-xsource/l/gd/gd.SlackBuild5
-rw-r--r--source/l/gd/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch28
2 files changed, 32 insertions, 1 deletions
diff --git a/source/l/gd/gd.SlackBuild b/source/l/gd/gd.SlackBuild
index 2f11fd5d..596b7750 100755
--- a/source/l/gd/gd.SlackBuild
+++ b/source/l/gd/gd.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gd
VERSION=${VERSION:-$(echo libgd-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -79,6 +79,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Restore macros used by PHP:
+zcat $CWD/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch.gz | patch -p1 --verbose || exit
+
#./bootstrap.sh
# Configure:
diff --git a/source/l/gd/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch b/source/l/gd/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch
new file mode 100644
index 00000000..b377bd76
--- /dev/null
+++ b/source/l/gd/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch
@@ -0,0 +1,28 @@
+From f4bc1f5c26925548662946ed7cfa473c190a104a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 13 Sep 2021 14:57:52 +0200
+Subject: [PATCH] Revert "Fix #318, these macros are not used as planed, we
+ have separate functions for each"
+
+This reverts commit bdc281eadb1d58d5c0c7bbc1125ee4674256df08.
+---
+ src/gd.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/gd.h b/src/gd.h
+index 30560395..1ad9e637 100644
+--- a/src/gd.h
++++ b/src/gd.h
+@@ -1604,6 +1604,11 @@ BGD_DECLARE(void) gdImageFlipHorizontal(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipVertical(gdImagePtr im);
+ BGD_DECLARE(void) gdImageFlipBoth(gdImagePtr im);
+
++#define GD_FLIP_HORINZONTAL 1 /* typo, kept for BC */
++#define GD_FLIP_HORIZONTAL 1
++#define GD_FLIP_VERTICAL 2
++#define GD_FLIP_BOTH 3
++
+ /**
+ * Group: Crop
+ *
+