diff --git a/libpthread-stubs.yaml b/libpthread-stubs.yaml index 0c678ace285..cd354a1ed3d 100644 --- a/libpthread-stubs.yaml +++ b/libpthread-stubs.yaml @@ -1,7 +1,7 @@ package: name: libpthread-stubs version: 0.5 - epoch: 2 + epoch: 3 description: Pthread functions stubs for platforms missing them copyright: - license: X11 @@ -16,10 +16,11 @@ environment: - ca-certificates-bundle pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 59da566decceba7c2a7970a4a03b48d9905f1262ff94410a649224e33d2442bc - uri: https://xcb.freedesktop.org/dist/libpthread-stubs-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/pthread-stubs + tag: libpthread-stubs-${{package.version}} + expected-commit: 9c8d612698c78f9775b37c5d901a0748b9e4b4b6 - uses: autoconf/configure diff --git a/xcb-proto.yaml b/xcb-proto.yaml index 6108ad5c22b..b9d571f1bd4 100644 --- a/xcb-proto.yaml +++ b/xcb-proto.yaml @@ -1,7 +1,7 @@ package: name: xcb-proto version: 1.17.0 - epoch: 4 + epoch: 5 description: XML-XCB protocol descriptions copyright: - license: MIT @@ -17,10 +17,11 @@ environment: - python3 pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c - uri: https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/proto/xcbproto + tag: xcb-proto-${{package.version}} + expected-commit: 77d7fc04da729ddc5ed4aacf30253726fac24dca - uses: autoconf/configure diff --git a/xcb-util-image.yaml b/xcb-util-image.yaml index 416ab5e995b..a8a9b2b509b 100644 --- a/xcb-util-image.yaml +++ b/xcb-util-image.yaml @@ -2,7 +2,7 @@ package: name: xcb-util-image version: 0.4.1 - epoch: 2 + epoch: 3 description: X C-language Binding - port of Xlib XImage and XShmImage copyright: - license: MIT @@ -15,14 +15,18 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - m4 + - pkgconf-dev - xcb-util-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d - uri: https://xcb.freedesktop.org/dist/xcb-util-image-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcb-image + tag: xcb-util-image-${{package.version}}-gitlab + expected-commit: 1abfc17b1e08e46dbdf34b4ef36097a8c307a8ec + recurse-submodules: true - uses: autoconf/configure with: diff --git a/xcb-util-keysyms.yaml b/xcb-util-keysyms.yaml index 036d60084d9..ccfabbe072f 100644 --- a/xcb-util-keysyms.yaml +++ b/xcb-util-keysyms.yaml @@ -2,7 +2,7 @@ package: name: xcb-util-keysyms version: 0.4.1 - epoch: 2 + epoch: 3 description: X C-language Binding - X constants and keycodes copyright: - license: MIT @@ -15,14 +15,24 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - m4 + - pkgconf-dev - xcb-util-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638 - uri: https://xcb.freedesktop.org/dist/xcb-util-keysyms-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms + tag: xcb-util-keysyms-${{package.version}} + expected-commit: 85e093f14b0ade2956e0a5d1c37cfde06d8b1ba6 + + - uses: patch + with: + patches: | + 0001-Update-submodule-URL-from-anongit-to-gitlab.patch + + - runs: git submodule update --init - uses: autoconf/configure diff --git a/xcb-util-keysyms/0001-Update-submodule-URL-from-anongit-to-gitlab.patch b/xcb-util-keysyms/0001-Update-submodule-URL-from-anongit-to-gitlab.patch new file mode 100644 index 00000000000..fd0b5836d65 --- /dev/null +++ b/xcb-util-keysyms/0001-Update-submodule-URL-from-anongit-to-gitlab.patch @@ -0,0 +1,25 @@ +From ef5cb393d27511ba511c68a54f8ff7b9aab4a384 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 7 Sep 2024 11:52:48 -0700 +Subject: [PATCH] Update submodule URL from anongit to gitlab + +Closes: #4 + +Signed-off-by: Alan Coopersmith +Part-of: +--- + .gitmodules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gitmodules b/.gitmodules +index cff1b86..375bb2e 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,3 +1,3 @@ + [submodule "m4"] + path = m4 +- url = git://anongit.freedesktop.org/xcb/util-common-m4.git ++ url = https://gitlab.freedesktop.org/xorg/util/xcb-util-m4.git +-- +2.43.0 + diff --git a/xcb-util-renderutil.yaml b/xcb-util-renderutil.yaml index 26390905026..830dde1e958 100644 --- a/xcb-util-renderutil.yaml +++ b/xcb-util-renderutil.yaml @@ -2,7 +2,7 @@ package: name: xcb-util-renderutil version: 0.3.10 - epoch: 2 + epoch: 3 description: X C-language Binding - Convenience functions for XRender extension copyright: - license: MIT @@ -15,15 +15,25 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - m4 + - pkgconf-dev - util-macros - xcb-util-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba - uri: https://xcb.freedesktop.org/dist/xcb-util-renderutil-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util + tag: xcb-util-renderutil-${{package.version}} + expected-commit: 5293d8b6165f23b9f7a8bcc903da0e4d7a75984c + + - uses: patch + with: + patches: | + 0001-Update-submodule-URL-from-anongit-to-gitlab.patch + + - runs: git submodule update --init - uses: autoconf/configure diff --git a/xcb-util-renderutil/0001-Update-submodule-URL-from-anongit-to-gitlab.patch b/xcb-util-renderutil/0001-Update-submodule-URL-from-anongit-to-gitlab.patch new file mode 100644 index 00000000000..81a1fc324f8 --- /dev/null +++ b/xcb-util-renderutil/0001-Update-submodule-URL-from-anongit-to-gitlab.patch @@ -0,0 +1,25 @@ +From 5ad9853d6ddcac394d42dd2d4e34436b5db9da39 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 7 Sep 2024 11:55:23 -0700 +Subject: [PATCH] Update submodule URL from anongit to gitlab + +Closes: #2 + +Signed-off-by: Alan Coopersmith +Part-of: +--- + .gitmodules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gitmodules b/.gitmodules +index cff1b86..375bb2e 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,3 +1,3 @@ + [submodule "m4"] + path = m4 +- url = git://anongit.freedesktop.org/xcb/util-common-m4.git ++ url = https://gitlab.freedesktop.org/xorg/util/xcb-util-m4.git +-- +2.43.0 + diff --git a/xcb-util-wm.yaml b/xcb-util-wm.yaml index 9f3ba9704bb..fbd254aca98 100644 --- a/xcb-util-wm.yaml +++ b/xcb-util-wm.yaml @@ -2,7 +2,7 @@ package: name: xcb-util-wm version: 0.4.2 - epoch: 2 + epoch: 3 description: X C-language Binding - helpers for ICCCM and EWMH copyright: - license: MIT @@ -15,15 +15,19 @@ environment: - build-base - busybox - ca-certificates-bundle + - libtool - m4 + - pkgconf-dev - util-macros - xcb-util-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b - uri: https://xcb.freedesktop.org/dist/xcb-util-wm-${{package.version}}.tar.xz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcb-wm + tag: xcb-util-wm-${{package.version}} + expected-commit: 0c6681e465c9cc7b1fbb60778ba1eaa61ab01a14 + recurse-submodules: true - uses: autoconf/configure diff --git a/xcb-util.yaml b/xcb-util.yaml index f13ff3bebea..69b2729e351 100644 --- a/xcb-util.yaml +++ b/xcb-util.yaml @@ -1,7 +1,7 @@ package: name: xcb-util version: 0.4.1 - epoch: 4 + epoch: 5 description: Utility libraries for X C-language Binding copyright: - license: MIT @@ -15,15 +15,25 @@ environment: - busybox - ca-certificates-bundle - gperf + - libtool - libxcb-dev - m4 + - pkgconf-dev - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 21c6e720162858f15fe686cef833cf96a3e2a79875f84007d76f6d00417f593a - uri: https://xorg.freedesktop.org/archive/individual/lib/xcb-util-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/lib/libxcb-util + tag: xcb-util-${{package.version}} + expected-commit: 3a157762578a2e4253a7cb40d2854a3444d5a9df + + - uses: patch + with: + patches: | + 0001-.gitmodules-fix-xcb-util-m4-url-and-CI-failure.patch + + - runs: git submodule update --init - uses: autoconf/configure with: diff --git a/xcb-util/0001-.gitmodules-fix-xcb-util-m4-url-and-CI-failure.patch b/xcb-util/0001-.gitmodules-fix-xcb-util-m4-url-and-CI-failure.patch new file mode 100644 index 00000000000..9a8e22e88ee --- /dev/null +++ b/xcb-util/0001-.gitmodules-fix-xcb-util-m4-url-and-CI-failure.patch @@ -0,0 +1,26 @@ +From bffd8df1725c0fae9105a097e75b466e2f49d7bd Mon Sep 17 00:00:00 2001 +From: "Enrico Weigelt, metux IT consult" +Date: Fri, 6 Sep 2024 13:53:10 +0200 +Subject: [PATCH] .gitmodules: fix xcb-util-m4 url and CI failure + +anongit.freedesktop.org doesn't seem to work anymore - using the canonical +gitlab https URL instead, so making the CIs work again. + +Signed-off-by: Enrico Weigelt, metux IT consult +Part-of: +--- + .gitmodules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gitmodules b/.gitmodules +index cff1b86..375bb2e 100644 +--- a/.gitmodules ++++ b/.gitmodules +@@ -1,3 +1,3 @@ + [submodule "m4"] + path = m4 +- url = git://anongit.freedesktop.org/xcb/util-common-m4.git ++ url = https://gitlab.freedesktop.org/xorg/util/xcb-util-m4.git +-- +2.43.0 + diff --git a/xorgproto.yaml b/xorgproto.yaml index a23a3b32217..3b6b6ac3b00 100644 --- a/xorgproto.yaml +++ b/xorgproto.yaml @@ -1,7 +1,7 @@ package: name: xorgproto version: "2025.1" - epoch: 0 + epoch: 1 description: Combined X.Org X11 protocol headers copyright: - license: BSD-2-Clause AND MIT AND X11 @@ -18,10 +18,11 @@ environment: - util-macros pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: d6f89f65bafb8c9b735e0515882b8a1511e8e864dde5e9513e191629369f2256 - uri: https://xorg.freedesktop.org/archive/individual/proto/xorgproto-${{package.version}}.tar.gz + repository: https://gitlab.freedesktop.org/xorg/proto/xorgproto + tag: xorgproto-${{package.version}} + expected-commit: c18d2bc22813793bba7f0e4e603c0104d7724802 - uses: meson/configure with: