summaryrefslogtreecommitdiffstats
path: root/source/l/glib2
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-12-02 06:58:38 +0000
committer Eric Hameleers <alien@slackware.com>2022-12-02 16:59:51 +0100
commit668a929acfc230ed41c294c8cb99f9b39a10ab59 (patch)
treee5168566d8548de7a97ca9b1077ff3c0e583b8ab /source/l/glib2
parentf5b2119f53a957c8d3771963a93d145f6d9a37e6 (diff)
downloadcurrent-668a929acfc230ed41c294c8cb99f9b39a10ab59.tar.gz
current-668a929acfc230ed41c294c8cb99f9b39a10ab59.tar.xz
Fri Dec 2 06:58:38 UTC 202220221202065838
a/gptfdisk-1.0.9-x86_64-2.txz: Rebuilt. Applied upstream patches to fix a crash and partition corruption caused by the popt upgrade: [PATCH] Updated guid.cc to deal with minor change in libuuid [PATCH] Fix failure & crash of sgdisk when compiled with latest popt [PATCH] Fix NULL dereference when duplicating string argument Thanks to jloco. d/cmake-3.25.1-x86_64-1.txz: Upgraded. kde/calligra-3.2.1-x86_64-24.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/cantor-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kfilemetadata-5.100.0-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kile-2.9.93-x86_64-22.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/kitinerary-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/krita-5.1.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. kde/okular-22.08.3-x86_64-2.txz: Rebuilt. Recompiled against poppler-22.12.0. l/glib2-2.74.3-x86_64-1.txz: Upgraded. l/poppler-22.12.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/NetworkManager-1.40.6-x86_64-1.txz: Upgraded. xap/NetworkManager-openvpn-1.10.2-x86_64-1.txz: Upgraded. xap/libnma-1.10.4-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.30.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l/glib2')
-rw-r--r--source/l/glib2/glib.g_str_equal.diff11
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild5
2 files changed, 1 insertions, 15 deletions
diff --git a/source/l/glib2/glib.g_str_equal.diff b/source/l/glib2/glib.g_str_equal.diff
deleted file mode 100644
index 88fcdd3d9..000000000
--- a/source/l/glib2/glib.g_str_equal.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./glib/ghash.h.orig 2022-11-24 06:29:05.000000000 -0600
-+++ ./glib/ghash.h 2022-11-28 13:41:03.250650020 -0600
-@@ -162,7 +162,7 @@
- gconstpointer v2);
-
- /* Macro for optimization in the case it is not used as callback function */
--#define g_str_equal(v1, v2) (strcmp ((gconstpointer) (v1), (gconstpointer) (v2)) == 0)
-+#define g_str_equal(v1, v2) (strcmp ((const char*) (gconstpointer) (v1),(const char*) (gconstpointer) (v2)) == 0)
-
- GLIB_AVAILABLE_IN_ALL
- guint g_str_hash (gconstpointer v);
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index aa034997e..c3ff80303 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -77,9 +77,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Fix C++ API:
-zcat $CWD/glib.g_str_equal.diff.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"