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

[Evangelos Foutras]

    Date: Saturday, January 9, 2021 @ 18:45:16
  Author: foutrelis
Revision: 405870

upgpkg: xfwm4 4.16.1-1: new upstream release

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

----------------------------------------------+
 PKGBUILD                                     |   13 +++---------
 protect-against-error-from-XGetWMHints.patch |   27 -------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-09 18:44:01 UTC (rev 405869)
+++ PKGBUILD	2021-01-09 18:45:16 UTC (rev 405870)
@@ -2,8 +2,8 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfwm4
-pkgver=4.16.0
-pkgrel=2
+pkgver=4.16.1
+pkgrel=1
 pkgdesc="Xfce's window manager"
 arch=('x86_64')
 url="https://www.xfce.org/"
@@ -12,16 +12,11 @@
 depends=('libxfce4ui' 'xfconf' 'libwnck3' 'libepoxy' 'libxpresent'
          'hicolor-icon-theme')
 makedepends=('intltool')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        protect-against-error-from-XGetWMHints.patch)
-sha256sums=('1e22eae1bbb66cebfd1753b0a5606e76ecbf6b09ce4cdfd732d093c936f1feb3'
-            '30ac5977e7af93238a70656c22acd2a09eb316ed7b84e99ebfc93c9d9a352771')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # https://gitlab.xfce.org/xfce/xfwm4/-/merge_requests/18
-  patch -Np1 -i ../protect-against-error-from-XGetWMHints.patch
 }
 
 build() {

Deleted: protect-against-error-from-XGetWMHints.patch
===================================================================
--- protect-against-error-from-XGetWMHints.patch	2021-01-09 18:44:01 UTC (rev 405869)
+++ protect-against-error-from-XGetWMHints.patch	2021-01-09 18:45:16 UTC (rev 405870)
@@ -1,27 +0,0 @@
-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
-