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

[Git][xorg-team/app/xterm][debian-unstable] Cherry-pick upstream build fix from xterm 373a



Title: GitLab

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:

Changes:

  • debian/changelog
    1
    +xterm (373-2) UNRELEASED; urgency=medium
    
    2
    +
    
    3
    +  * Cherry-pick a build fix from upstream snapshot 373a: modify
    
    4
    +    CF_XOPEN_SOURCE to handle more special cases of Linux
    
    5
    +    (report by Sven Joachim).
    
    6
    +
    
    7
    + -- Sven Joachim <svenjoac@gmx.de>  Wed, 05 Oct 2022 18:52:15 +0200
    
    8
    +
    
    1 9
     xterm (373-1) unstable; urgency=medium
    
    2 10
     
    
    3 11
       * New upstream release.
    

  • debian/patches/fix-FTBFS.diff
    1
    +Description: Fix FTBFS on various architectures
    
    2
    + Modify CF_XOPEN_SOURCE to handle more special cases of Linux
    
    3
    +(report by Sven Joachim).
    
    4
    +Author: Thomas E. Dickey <dickey@invisible-island.net>
    
    5
    +
    
    6
    +---
    
    7
    + aclocal.m4 |    6 +++---
    
    8
    + 1 file changed, 3 insertions(+), 3 deletions(-)
    
    9
    +
    
    10
    +--- a/aclocal.m4
    
    11
    ++++ b/aclocal.m4
    
    12
    +@@ -1,4 +1,4 @@
    
    13
    +-dnl $XTermId: aclocal.m4,v 1.498 2022/09/11 19:00:29 tom Exp $
    
    14
    ++dnl $XTermId: aclocal.m4,v 1.501 2022/10/02 23:57:07 tom Exp $
    
    15
    + dnl
    
    16
    + dnl ---------------------------------------------------------------------------
    
    17
    + dnl
    
    18
    +@@ -4738,7 +4738,7 @@ then
    
    19
    + fi
    
    20
    + ])
    
    21
    + dnl ---------------------------------------------------------------------------
    
    22
    +-dnl CF_XOPEN_SOURCE version: 60 updated: 2022/09/10 15:16:16
    
    23
    ++dnl CF_XOPEN_SOURCE version: 62 updated: 2022/10/02 19:55:56
    
    24
    + dnl ---------------
    
    25
    + dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
    
    26
    + dnl or adapt to the vendor's definitions to get equivalent functionality,
    
    27
    +@@ -4789,7 +4789,7 @@ case "$host_os" in
    
    28
    + 	cf_xopen_source="-D_SGI_SOURCE"
    
    29
    + 	cf_XOPEN_SOURCE=
    
    30
    + 	;;
    
    31
    +-(linux*gnu|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
    
    32
    ++(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
    
    33
    + 	CF_GNU_SOURCE($cf_XOPEN_SOURCE)
    
    34
    + 	;;
    
    35
    + (minix*)

  • debian/patches/series
    1 1
     900_debian_xterm.diff
    
    2 2
     902_windowops.diff
    
    3 3
     904_fontops.diff
    
    4
    +fix-FTBFS.diff


  • Reply to: