[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1078927: libxt NMU ahead



Control: tags -1 + pending

Hello X maintainers,

I have uploaded the attached patch to delayed/10 in agreement with NMU
guidelines. The upload cherry-picks an upstream commit that makes libxt
build with gcc-15. I guess that the next maintainer upload will update
libxt to a new upstream release where this patch needs to be dropped. It
also annotates the glib2.0 build dependency <!nocheck> as that has
become a requirement for architecture cross bootstrap. Let me know if
these changes need to be deferred any longer.

Helmut
diff -u libxt-1.2.1/debian/changelog libxt-1.2.1/debian/changelog
--- libxt-1.2.1/debian/changelog
+++ libxt-1.2.1/debian/changelog
@@ -1,3 +1,11 @@
+libxt (1:1.2.1-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with gcc-15: Cherry pick upstream patch. (Closes: #1097293)
+  * Annotate libglib2.0-dev dependency <!nocheck>. (Closes: #1078927)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 31 Aug 2025 12:52:48 +0200
+
 libxt (1:1.2.1-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u libxt-1.2.1/debian/control libxt-1.2.1/debian/control
--- libxt-1.2.1/debian/control
+++ libxt-1.2.1/debian/control
@@ -12,7 +12,7 @@
  xutils-dev (>= 1:7.6+3),
  quilt,
 # for unit tests
- libglib2.0-dev (>= 2.16),
+ libglib2.0-dev (>= 2.16) <!nocheck>,
 # specs
  xmlto (>= 0.0.20),
  xorg-sgml-doctools (>= 1:1.10),
diff -u libxt-1.2.1/debian/patches/series libxt-1.2.1/debian/patches/series
--- libxt-1.2.1/debian/patches/series
+++ libxt-1.2.1/debian/patches/series
@@ -1 +1,2 @@
 # placeholder
+0001-issue-20-c23-boolean-conflict.patch
diff -u libxt-1.2.1/debian/rules libxt-1.2.1/debian/rules
--- libxt-1.2.1/debian/rules
+++ libxt-1.2.1/debian/rules
@@ -17,7 +17,7 @@
 		--docdir=\$${datadir}/doc/libxt-dev \
 		--with-appdefaultdir=/etc/X11/app-defaults \
 		--with-xfile-search-path="/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S:/etc/X11/%L/%T/%N%C%S:/etc/X11/%l/%T/%N%C%S:/etc/X11/%T/%N%C%S:/etc/X11/%L/%T/%N%S:/etc/X11/%l/%T/%N%S:/etc/X11/%T/%N%S" \
-		--enable-unit-tests \
+		--$(if $(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)),dis,en)able-unit-tests \
 		--disable-silent-rules \
 		$(docflags) \
 		CFLAGS="$(CFLAGS)" \
only in patch2:
unchanged:
--- libxt-1.2.1.orig/debian/patches/0001-issue-20-c23-boolean-conflict.patch
+++ libxt-1.2.1/debian/patches/0001-issue-20-c23-boolean-conflict.patch
@@ -0,0 +1,30 @@
+From 56875344b2a62845b8a494830bfb0a5f6ed2d3d6 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 12 Nov 2023 05:33:05 -0500
+Subject: [PATCH] issue #20: c23 boolean conflict
+
+Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
+---
+ src/Shell.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Shell.c b/src/Shell.c
+index 027448b..6c36cd4 100644
+--- a/src/Shell.c
++++ b/src/Shell.c
+@@ -1006,10 +1006,10 @@ _XtShellColormap(Widget widget, int closure, XrmValue *value)
+ static void
+ _XtShellAncestorSensitive(Widget widget, int closure, XrmValue *value)
+ {
+-    static Boolean true = True;
++    static Boolean true_value = True;
+ 
+     if (widget->core.parent == NULL)
+-        value->addr = (XPointer) (&true);
++        value->addr = (XPointer) (&true_value);
+     else
+         _XtCopyFromParent(widget, closure, value);
+ }
+-- 
+2.50.1
+

Reply to: