Date: Monday, February 12, 2018 @ 19:12:49 Author: andyrtr Revision: 316731
upgpkg: xorgproto 2018.2-1 upstream update 2018.2; switch to new meson build system Modified: xorgproto/trunk/PKGBUILD ----------+ PKGBUILD | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-02-12 18:55:05 UTC (rev 316730) +++ PKGBUILD 2018-02-12 19:12:49 UTC (rev 316731) @@ -2,43 +2,47 @@ # Maintainer: AndyRTR <andy...@archlinux.org> pkgname=xorgproto -pkgver=2018.1 +pkgver=2018.2 pkgrel=1 pkgdesc="combined X.Org X11 Protocol headers" arch=('any') url="https://xorg.freedesktop.org/" license=('custom') -makedepends=('xorg-util-macros') # 'xmlto' 'libxslt' 'linuxdoc-tools' 'docbook-sgml' 'fop') +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') source=(https://xorg.freedesktop.org/archive/individual/proto/$pkgname-$pkgver.tar.bz2{,.sig}) -sha512sums=('eaad8947f8cda4683bd952706feaa926eed06c508925d3bed7c9a610f925844d3546bbfe49b5403220ca812d63442ca6a72e65ecc50a71899aadf60875156800' +sha512sums=('29ac0479de321eb921b1d902e4670e9e856f8b50c95c07a855aea122e5c9762ff34d01dbda9c795e4c652b09e21151f024aa7ba54bd463e14263db5240418862' 'SKIP') validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <a...@nwnk.net>" +prepare() { + mkdir build +} + build() { - cd "$pkgname-$pkgver" - # do not try to build additional docs, we don't have xorg-sgml-doctools - ./configure --prefix=/usr \ - --without-xmlto \ - --without-xsltproc \ - --without-fop - make + arch-meson $pkgname-$pkgver build + + ninja -C build } check() { - cd "$pkgname-$pkgver" - make -k check + meson test -C build } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir" ninja -C build install + # missing docs + install -m755 -d "${pkgdir}/usr/share/doc/${pkgname}" + install -m644 $pkgname-$pkgver/*.txt "${pkgdir}/usr/share/doc/${pkgname}/" + install -m644 $pkgname-$pkgver/PM_spec "${pkgdir}/usr/share/doc/${pkgname}/" + rm ${pkgdir}/usr/share/doc/${pkgname}/meson_options.txt + # licenses install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING* "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 $pkgname-$pkgver/COPYING* "${pkgdir}/usr/share/licenses/${pkgname}/" # cleanup rm -f ${pkgdir}/usr/include/X11/extensions/{apple,windows}*