Package: xorg-gtest Version: 0.7.1-8 Severity: important Tags: patch ftbfs User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oracular ubuntu-patch
Dear Maintainer, This patch fixes buildability on Debian sid (trixie). The patch removal is due to upstream reverting the changes: https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/commit/03d9896d3152749c68441a6d913a40dd05754082. You will see the changelog entry mentioning a certain issue gets resolved, and that issue was resolved by the commit shown above. In Ubuntu, the attached patch was applied to achieve the following: - Disable 0005-Properly-escape-the-D-string-defines.patch until upstream issue https://gitlab.freedesktop.org/xorg/test/xorg-gtest/issues/1 is resolved, to make compiz buildable again. - d/rules: do not build documentation and code in parallel, as this will break the build system. Thanks for considering the patch. -- System Information: Debian Release: trixie/sid APT prefers noble-updates APT policy: (500, 'noble-updates'), (500, 'noble-security'), (500, 'noble'), (100, 'noble-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 6.8.0-31-generic (SMP w/10 CPU threads; PREEMPT) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru xorg-gtest-0.7.1/debian/patches/0005-Properly-escape-the-D-string-defines.patch xorg-gtest-0.7.1/debian/patches/0005-Properly-escape-the-D-string-defines.patch --- xorg-gtest-0.7.1/debian/patches/0005-Properly-escape-the-D-string-defines.patch 2022-11-09 15:19:00.000000000 -0700 +++ xorg-gtest-0.7.1/debian/patches/0005-Properly-escape-the-D-string-defines.patch 1969-12-31 17:00:00.000000000 -0700 @@ -1,28 +0,0 @@ -From 51a836bf4cafa7fb3d3f71d9cf9b7cb8158a32f2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutte...@who-t.net> -Date: Mon, 13 Jun 2016 13:55:12 +1000 -Subject: [PATCH 5/5] Properly escape the -D string defines - -Some compiler change apparently makes this necessary now. - -Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> ---- - xorg-gtest.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xorg-gtest.pc.in b/xorg-gtest.pc.in -index 8fa18a6..612839d 100644 ---- a/xorg-gtest.pc.in -+++ b/xorg-gtest.pc.in -@@ -2,7 +2,7 @@ prefix=@prefix@ - includedir=@includedir@ - sourcedir=@SOURCEDIR@ - datarootdir=@datarootdir@ --CPPflags=-I${includedir} -I${includedir}/xorg -I${sourcedir} -DDUMMY_CONF_PATH=\"@DUMMY_CONF_PATH@\" -DLOGFILE_DIR=\"@LOGFILE_DIR@\" -+CPPflags=-I${includedir} -I${includedir}/xorg -I${sourcedir} -D'DUMMY_CONF_PATH=\"@DUMMY_CONF_PATH@\"' -D'LOGFILE_DIR=\"@LOGFILE_DIR@\"' - - Name: xorg-gtest - Description: X.org Google Test Environment --- -2.18.0 - diff -Nru xorg-gtest-0.7.1/debian/patches/series xorg-gtest-0.7.1/debian/patches/series --- xorg-gtest-0.7.1/debian/patches/series 2022-11-09 15:19:00.000000000 -0700 +++ xorg-gtest-0.7.1/debian/patches/series 2024-05-06 19:36:02.000000000 -0600 @@ -5,6 +5,5 @@ 0002-xserver-improve-error-code-reporting.patch 0003-doc-update-doxygen-file.patch 0004-doc-remove-DOT_FONTNAME-from-doxygen.in.patch -0005-Properly-escape-the-D-string-defines.patch reproducible-builds.patch 1001_another-Doxygen-update.patch diff -Nru xorg-gtest-0.7.1/debian/rules xorg-gtest-0.7.1/debian/rules --- xorg-gtest-0.7.1/debian/rules 2022-11-09 15:19:00.000000000 -0700 +++ xorg-gtest-0.7.1/debian/rules 2024-05-06 19:36:02.000000000 -0600 @@ -12,7 +12,8 @@ --docdir=/usr/share/doc/libxorg-gtest-doc override_dh_auto_build: - dh_auto_build -- all doc + dh_auto_build -- all + dh_auto_build -- doc override_dh_install: rm -rf debian/tmp/usr/include/gtest