Merge pull request #3792 from lazka/xorgproto

Move from xproto to xorgproto + some cleanups/renaming

PKGMETA.yml

@@ -59,9 +59,6 @@ packages:
   tzcode:
     references:
       archlinux: tzdata
-  util-macros:
-    references:
-      archlinux: xorg-util-macros
   base-devel:
     internal: true
   base:

lndir/PKGBUILD

@@ -2,12 +2,12 @@
 
 pkgname=lndir
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Create a shadow directory of symbolic links to another directory tree"
 arch=('i686' 'x86_64')
 url="https://xorg.freedesktop.org/"
 license=('custom')
-makedepends=('xproto' 'autotools' 'gcc')
+makedepends=('xorgproto' 'autotools' 'gcc')
 source=(https://xorg.freedesktop.org/archive/individual/util/$pkgname-$pkgver.tar.xz)
 sha256sums=('3e3437a9d3bb377755dd04a2c90d4c014d9fe90987ff73450bf5b8d161795e87')
 

xorg-util-macros/PKGBUILD

@@ -1,36 +1,39 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
-pkgname=util-macros
-pkgver=1.19.3
+pkgname=xorg-util-macros
+pkgver=1.20.0
 pkgrel=1
 pkgdesc='X.Org Autotools macros'
 arch=('any')
 groups=('development')
 license=('custom')
+provides=('util-macros')
+replaces=('util-macros')
+conflicts=('util-macros')
 url="https://xorg.freedesktop.org/"
 depends=()
 makedepends=('autotools')
-source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
-sha256sums=('0f812e6e9d2786ba8f54b960ee563c0663ddbe2434bf24ff193f5feab1f31971')
+source=("https://xorg.freedesktop.org/releases/individual/util/util-macros-${pkgver}.tar.xz")
+sha256sums=('0b86b262dbe971edb4ff233bc370dfad9f241d09f078a3f6d5b7f4b8ea4430db')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   autoreconf -fiv
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/util-macros-${pkgver}"
   make install DESTDIR="${pkgdir}"
 
   install -m755 -d "${pkgdir}/usr/lib"

xorgproto/PKGBUILD

@@ -0,0 +1,40 @@
+# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
+
+pkgname=xorgproto
+pkgver=2022.2
+pkgrel=1
+pkgdesc="combined X.Org X11 Protocol headers"
+arch=(any)
+license=('custom')
+groups=('development')
+conflicts=('xproto')
+provides=('xproto')
+replaces=('xproto')
+url="https://xorg.freedesktop.org/"
+makedepends=('meson' 'ninja' 'gcc')
+source=("https://xorg.freedesktop.org/archive/individual/proto/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+}
+
+build() {
+  mkdir "${srcdir}"/build && cd "${srcdir}"/build
+
+  meson setup \
+    --wrap-mode=nodownload \
+    --auto-features=enabled \
+    --buildtype=plain \
+    --prefix=/usr \
+    "../${pkgname}-${pkgver}"
+
+  meson compile
+}
+
+package() {
+  cd "${srcdir}"/build
+
+  DESTDIR="$pkgdir" meson install
+}

xproto/PKGBUILD

@@ -1,39 +0,0 @@
-# Maintainer: Alexey Pavlov <Alexpux@gmail.com>
-
-pkgname=xproto
-pkgver=7.0.31
-pkgrel=1
-pkgdesc="X11 core wire protocol and auxiliary headers"
-arch=(any)
-license=('custom')
-groups=('development')
-url="https://xorg.freedesktop.org/"
-makedepends=('util-macros' 'autotools' 'gcc')
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -ivf
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export MSYSTEM=CYGWIN
-  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
-  ./configure --build=${CYGWIN_CHOST} --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}