diff options
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8b31a4..e75568a 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/libXfont' - 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-04-06.1' - FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xutils-dev x11proto-dev xtrans-dev libfontenc-dev libfreetype-dev zlib1g-dev libbz2-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 xtrans-dev libfontenc-dev libfreetype-dev zlib1g-dev libbz2-dev xmlto xorg-sgml-doctools w3m xsltproc fop xz-utils' # diff --git a/configure.ac b/configure.ac index fe2f987..c8098ec 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # # Initialize Autoconf -AC_PREREQ([2.60]) +AC_PREREQ([2.70]) AC_INIT([libXfont2], [2.0.6], [https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues], [libXfont2]) AC_CONFIG_SRCDIR([Makefile.am]) |