libXmu: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml  |    9 +++++----
 configure.ac    |    2 +-
 src/Makefile.am |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit e1843320680f13de5571d9f704ce2161c224a23e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Feb 16 19:19:39 2023 -0800

    src/Makefile.am: Remove hardcoded -D_BSD_SOURCE
    
    Not needed now that AC_USE_SYSTEM_EXTENSIONS is in configure.ac
    
    Avoids compiler warning of:
    /usr/include/features.h:194:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp]
      194 | # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
          |   ^~~~~~~
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index b0652f7..5b7791e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@ BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
 AM_CPPFLAGS = \
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/include/X11/Xmu \
-	$(BITMAP_DEFINES) -D_CONST_X_STRING -D_BSD_SOURCE
+	$(BITMAP_DEFINES) -D_CONST_X_STRING
 
 AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS)
 
commit ba551e9b92e2d11547abbf23f1d799749f4b2d04
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Thu Feb 16 19:11:24 2023 -0800

    configure: raise minimum autoconf requirement to 2.70
    
    Needed for builds on NetBSD to work correctly, since it depends on
    AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the
    prototype for reallocarray() in the system headers.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5bbb0b..ef25a82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # Please see the ci-templates documentation for details:
 # https://freedesktop.pages.freedesktop.org/ci-templates/
 
-.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha fddab8aa63e89a8e65214f59860d9c0f030360c9 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 
 include:
@@ -27,12 +27,13 @@ stages:
 
 variables:
   FDO_UPSTREAM_REPO: 'xorg/lib/libXmu'
-  FDO_DISTRIBUTION_VERSION: 'stable'
+  # 'testing' needed to get autoconf >= 2.70 in Debian as of 2023-02-16
+  FDO_DISTRIBUTION_VERSION: 'testing'
   # The tag should be updated each time the list of packages is updated.
   # Changing a tag forces the associated image to be rebuilt.
   # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2022-07-17.0'
-  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev libx11-dev libxext-dev libxt-dev xmlto xorg-sgml-doctools w3m xsltproc fop'
+  FDO_DISTRIBUTION_TAG:  '2023-02-16.0'
+  FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev libx11-dev libxext-dev libxt-dev xmlto xorg-sgml-doctools w3m xsltproc fop xz-utils'
 
 
 #
diff --git a/configure.ac b/configure.ac
index 7b99b44..0dfd86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 
 # Initialize Autoconf
-AC_PREREQ([2.60])
+AC_PREREQ([2.70])
 AC_INIT([libXmu], [1.1.4],
 	[https://gitlab.freedesktop.org/xorg/lib/libxmu/-/issues], [libXmu])
 AC_CONFIG_SRCDIR([Makefile.am])