summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/l/gd/gd.SlackBuild5
-rw-r--r--source/l/gd/gd.f4bc1f5c26925548662946ed7cfa473c190a104a.patch28
-rwxr-xr-xsource/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild4
3 files changed, 34 insertions, 3 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
+ *
+
diff --git a/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
index 73c84355..3f24a8cc 100755
--- a/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
+++ b/source/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-whiskermenu-plugin
-# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-whiskermenu-plugin
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in