From ca67215ea45b8983ac7186c10adf4745a048c4ae Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 22 Dec 2025 20:32:06 +0000 Subject: [PATCH] gnome: switch to git-checkout Signed-off-by: Colin Watson --- gdk-pixbuf.yaml | 17 +++++------------ gi-docgen.yaml | 11 +++++------ glib-gir.yaml | 19 +++++-------------- gobject-introspection.yaml | 21 +++++++-------------- gtk-2.0.yaml | 19 +++++++++++++------ gtk-doc.yaml | 15 +++++---------- libart-lgpl.yaml | 18 +++++++++++------- libsecret.yaml | 19 +++++-------------- vala.yaml | 18 ++++++++++-------- 9 files changed, 66 insertions(+), 91 deletions(-) diff --git a/gdk-pixbuf.yaml b/gdk-pixbuf.yaml index 640e4d552d1..3d15454c3a4 100644 --- a/gdk-pixbuf.yaml +++ b/gdk-pixbuf.yaml @@ -1,7 +1,7 @@ package: name: gdk-pixbuf version: "2.44.4" - epoch: 0 + epoch: 1 description: GTK+ image loading library copyright: - license: LGPL-2.1-or-later @@ -12,8 +12,6 @@ package: environment: contents: packages: - - autoconf - - automake - build-base - busybox - ca-certificates-bundle @@ -32,17 +30,12 @@ environment: - smartypants - tiff-dev -var-transforms: - - from: ${{package.version}} - match: '^(\d\.\d+).*' - replace: $1 - to: major-minor-version - pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 93a1aac3f1427ae73457397582a2c38d049638a801788ccbd5f48ca607bdbd17 - uri: https://download.gnome.org/sources/gdk-pixbuf/${{vars.major-minor-version}}/gdk-pixbuf-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/gdk-pixbuf + tag: ${{package.version}} + expected-commit: c9e6d11cbfa085d7b59dd6ad3b1cbfa26348ce13 - uses: meson/configure with: diff --git a/gi-docgen.yaml b/gi-docgen.yaml index a9fff9df57f..b4071a72e5d 100644 --- a/gi-docgen.yaml +++ b/gi-docgen.yaml @@ -1,7 +1,7 @@ package: name: gi-docgen version: "2025.5" - epoch: 0 + epoch: 1 description: A documentation generator for GObject-based libraries copyright: - license: Apache-2.0 OR GPL-3.0-or-later @@ -21,8 +21,6 @@ data: environment: contents: packages: - - autoconf - - automake - build-base - busybox - ca-certificates-bundle @@ -37,10 +35,11 @@ environment: - py3-supported-typogrify pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 59ed7cc43c7cb016f9fbe5a51a7284549247eed0de32b73d3cb8ac7dfb155830 - uri: https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/${{package.version}}/gi-docgen-${{package.version}}.tar.gz + repository: https://gitlab.gnome.org/GNOME/gi-docgen + tag: ${{package.version}} + expected-commit: 9eedfa6572cc9929583f926493751adb85805ffb subpackages: - range: py-versions diff --git a/glib-gir.yaml b/glib-gir.yaml index 15e6b559342..c07973caf95 100644 --- a/glib-gir.yaml +++ b/glib-gir.yaml @@ -3,7 +3,7 @@ package: name: glib-gir version: "2.86.3" - epoch: 0 + epoch: 1 description: Common C routines used by Gtk+ and other libs copyright: - license: LGPL-2.1-or-later @@ -16,8 +16,6 @@ vars: environment: contents: packages: - - autoconf - - automake - build-base - busybox - bzip2-dev @@ -38,19 +36,12 @@ environment: - util-linux-dev - zlib-dev -# creates a new var that contains only the major and minor version to be used in the fetch URL -# e.g. 2.74.3 will create a new var mangled-package-version=2.74 -var-transforms: - - from: ${{package.version}} - match: (\d+\.\d+)\.\d+ - replace: $1 - to: mangled-package-version - pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: b3211d8d34b9df5dca05787ef0ad5d7ca75dec998b970e1aab0001d229977c65 - uri: https://download.gnome.org/sources/glib/${{vars.mangled-package-version}}/glib-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/glib + tag: ${{package.version}} + expected-commit: 7a54787e16ceb20cecda8ad6caab05b24a61e414 - uses: meson/configure with: diff --git a/gobject-introspection.yaml b/gobject-introspection.yaml index 06e40f2f5f6..e1192c43759 100644 --- a/gobject-introspection.yaml +++ b/gobject-introspection.yaml @@ -1,7 +1,7 @@ package: name: gobject-introspection version: "1.86.0" - epoch: 0 + epoch: 1 description: Introspection system for GObject-based libraries copyright: - license: LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT @@ -10,19 +10,9 @@ vars: python-version: 3.13 bins: "g-ir-annotation-tool g-ir-compiler g-ir-generate g-ir-inspect g-ir-scanner" -# creates a new var that contains only the major and minor version to be used in the fetch URL -# e.g. 1.74.0 will create a new var mangled-package-version=1.74 -var-transforms: - - from: ${{package.version}} - match: (\d+\.\d+)\.\d+ - replace: $1 - to: mangled-package-version - environment: contents: packages: - - autoconf - - automake - bash - bison - build-base @@ -42,10 +32,13 @@ environment: - python-${{vars.python-version}} pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 920d1a3fcedeadc32acff95c2e203b319039dd4b4a08dd1a2dfd283d19c0b9ae - uri: https://download.gnome.org/sources/gobject-introspection/${{vars.mangled-package-version}}/gobject-introspection-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/gobject-introspection + tag: ${{package.version}} + expected-commit: 0f1412500b7d9039510b7b36b07c9f8ba0809bfa + + - runs: git submodule update --init - uses: meson/configure with: diff --git a/gtk-2.0.yaml b/gtk-2.0.yaml index bb464041332..df88e4221ff 100644 --- a/gtk-2.0.yaml +++ b/gtk-2.0.yaml @@ -1,7 +1,7 @@ package: name: gtk-2.0 version: 2.24.33 - epoch: 5 + epoch: 6 description: The GTK+ Toolkit (v2) copyright: - license: LGPL-2.0-or-later @@ -11,7 +11,7 @@ environment: packages: - at-spi2-core-dev - autoconf - - automake + - automake<1.17 - build-base - busybox - ca-certificates-bundle @@ -32,7 +32,7 @@ environment: - libatk-bridge-2.0 - libice-dev - libjpeg-turbo-dev - - libtool + - libtool<2.5 - libx11-dev - libxcomposite-dev - libxcursor-dev @@ -43,6 +43,7 @@ environment: - libxi-dev - libxrandr-dev - pango-dev + - pkgconf-dev - shared-mime-info - tiff-dev - zlib-dev @@ -50,12 +51,18 @@ environment: CFLAGS: -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -Wno-implicit-int pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da - uri: https://download.gnome.org/sources/gtk+/2.24/gtk+-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/gtk + tag: ${{package.version}} + expected-commit: 68631945733158f164427db84f01301d7e875763 + + - runs: NOCONFIGURE=1 ./autogen.sh - uses: autoconf/configure + with: + opts: | + --enable-gtk-doc - uses: autoconf/make diff --git a/gtk-doc.yaml b/gtk-doc.yaml index 5014621dd27..a280cd0fc88 100644 --- a/gtk-doc.yaml +++ b/gtk-doc.yaml @@ -1,7 +1,7 @@ package: name: gtk-doc version: "1.35.1" - epoch: 0 + epoch: 1 description: Documentation tool for public library API copyright: - license: GPL-2.0-or-later AND GFDL-1.1-or-later @@ -11,12 +11,6 @@ package: - py3-pygments - python3 -var-transforms: - - from: ${{package.version}} - match: ^(\d+\.\d+)\.\d+$ - replace: "$1" - to: major-minor-version - environment: contents: packages: @@ -36,10 +30,11 @@ environment: - rarian-dev pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 611c9f24edd6d88a8ae9a79d73ab0dc63c89b81e90ecc31d6b9005c5f05b25e2 - uri: https://download.gnome.org/sources/gtk-doc/${{vars.major-minor-version}}/gtk-doc-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/gtk-doc + tag: ${{package.version}} + expected-commit: 82623a6c120e153be9bee8642693a00bc1aae77f - runs: | autoreconf -vif diff --git a/libart-lgpl.yaml b/libart-lgpl.yaml index 6da3b252d8d..cae46976395 100644 --- a/libart-lgpl.yaml +++ b/libart-lgpl.yaml @@ -1,11 +1,17 @@ package: name: libart-lgpl version: 2.3.21 - epoch: 2 + epoch: 3 description: A library for high-performance 2D graphics copyright: - license: LGPL-2.0-or-later +var-transforms: + - from: ${{package.version}} + match: ^(\d+)\.(\d+)\.(\d+)$ + replace: LIBART_LGPL_${1}_${2}_$3 + to: tag-name + environment: contents: packages: @@ -17,13 +23,11 @@ environment: - libtool pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa - uri: https://download.gnome.org/sources/libart_lgpl/2.3/libart_lgpl-${{package.version}}.tar.bz2 - - - runs: | - libtoolize --force && aclocal && autoconf --force && automake --add-missing + repository: https://gitlab.gnome.org/Archive/libart_lgpl + tag: ${{vars.tag-name}} + expected-commit: 7119bfe163a5a5325405acb7eab1b16152e8032a - runs: autoreconf -vif diff --git a/libsecret.yaml b/libsecret.yaml index 988f3762bda..41d1d3398a9 100644 --- a/libsecret.yaml +++ b/libsecret.yaml @@ -1,24 +1,14 @@ package: name: libsecret version: "0.21.7" - epoch: 1 + epoch: 2 description: Library for storing and retrieving passwords and other secrets copyright: - license: LGPL-2.1 -# creates a new var that contains only the major and minor version to be used in the fetch URL -# e.g. 0.21.0 will create a new var mangled-package-version=0.21 -var-transforms: - - from: ${{package.version}} - match: (\d+\.\d+)\.\d+ - replace: $1 - to: mangled-package-version - environment: contents: packages: - - autoconf - - automake - build-base - busybox - ca-certificates-bundle @@ -35,10 +25,11 @@ environment: - vala pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: 6b452e4750590a2b5617adc40026f28d2f4903de15f1250e1d1c40bfd68ed55e - uri: https://download.gnome.org/sources/libsecret/${{vars.mangled-package-version}}/libsecret-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/libsecret + tag: ${{package.version}} + expected-commit: 0936f740c02b60f02657729cd99f581db4517a41 - uses: meson/configure with: diff --git a/vala.yaml b/vala.yaml index 7c75ba32e48..73731868102 100644 --- a/vala.yaml +++ b/vala.yaml @@ -1,7 +1,7 @@ package: name: vala version: "0.56.18" - epoch: 4 + epoch: 5 description: Compiler for the GObject type system copyright: - license: LGPL-2.1 @@ -10,6 +10,7 @@ environment: contents: packages: - autoconf + - autoconf-archive - automake - bash - bison @@ -22,18 +23,19 @@ environment: - gobject-introspection-dev - graphviz-dev - libxslt-dev + - pkgconf-dev + - vala # self-dependency needed when building from git pipeline: - - uses: fetch + - uses: git-checkout with: - expected-sha256: f2affe7d40ab63db8e7b9ecc3f6bdc9c2fc7e3134c84ff2d795f482fe926a382 - uri: https://download.gnome.org/sources/vala/0.56/vala-${{package.version}}.tar.xz + repository: https://gitlab.gnome.org/GNOME/vala + tag: ${{package.version}} + expected-commit: 0996c1b8604c77f854854daa874a08579d1b9c1a + + - runs: ./autogen.sh - uses: autoconf/configure - with: - opts: | - --host=${{host.triplet.gnu}} \ - --build=${{host.triplet.gnu}} \ - uses: autoconf/make