fix bug 527662, respond to touchscreen

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

4 files changed, 105 insertions, 16 deletions

diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog
index f31bf58ed836..c05d57432418 100644
--- a/xfce-base/xfwm4/ChangeLog
+++ b/xfce-base/xfwm4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfwm4
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.238 2015/07/04 14:22:19 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.239 2015/07/04 15:02:54 perfinion Exp $
+
+*xfwm4-4.12.3-r1 (04 Jul 2015)
+
+  04 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  +files/xfwm4-4.12-touchscreen-subwindow-fix.patch, +xfwm4-4.12.3-r1.ebuild:
+  fix bug 527662, respond to touchscreen
 
   04 Jul 2015; Jason Zaman <perfinion@gentoo.org> xfwm4-4.12.3.ebuild:
   bug 553816, libxfce4ui dep was not specific enough
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index a8e39aa97e97..4611461b9c91 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfwm4-4.12-touchscreen-subwindow-fix.patch 661 SHA256 109521aef5110ef793fc03a4f17251da35730905f41169c02c37f7cef12099ef SHA512 6d7b4216c6cacceb1f923729676ec622d9ab2518a5d5948065c90ded1dcab8ace1e53bcd6458a555358a1d5e9a7dfcc9214667a091577f374acc92c940b9e1c9 WHIRLPOOL 31aa7dafe22908b78278b86a263612b700e76951b59bd95e05203d763940500e5424358925baaf5767ec9627b541fa72c183a3f3c46ba946eb52a23c4ac47ea7
 DIST xfwm4-4.10.1.tar.bz2 1093825 SHA256 380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 SHA512 dad7cdb929b60cdee539dd96e0cc5fb5c71ab13163469b075164b4e54f1b7d72b8e84423aa533d6619902e269bd3d8070dac835729cf22ecbdbecffa36ce4004 WHIRLPOOL 582526f987df98ff3fa5c49e5acbb1e097e4b94fdd0494e6726542879feb3ede8bad34de10c86e343f4daf8b1fd3c8f5b966deb87e6091c3c047ee4994e8828f
 DIST xfwm4-4.12.3.tar.bz2 1191929 SHA256 f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac SHA512 96fcc76fc640027883a7a3373836565987b1d3d4e61fb40aa7e2f990a8140d92cf66171fb4517368faba45c9083a3ad19f589d59b07a55c3417aaaca87e408d7 WHIRLPOOL 0fd8e058694cb2f6486bc59443e00d8ed42ebd9dabe39775451d94c14c7e2ea87a520edea26e3bc7033fa1d95aa0ca1a6b2045eca9a1c9d8ecfb67f1ef88b0a8
 EBUILD xfwm4-4.10.1.ebuild 1418 SHA256 881a317c4d00a4157b1308bd2e79652d6ebee430cbfd68e8d27c0bd71fb25db5 SHA512 73de378f563f6fe45350a70f9c3b731971b503e28664af020dcf8567bc5a2ba7c85e745fcbf0016395e7371b026768af976c2805d9829efacc25846981980b87 WHIRLPOOL dbd169bb3ea36dfe764b3257fba5bd96a9067f53b4da84f10fca87e265d27e7b75c3c0fa4067960358b0cbf53a4ffd2f370243951096477b00375772e7563e4a
+EBUILD xfwm4-4.12.3-r1.ebuild 1795 SHA256 8d7c60b4744027b1e8359c40baf5d16e7b9ceac04756900bc48af601f7b405e0 SHA512 fd93c869dcf91f537831030c488d23c3305edde7f330bfa4f934e67eb97351464db8bf9c831096a89108307dbcbf7ee2b6e74274e09fba4e48e9e141edba8807 WHIRLPOOL 945e865d55de4d910bb1ced6a7807ea4aad4f6d31bd8e1389ba0d0e501ca6f79cdd269401c6bcb950138785eb02cbf66f9fcfc923788a543774a66bca115c291
 EBUILD xfwm4-4.12.3.ebuild 1714 SHA256 af51b90b9c3aaca9718bb026da192b61fe4e801cdab5096736c11cf766642ff0 SHA512 2c8f0c4555268b7c83be3c181bd2c9645b060307a018daf7a756b76f69e796b0e80471a60e807d0e3a320e87e58cc64969990db1702646063a967e372e10509b WHIRLPOOL b4bf4f99bc4b18e7cb6977cf0c4d231209b68bed3ac5088aaecca7045e9ea69b359a9081c68079b6892fd243c5aed4ac5a68496a897b27a3f4922ec57bef6081
-MISC ChangeLog 26413 SHA256 a1cdf2c59f9863544c7498838527439f7f3e6208d4436dd8b42dba4464b5e50a SHA512 75f0cc743b0c0d6af07b714147676c285d6480184fa468bac3ca7b2233d177b7f9cf49a0955327ed96c53370c29495f5f1d0d5b8a137f5cdce49a152d3f05bf2 WHIRLPOOL 0d90f3b08d7e2f9c521b9b09beebcbef9c8bfbffd9d10ad80ef1d7ff71df18525b9a2f6016275c20266cabbd4afeb3828eef898d94ba8e173a4efc47a8ba5e28
+MISC ChangeLog 26615 SHA256 0e86c01f5c97999c2d9d90b178a33b969003166e8b186e047fd4148e7af3f412 SHA512 31e0b00a3db829b02a0808588fd60e572c291e3f0345e9ba7808e18c1f0af89b7721ae54f82bef0832c253eab51daac6a734a5e42629680a45125ff9ec4a9383 WHIRLPOOL 2a848ba3a83b917977506fcece65fd1c989fc43ceee7880f463ecf32539fd308f38a16b5098bb113aff8ae1a448fb400a912e854baaec84e60bdbf4bb6f08d3b
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVl+wcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVl/WkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vjp4QAJ5CQI6VnhNnVEICumUY0Llc
-mUwoXoI+1zBP1BwsXZTFhTHpwUiEExFUgfofyN3iliS5dYpiPzYt1uxyzsJUp+gm
-F1sJK7xd+hvQ9MryO6kYZS5LFMQt2IEUNV5uBfdprGjNPBTdrsmFi1gzw8gJl6b8
-SpN01FRqJg6fIVytZx2sIzU4JkKKrCOgGLtnuZN1ETJaln5f3LOyO61XXFxsDwAb
-IrSr6IWjW88NO0q84LSS97aD5sVSQPyFMFvlBNY70L0oiqkfurgsuJ4DVEIiXsR6
-exCuhQoZKZRhnFHkXm1H2HbMo2288xfI7yWsgLuwC4apVhhrg189NKSoV7/kFHYb
-1GK1pHZaeiL2TYPciZ5UnUDAZ3NGBsWnM2lmiJbqMZ3psCKEjK8eoCS/Q0CJnefD
-qtywUre39AdPsqIRtvO5OsdHoGf6N2bxkn0R1/slquO3t9vbu/IBeqndQBPRjmy+
-Jobz8/fd4K4qK7yFXe2L5/jCroU8XVWkliKmTitXgvFnOgA3HC5SuM0ipvheVQ3P
-PhkCMx8V6/fdObROhBLvqB1E4wihcXzFVpCZVBamPMb6lSnBfRkAtvpysNQ9KtY7
-bjmIGDfsXQ2W+rRsEbQ9ExMAN05HQnCYNd1wymjV7TdAn9v3z184tWo9p80zybTZ
-QZQm7lbTWEQ1gAfMznNt
-=LE33
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9Vlx0P/ROih3KYSDXXiXuz+MK00sA4
+DeZAu/0zF9s7CTPqqLRor6dakr8/vfEoCEBFHwVdozv67cE9qH6jyiB4cLfnWuy+
+bV5zlXKz4FdGdUtsvYLjVFEmnSACcOsH7C0tcXoPXzI5/HFozds+CHmOpy3mLBA4
+pjBM835uvsh0SHL31jtBvRprA5ytEdSnBEtoDPv9usa1D7jDkfHh4DkBTXkZHBip
+uuWC6kAxdcPuKP64MEmrRAcNMVhIUQtcJuLY7ax7IjXIhgnmxIezyw9QlN2rwJtb
+4C4uIQxqbk7VB7no3hbshnFUQMPJVUWKOriGuG7bXbAWK9psQiAGP8vA48p6I5bG
+NjCTRX6m++ZghOLkoZG5he66CJ+XnjOcjBIMAQvu8rDqPoChDd6PBAxzXxqE0zSg
+2bqyxJtlUpBbneMC6fp1hRdJ+7mpIVmx0b5chxZKo5F92KnyswQXYcz4bY6/nhdS
+ddg8m9JhRWRnWJjFb1q+1Cyxi4OGVoOVfqQftrBdbhapXufl7AGPNSe4XtwoKPbR
+EeHLOPEtE4n9UqnCzvOUzs6YBL4h8NFOQMD2UCHIiyKxRHzy5PQdVM9hGMex22kE
+OtGEAmG5LZwuz7U3vDUxxqjAm1n52cSRAY00r8gtONdht3T+KGlVbUSoMJWA5nSb
+/Fg1U0r/hdH1p1fsfG8g
+=Z6pE
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch b/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
new file mode 100644
index 000000000000..98de1cab3f6c
--- /dev/null
+++ b/xfce-base/xfwm4/files/xfwm4-4.12-touchscreen-subwindow-fix.patch
@@ -0,0 +1,17 @@
+diff -ur xfwm4-4.10.1/src/events.c b/src/events.c
+--- xfwm4-4.10.1/src/events.c	2014-10-31 14:19:18.012757936 -0600
++++ b/src/events.c	2014-10-31 14:18:54.901758349 -0600
+@@ -888,6 +888,13 @@
+     {
+         state = ev->state & MODIFIER_MASK;
+         win = ev->subwindow;
++        if (!win) {
++            Window root_ret;
++            int rx,ry,wx,wy;
++            unsigned int mask_ret;
++            XQueryPointer(display_info->dpy, ev->window,
++                &root_ret, &win, &rx, &ry, &wx, &wy, &mask_ret);
++        }
+         screen_info = c->screen_info;
+ 
+         if ((ev->button == Button1) && (state) && (state == screen_info->params->easy_click))
diff --git a/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
new file mode 100644
index 000000000000..43d3b89add56
--- /dev/null
+++ b/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.12.3-r1.ebuild,v 1.1 2015/07/04 15:02:54 perfinion Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Window manager for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug dri startup-notification +xcomposite"
+
+RDEPEND="dev-libs/dbus-glib:=
+	>=dev-libs/glib-2.20:=
+	>=x11-libs/gtk+-2.24:2=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/pango:=
+	>=x11-libs/libwnck-2.30:1=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/libxfce4ui-4.11:=
+	>=xfce-base/xfconf-4.10:=
+	startup-notification? ( x11-libs/startup-notification:= )
+	xcomposite? (
+		x11-libs/libXcomposite:=
+		x11-libs/libXdamage:=
+		x11-libs/libXfixes:=
+		)"
+# libdrm: only headers are used
+# libICE/liBSM: not really used anywhere but checked by configure
+#   https://bugzilla.xfce.org/show_bug.cgi?id=11914
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	x11-libs/libICE
+	x11-libs/libSM
+	xfce-base/exo
+	virtual/pkgconfig
+	dri? ( >=x11-libs/libdrm-2.4 )"
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable dri libdrm)
+		$(use_enable startup-notification)
+		--enable-xsync
+		--enable-render
+		--enable-randr
+		$(use_enable xcomposite compositor)
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog COMPOSITOR NEWS README TODO )
+
+	PATCHES=(
+		"${FILESDIR}/xfwm4-4.12-touchscreen-subwindow-fix.patch"
+		)
+}