Sven Joachim pushed to branch debian-unstable at X Strike Force / app / xterm
Commits: 5ce07a25 by Sven Joachim at 2022-10-05T18:54:03+02:00 Cherry-pick upstream build fix from xterm 373a Should fix the current FFTBS problem on armel, armhf, misp64el and x32. - - - - - 3 changed files: - debian/changelog - + debian/patches/fix-FTBFS.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +xterm (373-2) UNRELEASED; urgency=medium + + * Cherry-pick a build fix from upstream snapshot 373a: modify + CF_XOPEN_SOURCE to handle more special cases of Linux + (report by Sven Joachim). + + -- Sven Joachim <svenj...@gmx.de> Wed, 05 Oct 2022 18:52:15 +0200 + xterm (373-1) unstable; urgency=medium * New upstream release. ===================================== debian/patches/fix-FTBFS.diff ===================================== @@ -0,0 +1,35 @@ +Description: Fix FTBFS on various architectures + Modify CF_XOPEN_SOURCE to handle more special cases of Linux +(report by Sven Joachim). +Author: Thomas E. Dickey <dic...@invisible-island.net> + +--- + aclocal.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -1,4 +1,4 @@ +-dnl $XTermId: aclocal.m4,v 1.498 2022/09/11 19:00:29 tom Exp $ ++dnl $XTermId: aclocal.m4,v 1.501 2022/10/02 23:57:07 tom Exp $ + dnl + dnl --------------------------------------------------------------------------- + dnl +@@ -4738,7 +4738,7 @@ then + fi + ]) + dnl --------------------------------------------------------------------------- +-dnl CF_XOPEN_SOURCE version: 60 updated: 2022/09/10 15:16:16 ++dnl CF_XOPEN_SOURCE version: 62 updated: 2022/10/02 19:55:56 + dnl --------------- + dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, + dnl or adapt to the vendor's definitions to get equivalent functionality, +@@ -4789,7 +4789,7 @@ case "$host_os" in + cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= + ;; +-(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin) + CF_GNU_SOURCE($cf_XOPEN_SOURCE) + ;; + (minix*) ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 900_debian_xterm.diff 902_windowops.diff 904_fontops.diff +fix-FTBFS.diff View it on GitLab: https://salsa.debian.org/xorg-team/app/xterm/-/commit/5ce07a25bcffccbcb26bde5545b52f3c581e363d -- View it on GitLab: https://salsa.debian.org/xorg-team/app/xterm/-/commit/5ce07a25bcffccbcb26bde5545b52f3c581e363d You're receiving this email because of your account on salsa.debian.org.
