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

[Laurent Carlier]

    Date: Wednesday, October 9, 2019 @ 18:31:19
  Author: lcarlier
Revision: 364283

upgpkg: libx11 1.6.9-2

remove file XKBgeom.h - conflicting with xorgproto package

Modified:
  libx11/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-09 18:16:42 UTC (rev 364282)
+++ PKGBUILD	2019-10-09 18:31:19 UTC (rev 364283)
@@ -3,7 +3,7 @@
 
 pkgname=libx11
 pkgver=1.6.9
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
@@ -33,6 +33,9 @@
   cd "${srcdir}/libX11-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
+  # file already in xorgproto - introduced in libx11-1.6.9
+  rm "${pkgdir}"/usr/include/X11/extensions/XKBgeom.h
+
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }