From 72991e35cd69c5482c3a093598b935dad9e14b96 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Mar 19 2024 13:22:53 +0000 Subject: Fixed compatibility with libxml-2.12 Resolves: rhbz#2269943 --- diff --git a/compiz-0.8.18-libxml-2.12-fix.patch b/compiz-0.8.18-libxml-2.12-fix.patch new file mode 100644 index 0000000..46eb453 --- /dev/null +++ b/compiz-0.8.18-libxml-2.12-fix.patch @@ -0,0 +1,55 @@ +From ea7b3731b1a8a0f2fb7aa765a84374658b67b1b7 Mon Sep 17 00:00:00 2001 +From: Sixu Hu +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 ("", &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 + #include + #include ++#include + + #include + +@@ -285,8 +286,10 @@ readPluginXmlCallback (void *context, + i += compReadXmlChunk ("", &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/compiz.spec b/compiz.spec index 6bcab2e..a91ea58 100644 --- a/compiz.spec +++ b/compiz.spec @@ -9,7 +9,7 @@ Name: compiz License: GPLv2+ and LGPLv2+ and MIT Version: 0.8.18 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -22,6 +22,8 @@ Patch0: compiz-0.8.18-fedora-logo.patch Patch1: compiz-0.8.18-rsvg2-2.52-fix.patch # https://gitlab.com/compiz/compiz-core/-/merge_requests/177 Patch2: compiz-0.8.18-gcc-14-fix.patch +# https://gitlab.com/compiz/compiz-core/-/commit/10050cb679a582fd9beb921c3e88288e10613987 +Patch3: compiz-0.8.18-libxml-2.12-fix.patch BuildRequires: libX11-devel BuildRequires: libdrm-devel @@ -165,6 +167,10 @@ categories},22x22/{categories,devices,mimetypes}} %changelog +* Tue Mar 19 2024 Jaroslav Škarvada - 1:0.8.18-13 +- Fixed compatibility with libxml-2.12 + Resolves: rhbz#2269943 + * Tue Feb 6 2024 Jaroslav Škarvada - 1:0.8.18-12 - Fixed gcc-14 FTBFS Resolves: rhbz#2261041