summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-21 22:23:10 +0000
committerEric Hameleers <alien@slackware.com>2020-12-22 08:59:52 +0100
commit4c1d731fca10cd0aa6ccd71a6e3fe5349d5697a0 (patch)
treec8516b1d35a4b02441c3753d96b43aba359993c0 /source/l
parent2c16d4c700eedde6122f40518c0ee9acc0a16578 (diff)
downloadcurrent-4c1d731fca10cd0aa6ccd71a6e3fe5349d5697a0.tar.gz
Mon Dec 21 22:23:10 UTC 202020201221222310
a/kernel-generic-5.10.2-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.2-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.2-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.2-x86-1.txz: Upgraded. d/parallel-20201222-noarch-1.txz: Upgraded. d/python-setuptools-51.1.0-x86_64-1.txz: Upgraded. k/kernel-source-5.10.2-noarch-1.txz: Upgraded. -USB_SISUSBVGA_CON y PCIE_BW y -> n Thanks to walecha. l/gegl-0.4.28-x86_64-2.txz: Rebuilt. Make sure gegl:introspect is available or GIMP won't start. n/gnupg2-2.2.26-x86_64-1.txz: Upgraded. n/iproute2-5.10.0-x86_64-1.txz: Upgraded. n/ipset-7.10-x86_64-1.txz: Upgraded. x/liberation-fonts-ttf-2.1.2-noarch-1.txz: Upgraded. xfce/xfce4-systemload-plugin-1.2.4-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l')
-rwxr-xr-xsource/l/gegl/gegl.SlackBuild7
-rw-r--r--source/l/gegl/gegl.no.runtime.dot.check.diff26
2 files changed, 32 insertions, 1 deletions
diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild
index e0916786..8f17c84a 100755
--- a/source/l/gegl/gegl.SlackBuild
+++ b/source/l/gegl/gegl.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gegl
VERSION=${VERSION:-$(echo gegl-*.tar.?z | 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
@@ -77,6 +77,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# GEGL 0.4.28 started checking for "dot" at runtime, breaking GIMP on machines
+# that lack it. We'll drop the runtime check for now and revisit this approach
+# later if it causes any unwanted side effects.
+zcat $CWD/gegl.no.runtime.dot.check.diff.gz | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
diff --git a/source/l/gegl/gegl.no.runtime.dot.check.diff b/source/l/gegl/gegl.no.runtime.dot.check.diff
new file mode 100644
index 00000000..f6dd7f6f
--- /dev/null
+++ b/source/l/gegl/gegl.no.runtime.dot.check.diff
@@ -0,0 +1,26 @@
+--- ./operations/common/introspect.c.orig 2020-12-20 06:16:48.799965900 -0600
++++ ./operations/common/introspect.c 2020-12-21 15:41:14.459774463 -0600
+@@ -48,7 +48,7 @@
+
+ dot = g_find_program_in_path ("dot");
+
+- if (! dot || op_introspect->user_data || op_introspect->node == NULL)
++ if (op_introspect->user_data || op_introspect->node == NULL)
+ return;
+
+ /* Construct temp filenames */
+@@ -175,12 +175,9 @@
+ gegl_introspect_is_available (void)
+ {
+ gchar *dot;
+- gboolean found = FALSE;
+-
+- dot = g_find_program_in_path ("dot");
+- found = (dot != NULL);
+- g_free (dot);
++ gboolean found = TRUE;
+
++ /* always return TRUE to avoid a runtime check on dot */
+ return found;
+ }
+