From 83f553b3409d6bb10b1551c876e7576ad3b20cd2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 7 Sep 2024 12:20:34 -0700 Subject: [PATCH] CI: Update xcb util libraries to versions with working submodule URLs The tags previously listed used anongit.fd.o URLs for their submodules which no longer work. Update to tags using gitlab.fd.o URL's instead. Signed-off-by: Alan Coopersmith Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/cross-prereqs-build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42273424a..517536b5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ variables: REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - XORG_DEBIAN_TAG: '2024-08-23-fix-cross' + XORG_DEBIAN_TAG: '2024-09-07-fix-anongit' XORG_FREEBSD_VERSION: '14.0' XORG_FREEBSD_EXEC: '' XORG_FREEBSD_TAG: '2024-06-10.0' diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index 8f567e10d..fb788895b 100755 --- a/.gitlab-ci/cross-prereqs-build.sh +++ b/.gitlab-ci/cross-prereqs-build.sh @@ -68,9 +68,9 @@ build 'https://gitlab.freedesktop.org/xorg/lib/libfontenc.git' 'libfontenc-1.1.4 build 'https://gitlab.freedesktop.org/xorg/lib/libXfont.git' 'libXfont2-2.0.3' build 'https://gitlab.freedesktop.org/xorg/lib/libXdmcp.git' 'libXdmcp-1.1.3' build 'https://gitlab.freedesktop.org/xorg/lib/libXfixes.git' 'libXfixes-5.0.3' -build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git' '0.4.0' -build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git' '0.4.0' -build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git' '0.4.1' +build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-util.git' 'xcb-util-0.4.1-gitlab' +build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-image.git' 'xcb-util-image-0.4.1-gitlab' +build 'https://gitlab.freedesktop.org/xorg/lib/libxcb-wm.git' 'xcb-util-wm-0.4.2' # workaround xcb_windefs.h leaking all Windows API types into X server build # (some of which clash which types defined by Xmd.h) XXX: This is a bit of a