diff options
Diffstat (limited to 'source/x/compiz')
| -rw-r--r-- | source/x/compiz/175.patch | 55 | ||||
| -rwxr-xr-x | source/x/compiz/compiz.SlackBuild | 12 |
2 files changed, 64 insertions, 3 deletions
diff --git a/source/x/compiz/175.patch b/source/x/compiz/175.patch new file mode 100644 index 000000000..46eb4533f --- /dev/null +++ b/source/x/compiz/175.patch @@ -0,0 +1,55 @@ +From ea7b3731b1a8a0f2fb7aa765a84374658b67b1b7 Mon Sep 17 00:00:00 2001 +From: Sixu Hu <husixu1@hotmail.com> +Date: Wed, 22 Nov 2023 00:54:10 +0800 +Subject: [PATCH] Fix compatibility with libxml 2.12 + +--- + src/main.c | 6 ++++-- + src/metadata.c | 7 +++++-- + 2 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 26b4c512..7182b75b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -271,8 +271,10 @@ readCoreXmlCallback (void *context, + i += compReadXmlChunk ("</screen></core></compiz>", &offset, buffer + i, + length - i); + +- if (!offset && length > i) +- buffer[i++] = '\0'; ++ if (!offset && length > i) { ++ // buffer[i] = '\0'; ++ ctx->offset += 1; ++ } + + ctx->offset += i; + +diff --git a/src/metadata.c b/src/metadata.c +index 3c1fa9ff..559734aa 100644 +--- a/src/metadata.c ++++ b/src/metadata.c +@@ -30,6 +30,7 @@ + #include <libxml/xpath.h> + #include <libxml/xpathInternals.h> + #include <locale.h> ++#include <stdlib.h> + + #include <compiz-core.h> + +@@ -285,8 +286,10 @@ readPluginXmlCallback (void *context, + i += compReadXmlChunk ("</plugin></compiz>", &offset, buffer + i, + length - i); + +- if (!offset && length > i) +- buffer[i++] = '\0'; ++ if (!offset && length > i) { ++ // buffer[i] = '\0'; ++ ctx->offset += 1; ++ } + + ctx->offset += i; + +-- +GitLab + diff --git a/source/x/compiz/compiz.SlackBuild b/source/x/compiz/compiz.SlackBuild index a10752c9f..de9111f2e 100755 --- a/source/x/compiz/compiz.SlackBuild +++ b/source/x/compiz/compiz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,13 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=compiz VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -67,6 +67,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration" + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -85,6 +88,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix for libxml2-2.12: +zcat $CWD/175.patch.gz | patch -p1 --verbose || exit 1 + if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi |