Date: Saturday, December 26, 2020 @ 07:32:12
Author: foutrelis
Revision: 405016
archrelease: copy trunk to extra-x86_64
Added:
xfwm4/repos/extra-x86_64/PKGBUILD
(from rev 405015, xfwm4/trunk/PKGBUILD)
xfwm4/repos/extra-x86_64/protect-against-error-from-XGetWMHints.patch
(from rev 405015, xfwm4/trunk/protect-against-error-from-XGetWMHints.patch)
Deleted:
xfwm4/repos/extra-x86_64/PKGBUILD
----------------------------------------------+
PKGBUILD | 89 +++++++++++++------------
protect-against-error-from-XGetWMHints.patch | 27 +++++++
2 files changed, 76 insertions(+), 40 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-26 07:32:07 UTC (rev 405015)
+++ PKGBUILD 2020-12-26 07:32:12 UTC (rev 405016)
@@ -1,40 +0,0 @@
-# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfwm4
-pkgver=4.16.0
-pkgrel=1
-pkgdesc="Xfce's window manager"
-arch=('x86_64')
-url="https://www.xfce.org/";
-license=('GPL2')
-groups=('xfce4')
-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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-randr \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/PKGBUILD (from rev 405015,
xfwm4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-12-26 07:32:12 UTC (rev 405016)
@@ -0,0 +1,49 @@
+# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.16.0
+pkgrel=2
+pkgdesc="Xfce's window manager"
+arch=('x86_64')
+url="https://www.xfce.org/";
+license=('GPL2')
+groups=('xfce4')
+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')
+
+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"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-startup-notification \
+ --enable-randr \
+ --enable-compositor \
+ --enable-xsync \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/protect-against-error-from-XGetWMHints.patch
(from rev 405015, xfwm4/trunk/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:12 UTC
(rev 405016)
@@ -0,0 +1,27 @@
+From 59e326f5893c865dcfa03322e2c894a07243a9ef Mon Sep 17 00:00:00 2001
+From: sfan5 <sf...@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
+
