xorg: switch to git-checkout

bdftopcf.yaml

@@ -1,7 +1,7 @@
 package:
   name: bdftopcf
   version: 1.1.2
-  epoch: 3
+  epoch: 4
   description: X.org font bdftopcf
   copyright:
     - license: MIT-open-group
@@ -17,20 +17,18 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
-      - font-xproto-dev
-      - fontsproto-dev
+      - pkgconf-dev
       - util-macros
+      - xorgproto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: bc60be5904330faaa3ddd2aed7874bee2f29e4387c245d6787552f067eb0523a
-      uri: https://www.x.org/archive/individual/util/bdftopcf-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/util/bdftopcf
+      tag: bdftopcf-${{package.version}}
+      expected-commit: 0ee2c68b5d3ea3eb36f895d9dfcc4ebe1416f176
 
   - uses: autoconf/configure
-    with:
-      opts: |
-        --mandir=/usr/share/man
 
   - uses: autoconf/make
 

encodings.yaml

@@ -1,7 +1,7 @@
 package:
   name: encodings
   version: 1.1.0
-  epoch: 1
+  epoch: 2
   description: X.org font encoding files
   copyright:
     - license: LicenseRef-xorg-font-encoding
@@ -15,14 +15,16 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - font-util-dev
       - mkfontscale
       - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 9ff13c621756cfa12e95f32ba48a5b23839e8f577d0048beda66c67dab4de975
-      uri: https://www.x.org/releases/individual/font/encodings-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/encodings
+      tag: encodings-${{package.version}}
+      expected-commit: a7e63704951b95351096c1d96808d48d0fb7e0a8
 
   - uses: autoconf/configure
     with:

font-alias.yaml

@@ -2,7 +2,7 @@
 package:
   name: font-alias
   version: 1.0.5
-  epoch: 3
+  epoch: 4
   description: X.org font alias files
   copyright:
     - license: LicenseRef-xorg-font-alias
@@ -16,12 +16,15 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - font-util-dev
+      - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 9f89e217bb73e0e3636a0a493fbf8b7c995156e0c53d9a0476d201b67c2d6b6e
-      uri: https://www.x.org/releases/individual/font/font-alias-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/alias
+      tag: font-alias-${{package.version}}
+      expected-commit: 05282e1160350c2340d51ac991704f7e390f8420
 
   - uses: autoconf/configure
 

font-misc-cyrillic.yaml

@@ -2,7 +2,7 @@
 package:
   name: font-misc-cyrillic
   version: 1.0.4
-  epoch: 3
+  epoch: 4
   description: X.org misc cyrillic fonts
   copyright:
     - license: LicenseRef-xorg-font-misc-cyrillic
@@ -22,12 +22,14 @@ environment:
       - font-util-dev
       - fontconfig
       - mkfontscale
+      - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 76021a7f53064001914a57fd08efae57f76b68f0a24dca8ab1b245474ee8e993
-      uri: https://www.x.org/releases/individual/font/font-misc-cyrillic-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/misc-cyrillic
+      tag: font-misc-cyrillic-${{package.version}}
+      expected-commit: b34e4d82fecde316384876ae9315380f32234f87
 
   - uses: autoconf/configure
 

font-misc.yaml

@@ -1,7 +1,7 @@
 package:
   name: font-misc
   version: 1.1.3
-  epoch: 2
+  epoch: 3
   description: X.org font misc
   copyright:
     - license: LicenseRef-xorg-font-misc
@@ -19,13 +19,15 @@ environment:
       - font-util
       - font-util-dev
       - mkfontscale
+      - pkgconf-dev
       - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 79abe361f58bb21ade9f565898e486300ce1cc621d5285bec26e14b6a8618fed
-      uri: https://www.x.org/releases/individual/font/font-misc-misc-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/misc-misc
+      tag: font-misc-misc-${{package.version}}
+      expected-commit: c4e2af05583764fae3d0b2aa20d5c93b031cbcbf
 
   - uses: autoconf/configure
 

font-sony-misc.yaml

@@ -1,7 +1,7 @@
 package:
   name: font-sony-misc
   version: 1.0.4
-  epoch: 1
+  epoch: 2
   description: X.org Sony fonts
   copyright:
     - license: HPND-sell-variant
@@ -20,12 +20,14 @@ environment:
       - font-util-dev
       - fontconfig
       - mkfontscale
+      - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: e6b09f823fccb06e0bd0b2062283b6514153323bd8a7486e9c2e3f55ab84946b
-      uri: https://www.x.org/releases/individual/font/font-sony-misc-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/sony-misc
+      tag: font-sony-misc-${{package.version}}
+      expected-commit: dea9a181f64ca0c6740de4ce23be26bc28b8df81
 
   - uses: autoconf/configure
     with:

font-util.yaml

@@ -1,7 +1,7 @@
 package:
   name: font-util
   version: 1.4.1
-  epoch: 3
+  epoch: 4
   description: X.org font utilities
   copyright:
     - license: LicenseRef-xorg-font-util
@@ -19,10 +19,11 @@ environment:
       - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 5c9f64123c194b150fee89049991687386e6ff36ef2af7b80ba53efaf368cc95
