summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2018-12-18 03:04:01 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2018-12-18 03:04:01 +0000
commit79d1aaf7086024e489438e8f407bbbe490e21166 (patch)
tree9b0df49e8a0d778ca3235ada446463e27f7958af
parentcdd02585c5a53c9b1eced9c94e2ce44f10b3d178 (diff)
parent42f456b805cfeb2e24f2962d81a3d9357428dbda (diff)
downloadpackages-79d1aaf7086024e489438e8f407bbbe490e21166.tar.gz
packages-79d1aaf7086024e489438e8f407bbbe490e21166.tar.bz2
packages-79d1aaf7086024e489438e8f407bbbe490e21166.tar.xz
packages-79d1aaf7086024e489438e8f407bbbe490e21166.zip
Merge branch 'xfwm4' into 'master'
user/xfwm4: make functional See merge request !129
-rw-r--r--user/xfwm4/APKBUILD8
-rw-r--r--user/xfwm4/fix-mask-length.patch12
2 files changed, 17 insertions, 3 deletions
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index 14451017a..d560fff66 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
pkgname=xfwm4
pkgver=4.13.1
-pkgrel=0
+pkgrel=1
pkgdesc="Window manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
@@ -11,8 +11,8 @@ makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
gobject-introspection-dev vala-dev"
subpackages="$pkgname-lang"
langdir="/usr/lib/locale"
-source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2"
-sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2"
+source="http://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-$pkgver.tar.bz2
+ fix-mask-length.patch"
build() {
cd "$builddir"
@@ -36,3 +36,5 @@ package() {
make DESTDIR="$pkgdir" install
}
+sha512sums="2ac5acdefff3a89b8525719b345dfeb2dc71104b4da341afe99d7c57c049753c4cdb81a512d1f344e5fb463c7143673e83316b63888777bdcf254c4a07ca8320 xfwm4-4.13.1.tar.bz2
+88733a4d69b58b0c98f2f46694ccc8bda4e5bc1b565d952123cee466b3f89f95d72fc28c8e9c173dcc0aee606c9f4b085d891004d769b74ad0c7084d8dec00a9 fix-mask-length.patch"
diff --git a/user/xfwm4/fix-mask-length.patch b/user/xfwm4/fix-mask-length.patch
new file mode 100644
index 000000000..dd050c8dc
--- /dev/null
+++ b/user/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++)