[arch-commits] Commit in xorgproto/trunk (PKGBUILD)

[Andreas Radke]

    Date: Thursday, December 19, 2019 @ 16:53:01
  Author: andyrtr
Revision: 371863

upgpkg: xorgproto 2019.2-2: cleanup legacy headers; cleanup provides/conflics/replaces - FS#64892

Modified:
  xorgproto/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-19 16:07:45 UTC (rev 371862)
+++ PKGBUILD	2019-12-19 16:53:01 UTC (rev 371863)
@@ -1,16 +1,15 @@
 # Maintainer: AndyRTR <andyrtr at archlinux.org>
 
+# When releasing a xorgproto version with updated keysyms, rebuild libx11
+
 pkgname=xorgproto
 pkgver=2019.2
-pkgrel=1
+pkgrel=2
 pkgdesc="combined X.Org X11 Protocol headers"
 arch=('any')
 url="https://xorg.freedesktop.org/"
 license=('custom')
-makedepends=('xorg-util-macros' 'meson') # 'xmlto' 'libxslt' 'linuxdoc-tools' 'docbook-sgml' 'fop')
-provides=('bigreqsproto' 'compositeproto' 'damageproto' 'dmxproto' 'dri2proto' 'dri3proto' 'fixesproto' 'fontsproto' 'glproto' 'inputproto' 'kbproto' 'presentproto' 'printproto' 'randrproto' 'recordproto' 'renderproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xextproto' 'xf86dgaproto' 'xf86driproto' 'xf86miscproto' 'xf86vidmodeproto' 'xineramaproto' 'xproto')
-conflicts=('bigreqsproto' 'compositeproto' 'damageproto' 'dmxproto' 'dri2proto' 'dri3proto' 'fixesproto' 'fontsproto' 'glproto' 'inputproto' 'kbproto' 'presentproto' 'printproto' 'randrproto' 'recordproto' 'renderproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xextproto' 'xf86dgaproto' 'xf86driproto' 'xf86miscproto' 'xf86vidmodeproto' 'xineramaproto' 'xproto')
-replaces=('bigreqsproto' 'compositeproto' 'damageproto' 'dmxproto' 'dri2proto' 'dri3proto' 'fixesproto' 'fontsproto' 'glproto' 'inputproto' 'kbproto' 'presentproto' 'printproto' 'randrproto' 'recordproto' 'renderproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xextproto' 'xf86dgaproto' 'xf86driproto' 'xf86miscproto' 'xf86vidmodeproto' 'xineramaproto' 'xproto')
+makedepends=('xorg-util-macros' 'meson')
 source=(https://xorg.freedesktop.org/archive/individual/proto/$pkgname-$pkgver.tar.bz2{,.sig})
 sha512sums=('cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904'
             'SKIP')
@@ -25,9 +24,7 @@
 }
 
 build() {
-  arch-meson "$pkgname"-$pkgver build \
-    -D legacy=true
-
+  arch-meson "$pkgname"-$pkgver build
   ninja -C build
 }
 
@@ -47,13 +44,11 @@
   # licenses
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 "$pkgname"-$pkgver/COPYING* "${pkgdir}/usr/share/licenses/${pkgname}/"
+  # remove licences of legacy stuff we don't ship anymore
+  rm -f "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING-{evieproto,fontcacheproto,lg3dproto,printproto,xcalibrateproto,xf86rushproto}
 
   # cleanup
-  rm -f "${pkgdir}"/usr/include/X11/extensions/{apple,windows}*
+  rm -f "${pkgdir}"/usr/include/X11/extensions/apple*
   rm -f "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
-  rm -f "${pkgdir}"/usr/share/pkgconfig/{apple,windows}wmproto.pc
-  # now part of libxvmc
-  rm -f "${pkgdir}"/usr/include/X11/extensions/vldXvMC.h
-  # now part of libx11
-  rm "${pkgdir}"/usr/include/X11/extensions/XKBgeom.h
+  rm -f "${pkgdir}"/usr/share/pkgconfig/applewmproto.pc
 }