[arch-commits] Commit in libx11/repos/extra-x86_64 (PKGBUILD PKGBUILD)

[Felix Yan]

    Date: Monday, August 3, 2020 @ 12:34:01
  Author: felixonmars
Revision: 393092

archrelease: copy trunk to extra-x86_64

Added:
  libx11/repos/extra-x86_64/PKGBUILD
    (from rev 393091, libx11/trunk/PKGBUILD)
Deleted:
  libx11/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   87 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-03 12:33:50 UTC (rev 393091)
+++ PKGBUILD	2020-08-03 12:34:01 UTC (rev 393092)
@@ -1,40 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libx11
-pkgver=1.6.10
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(x86_64)
-url="https://xorg.freedesktop.org/"
-# keep xorgproto runtime dependency
-# https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
-depends=('libxcb' 'xorgproto')
-makedepends=('xorg-util-macros' 'xtrans')
-license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig})
-sha512sums=('ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff'
-            'SKIP')
-validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc at freedesktop.org>
-validpgpkeys+=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb at laas.fr>
-validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
-validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson <ajax at nwnk.net>
-
-build() {
-  cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
-  make
-}
-
-check() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: libx11/repos/extra-x86_64/PKGBUILD (from rev 393091, libx11/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-08-03 12:34:01 UTC (rev 393092)
@@ -0,0 +1,47 @@
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libx11
+pkgver=1.6.10
+pkgrel=2
+pkgdesc="X11 client-side library"
+arch=(x86_64)
+url="https://xorg.freedesktop.org/"
+# keep xorgproto runtime dependency
+# https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
+depends=('libxcb' 'xorgproto')
+makedepends=('xorg-util-macros' 'xtrans')
+license=('custom')
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig}
+        libx11-xim-crash.patch::https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/93fce3f4e79cbc737d6468a4f68ba3de1b83953b.patch)
+sha512sums=('ad384d8896fbe587f7fd99b0d3cc56fac6e2facbab52fa99174200d06b19dd163a483c998acf3834b3a4a3aa4de0dbbe13919a1c80e6797afe467c7075b403ff'
+            'SKIP'
+            '4b43ea287200f0a078d1d446909d075d4bff84c5325a90a897b6473b498d044d8ba951adada247d5a3660147e5f6c3346be2078e91ab7f770964404fd76090c9')
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc at freedesktop.org>
+validpgpkeys+=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb at laas.fr>
+validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner <mattst88 at gmail.com>
+validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson <ajax at nwnk.net>
+
+prepare() {
+  cd "${srcdir}/libX11-${pkgver}"
+  patch -p1 -i ../libx11-xim-crash.patch
+}
+
+build() {
+  cd "${srcdir}/libX11-${pkgver}"
+  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
+  make
+}
+
+check() {
+  cd "${srcdir}/libX11-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/libX11-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}