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

[Andreas Radke]

    Date: Friday, December 11, 2020 @ 22:31:20
  Author: andyrtr
Revision: 403997

upgpkg: libx11 1.7.0-2: revert a commit that makes geeqie segfault

Modified:
  libx11/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-11 20:59:42 UTC (rev 403996)
+++ PKGBUILD	2020-12-11 22:31:20 UTC (rev 403997)
@@ -3,7 +3,7 @@
 
 pkgname=libx11
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
@@ -10,10 +10,12 @@
 # keep xorgproto runtime dependency
 # https://lists.archlinux.org/pipermail/arch-dev-public/2019-December/029767.html
 depends=('libxcb' 'xorgproto')
-makedepends=('xorg-util-macros' 'xtrans')
+makedepends=('xorg-util-macros' 'xtrans' 'git')
 license=('custom')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig})
+source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2{,.sig}
+        fix-segfault.diff::https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/30ccef3a48029bf4fc31d4abda2d2778d0ad6277.patch)
 sha512sums=('f661ca90350fd8a94f054b00f12f5122cea068ebff706acfd399462236c189a296a2358d17d16166635101cf56cc19303dd407873a159932d093c9f33556f9fb'
+            'SKIP'
             'SKIP')
 validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith <alanc at freedesktop.org>
 validpgpkeys+=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb <matthieu.herrb at laas.fr>
@@ -21,6 +23,12 @@
 validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson <ajax at nwnk.net>
 validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard <keithp at keithp.com>"
 
+prepare() {
+  cd "${srcdir}/libX11-${pkgver}"
+  # https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/125
+  patch -R -p1 -i ../fix-segfault.diff
+}
+
 build() {
   cd "${srcdir}/libX11-${pkgver}"
   ./configure --prefix=/usr --disable-static --disable-xf86bigfont