commit 21de08a5cdcfb786fd69e6c426c869cfe5987b27 Author: Danny Rawlins <contact@romster.me> Date: Mon Sep 19 23:46:26 2022 +1000 [notify] xorg-xorgproto: move two header files to there respective ports, update this before xorg-libxvmc and xorg-libx11 to avoid file conflicts diff --git a/xorg-xorgproto/.footprint b/xorg-xorgproto/.footprint index d2005ff8..3b4a4929 100644 --- a/xorg-xorgproto/.footprint +++ b/xorg-xorgproto/.footprint @@ -49,7 +49,6 @@ drwxr-xr-x root/root usr/include/X11/extensions/ -rw-r--r-- root/root usr/include/X11/extensions/XI2proto.h -rw-r--r-- root/root usr/include/X11/extensions/XIproto.h -rw-r--r-- root/root usr/include/X11/extensions/XKB.h --rw-r--r-- root/root usr/include/X11/extensions/XKBgeom.h -rw-r--r-- root/root usr/include/X11/extensions/XKBproto.h -rw-r--r-- root/root usr/include/X11/extensions/XKBsrv.h -rw-r--r-- root/root usr/include/X11/extensions/XKBstr.h @@ -114,7 +113,6 @@ drwxr-xr-x root/root usr/include/X11/extensions/ -rw-r--r-- root/root usr/include/X11/extensions/syncconst.h -rw-r--r-- root/root usr/include/X11/extensions/syncproto.h -rw-r--r-- root/root usr/include/X11/extensions/syncstr.h --rw-r--r-- root/root usr/include/X11/extensions/vldXvMC.h -rw-r--r-- root/root usr/include/X11/extensions/xcalibrateproto.h -rw-r--r-- root/root usr/include/X11/extensions/xcalibratewire.h -rw-r--r-- root/root usr/include/X11/extensions/xcmiscproto.h diff --git a/xorg-xorgproto/.signature b/xorg-xorgproto/.signature index 0ad12341..d660b8df 100644 --- a/xorg-xorgproto/.signature +++ b/xorg-xorgproto/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndGyD4F+ZNxlUt00VTjeplWaOCsY+SC4Wb8YrKUfBHISbERU7eJBNKP4ZicGlL+js/Il9icIKhQ0KPEvnUUaIAQ8= -SHA256 (Pkgfile) = 62e8fdf36640d2db7511c34444225d7153953d0e1865172b7278bd5d278aed84 -SHA256 (.footprint) = 48545e86d789569fab329cf1640e78ea622bd394d52d2b9e30e3d79d2d4d088a +RWTSGWF5Q7TndFENRki6gYwNCTviImY1tLYYQUUpEF8uBy6UmQmBEKOUJef5AzcfWvBuMDGhllsIxcoaxF7r0z88bSYKQlM+zw4= +SHA256 (Pkgfile) = 762e690fd66eb0b5b9e54fb4ab71ebd831c3799f6666659f2537cdae7d5b929d +SHA256 (.footprint) = 82871a1c5a447bd86a5fa118352e4cb026d9dbba1c1c3dd6f045e90c593bc50a SHA256 (xorgproto-2022.2.tar.xz) = 5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e diff --git a/xorg-xorgproto/Pkgfile b/xorg-xorgproto/Pkgfile index 37f5d0fd..6d858e1b 100644 --- a/xorg-xorgproto/Pkgfile +++ b/xorg-xorgproto/Pkgfile @@ -5,7 +5,7 @@ name=xorg-xorgproto version=2022.2 -release=1 +release=2 source=(https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$version.tar...) build() { @@ -17,9 +17,14 @@ build() { -D b_pie=true \ -D legacy=true meson compile -C build - DESTDIR=$PKG meson install -C build + DESTDIR="$PKG" meson install -C build - rm $PKG/usr/include/X11/extensions/{apple,windows}* - rm $PKG/usr/share/pkgconfig/{apple,windows}wmproto.pc - rm -r $PKG/usr/share/doc + # cleanup + rm "$PKG"/usr/include/X11/extensions/apple* + rm "$PKG"/usr/include/X11/extensions/windows* + rm "$PKG"/usr/share/pkgconfig/apple* + rm "$PKG"/usr/share/pkgconfig/windows* + rm "$PKG"/usr/include/X11/extensions/vldXvMC.h # xorg-libxvmc >= 1.0.13-2 + rm "$PKG"/usr/include/X11/extensions/XKBgeom.h # xorg-libx11 >= 1.8.1-2 + rm -r "$PKG"/usr/share/doc }