aboutsummaryrefslogtreecommitdiffstats
path: root/community/xfwm4
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-09-12 08:54:28 +0300
committerTimo Teräs <timo.teras@iki.fi>2018-09-12 08:57:13 +0300
commit399fed273cdb25a82f9d58e165e5d000dd0b6e2b (patch)
tree824a9701b1ea86e35bd05d26f5027a09cca5c822 /community/xfwm4
parentdf0474aa7bd37fd50621b90fafbf75d1fc663f30 (diff)
downloadaports-399fed273cdb25a82f9d58e165e5d000dd0b6e2b.tar.bz2
aports-399fed273cdb25a82f9d58e165e5d000dd0b6e2b.tar.xz
community/xfwm4: fix xi2 mask length
This fixes breakage uncovered by musl 1.1.20 upgrade.
Diffstat (limited to 'community/xfwm4')
-rw-r--r--community/xfwm4/APKBUILD9
-rw-r--r--community/xfwm4/fix-mask-length.patch12
2 files changed, 18 insertions, 3 deletions
diff --git a/community/xfwm4/APKBUILD b/community/xfwm4/APKBUILD
index 0585c46f1f..a5f5f76765 100644
--- a/community/xfwm4/APKBUILD
+++ b/community/xfwm4/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfwm4
pkgver=4.13.1
-pkgrel=1
+pkgrel=2
pkgdesc="Xfce window manager, compatible with Gnome, Gnome2, KDE2, and KDE3"
url="https://xfce.org/"
arch="all"
@@ -13,7 +13,9 @@ makedepends="libxfce4ui-dev libwnck3-dev libxrandr-dev libxcomposite-dev
libxfixes-dev libxdamage-dev libxrender-dev libepoxy-dev dbus-glib-dev
libxpresent-dev"
install=
-source="http://archive.xfce.org/src/xfce/xfwm4/${pkgver%.*}/xfwm4-$pkgver.tar.bz2"
+source="http://archive.xfce.org/src/xfce/xfwm4/${pkgver%.*}/xfwm4-$pkgver.tar.bz2
+ fix-mask-length.patch
+ "
build () {
cd "$builddir"
@@ -41,4 +43,5 @@ package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2"
+sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2
+88733a4d69b58b0c98f2f46694ccc8bda4e5bc1b565d952123cee466b3f89f95d72fc28c8e9c173dcc0aee606c9f4b085d891004d769b74ad0c7084d8dec00a9 fix-mask-length.patch"
diff --git a/community/xfwm4/fix-mask-length.patch b/community/xfwm4/fix-mask-length.patch
new file mode 100644
index 0000000000..dd050c8dcd
--- /dev/null
+++ b/community/xfwm4/fix-mask-length.patch
@@ -0,0 +1,12 @@
+diff -ru xfwm4-4.13.1.orig/src/device.c xfwm4-4.13.1/src/device.c
+--- xfwm4-4.13.1.orig/src/device.c 2018-07-29 16:08:54.000000000 +0300
++++ xfwm4-4.13.1/src/device.c 2018-09-12 08:49:18.130254993 +0300
+@@ -301,7 +301,7 @@
+ guint i;
+
+ xievent_mask->deviceid = XIAllMasterDevices;
+- xievent_mask->mask_len = sizeof (mask);
++ xievent_mask->mask_len = len;
+ xievent_mask->mask = mask;
+
+ for (i = 0; i < G_N_ELEMENTS (core_to_xi2); i++)