[arch-commits] Commit in xfwm4/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, December 26, 2020 @ 07:32:07
  Author: foutrelis
Revision: 405015

upgpkg: xfwm4 4.16.0-2: fix XError while using Ghidra (FS#69095)

Added:
  xfwm4/trunk/protect-against-error-from-XGetWMHints.patch
Modified:
  xfwm4/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   15 +++++++++++--
 protect-against-error-from-XGetWMHints.patch |   27 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-25 17:51:39 UTC (rev 405014)
+++ PKGBUILD	2020-12-26 07:32:07 UTC (rev 405015)
@@ -3,7 +3,7 @@
 
 pkgname=xfwm4
 pkgver=4.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce's window manager"
 arch=('x86_64')
 url="https://www.xfce.org/"
@@ -12,9 +12,18 @@
 depends=('libxfce4ui' 'xfconf' 'libwnck3' 'libepoxy' 'libxpresent'
          'hicolor-icon-theme')
 makedepends=('intltool')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        protect-against-error-from-XGetWMHints.patch)
+sha256sums=('1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3'
+            '30ac5977e7af93238a70656c22acd2a09eb316ed7b84e99ebfc93c9d9a352771')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://gitlab.xfce.org/xfce/xfwm4/-/merge_requests/18
+  patch -Np1 -i ../protect-against-error-from-XGetWMHints.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: protect-against-error-from-XGetWMHints.patch
===================================================================
--- protect-against-error-from-XGetWMHints.patch	                        (rev 0)
+++ protect-against-error-from-XGetWMHints.patch	2020-12-26 07:32:07 UTC (rev 405015)
@@ -0,0 +1,27 @@
+From 59e326f5893c865dcfa03322e2c894a07243a9ef Mon Sep 17 00:00:00 2001
+From: sfan5 <sfan5 at live.de>
+Date: Thu, 24 Dec 2020 18:29:34 +0100
+Subject: [PATCH] events: Protect against error from XGetWMHints()
+
+---
+ src/events.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/events.c b/src/events.c
+index 97879169a..9494696b0 100644
+--- a/src/events.c
++++ b/src/events.c
+@@ -1709,7 +1709,10 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
+                 XFree (c->wmhints);
+             }
+ 
++            myDisplayErrorTrapPush (display_info);
+             c->wmhints = XGetWMHints (display_info->dpy, c->window);
++            myDisplayErrorTrapPopIgnored (display_info);
++
+             if (c->wmhints)
+             {
+                 if (c->wmhints->flags & WindowGroupHint)
+-- 
+GitLab
+