-      uri: https://www.x.org/releases/individual/font/font-util-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/font/util
+      tag: font-util-${{package.version}}
+      expected-commit: b5ca142f81a6f14eddb23be050291d1c25514777
 
   - uses: autoconf/configure
     with:

font-xproto.yaml

@@ -1,7 +1,7 @@
 package:
   name: font-xproto
   version: 7.0.31
-  epoch: 4
+  epoch: 5
   description: X.org font xproto
   copyright:
     - license: MIT
@@ -14,12 +14,16 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - pkgconf-dev
+      - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 6d755eaae27b45c5cc75529a12855fed5de5969b367ed05003944cf901ed43c7
-      uri: https://www.x.org/releases/individual/proto/xproto-${{package.version}}.tar.gz
+      # TODO: This repository is deprecated and archived - can we drop this package?
+      repository: https://gitlab.freedesktop.org/xorg/proto/xproto
+      tag: xproto-${{package.version}}
+      expected-commit: f3b7b856777500113cee524dbd295fcbbce11fab
 
   - uses: autoconf/configure
 

fontsproto.yaml

@@ -1,7 +1,7 @@
 package:
   name: fontsproto
   version: 2.1.3
-  epoch: 2
+  epoch: 3
   description: X.org fontsproto
   copyright:
     - license: MIT-open-group
@@ -14,12 +14,16 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - pkgconf-dev
+      - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 72c44e63044b2b66f6fa112921621ecc20c71193982de4f198d9a29cda385c5e
-      uri: https://www.x.org/releases/individual/proto/fontsproto-${{package.version}}.tar.gz
+      # TODO: This repository is deprecated and archived - can we drop this package?
+      repository: https://gitlab.freedesktop.org/xorg/proto/fontsproto
+      tag: fontsproto-${{package.version}}
+      expected-commit: df8c05f7c0253a36589d96efa52938215eff9d4d
 
   - uses: autoconf/configure
     with:

libfontenc.yaml

@@ -1,7 +1,7 @@
 package:
   name: libfontenc
   version: 1.1.8
-  epoch: 2
+  epoch: 3
   description: X11 font encoding library
   copyright:
     - license: MIT
@@ -14,15 +14,19 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - font-util-dev
+      - libtool
+      - pkgconf-dev
       - util-macros
       - xorgproto
       - zlib-dev
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6
-      uri: https://www.x.org/releases/individual/lib/libfontenc-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/lib/libfontenc
+      tag: libfontenc-${{package.version}}
+      expected-commit: 92a85fda2acb4e14ec0b2f6d8fe3eaf2b687218c
 
   - uses: autoconf/configure
     with:

libpciaccess.yaml

@@ -2,7 +2,7 @@
 package:
   name: libpciaccess
   version: 0.18.1
-  epoch: 4
+  epoch: 5
   description: X11 PCI access library
   copyright:
     - license: X11
@@ -20,10 +20,11 @@ environment:
       - util-macros
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76
-      uri: https://www.x.org/releases/individual/lib/libpciaccess-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/lib/libpciaccess
+      tag: libpciaccess-${{package.version}}
+      expected-commit: 2ec2576cabefef1eaa5dd9307c97de2e887fc347
 
   - runs: |
       meson \

libxaw.yaml

@@ -1,7 +1,7 @@
 package:
   name: libxaw
   version: 1.0.16
-  epoch: 2
+  epoch: 3
   description: X Athena Widget Set
   copyright:
     - license: MIT
@@ -15,18 +15,21 @@ environment:
       - busybox
       - ca-certificates-bundle
       - libice-dev
+      - libtool
       - libx11-dev
       - libxext-dev
       - libxmu-dev
       - libxpm-dev
+      - pkgconf-dev
       - util-macros
       - xorgproto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: 012f90adf8739f2f023d63a5fee1528949cf2aba92ef7ac1abcfc2ae9cf28798
-      uri: https://www.x.org/releases/individual/lib/libXaw-${{package.version}}.tar.gz
+      repository: https://gitlab.freedesktop.org/xorg/lib/libxaw
+      tag: libXaw-${{package.version}}
+      expected-commit: f14ba54e9c7e415a05e33dd0b3b5f96e5de05c8b
 
   - uses: autoconf/configure
     with:

libxcursor.yaml

@@ -1,7 +1,7 @@
 package:
   name: libxcursor
   version: 1.2.3
-  epoch: 2
+  epoch: 3
   description: X cursor management library
   copyright:
     - license: MIT
@@ -14,17 +14,20 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
+      - libtool
       - libx11-dev
       - libxfixes-dev
       - libxrender-dev
+      - pkgconf-dev
       - util-macros
       - xorgproto
 
 pipeline:
-  - uses: fetch
+  - uses: git-checkout
     with:
-      expected-sha256: fde9402dd4cfe79da71e2d96bb980afc5e6ff4f8a7d74c159e1966afb2b2c2c0
-      uri: https://www.x.org/releases/individual/lib/libXcursor-${{package.version}}.tar.xz
+      repository: https://gitlab.freedesktop.org/xorg/lib/libxcursor
+      tag: libXcursor-${{package.version}}
+      expected-commit: 8ae6cf61b18ecddf26f72a07bbfbd1ea9f022c36
 
   - uses: autoconf/configure