Add upstream patches for bug #512428 by Small Penguin.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 161 insertions, 5 deletions

diff --git a/x11-misc/easystroke/ChangeLog b/x11-misc/easystroke/ChangeLog
index 853e129a9a9d..5738a86515ed 100644
--- a/x11-misc/easystroke/ChangeLog
+++ b/x11-misc/easystroke/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/easystroke
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/easystroke/ChangeLog,v 1.1 2014/06/04 03:14:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/easystroke/ChangeLog,v 1.2 2014/06/04 17:37:08 jer Exp $
+
+*easystroke-0.6.0-r1 (04 Jun 2014)
+
+  04 Jun 2014; Jeroen Roovers <jer@gentoo.org> +easystroke-0.6.0-r1.ebuild,
+  +files/easystroke-0.6.0-buttons-scroll-send.patch,
+  +files/easystroke-0.6.0-reinstate-signal-handlers.patch:
+  Add upstream patches for bug #512428 by Small Penguin.
 
 *easystroke-0.6.0 (04 Jun 2014)
 
diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
index 0acbc1832c8f..b83f1766bc7d 100644
--- a/x11-misc/easystroke/Manifest
+++ b/x11-misc/easystroke/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX easystroke-0.6.0-buttons-scroll-send.patch 1431 SHA256 c47c3d600740a73c3601dc27fc59496a1d2f127791008bd17481a34c8af3b510 SHA512 f8a862c450c665db4409d9abb07687fac5fac182a8f36038c795eb25a0cf732e0ccc3e589ae6c6eb65bde9a4f4cbd680f267734d2a65b301d1c8e7fa078dfcff WHIRLPOOL f3fd29a5d8624a4167e21c324b208380989b15a857350350ab11692b87c8aff815a6e9cfd792e10cfcfc7d399d959d2432b2ef6d3d3c01bebca5f5c83f3d9f06
 AUX easystroke-0.6.0-cellrendertextish.patch 718 SHA256 3cbc030f918afdde366b401e38f8693851fc070addfa7df6fc1f5c571edcd504 SHA512 2feacef4d9b1707dd1e20a2e84b78313744bc9ce9b2a7d0070cab47b691ec2cfd1e1616aaf1c30a722ae5ecb16c230b6a647965da4194f2700262977eedb8b9f WHIRLPOOL 05d034af4dbec0a8340c160bcc4a51f5cb1e28d801d20891f8f7e12884357b7ac5d3448629acb2cdf781d934b73c99b72a90767a9520aa69791e803f870f9610
 AUX easystroke-0.6.0-desktop.patch 294 SHA256 09019df4e9e5c7c94851d83f12fcde0dd5953970e7d06b7d7e2f02b86ee4c922 SHA512 082b353b21fdb7754a3b94519a426f69c67caca32977657bdc09ca158d783612a454b2fc08949cb9cb2ee2d1c3ce07d6f7915e782f50c3829f456e31f6330471 WHIRLPOOL 6498ae7407aa58fa3b8c6d073cb22fa70ccf15297287b19897c29ebd4503fcdf645b29f674b4f8017f3603ac602cbda2ff67186982bb7595a3c3c3d5c8bf80cc
 AUX easystroke-0.6.0-gentoo.patch 1672 SHA256 3bcf989e34442a6295a2c19ee4a092034012fc3462da331c40cde00bc543190e SHA512 e44b7d01506242985ec2b53d4f267425d7877649d4ca734ade93a68b9d52b03af1cf7fc9eab81617d2459cbe27eb88f4f82754416a910fc01e1b0de9b34486a8 WHIRLPOOL 24bb3584dab7c3ae3041fed08283f824bd7fdccedb7668b8eb6784fd8c81a4c1142fbfa080f59b6770f742adac944467d79eed2731a5a577d8603692ecd52691
+AUX easystroke-0.6.0-reinstate-signal-handlers.patch 1070 SHA256 440bd92ff98c5068741a4f4846b232ca3601bb5dbdc2540750d807ce0c13aa5a SHA512 9cfe216ecfc2148e22d2a91f25b294bde2f7933e912f2ede86002679763e0a6eb14bb3f1182fd07156d103baa4bef4434e45b27ae3753c31758524c680665572 WHIRLPOOL 26db42fe7209a5d48dec79cb7379eb24f6fb49a5f334baeec8c9bc4a44d615d25b8fcd92fbe7948bd4a37f2b07b02929e123e7f1424f5d35bbbda19855bcb8d6
 DIST easystroke-0.6.0.tar.gz 121358 SHA256 f4c37adbc4dd405a24badb9e6be20d3223b4087ff9caed2c15ff71674051d0fd SHA512 a74cbdfd2b56e6b20d895297e80fb63f3d8ac938235ecf7067f984d087004af22a5ea0116ae20b948e238b02a06b14044a7025d65840f0c8d00542332387c921 WHIRLPOOL d1305449563d599c5159ebddb2fdc6c17f2e79d8a1ea5186cff9f6785545cb2941413fb498347da8801ac665e20f1aa252270bcc88e93d97111ae253924d7b18
+EBUILD easystroke-0.6.0-r1.ebuild 1342 SHA256 e224d049c2d9e3b6ba4a20feb109fc33fcf111f788968b855d7c0bb239f16c25 SHA512 faf4cd1f1453439d5d06c251e54b052d339351b4d1dad02712760501b51590f6b5a4010dd97a690d92ff3606ce1848a78c4457253604b8d09c28d21fe7df0f6a WHIRLPOOL 92044ee2d1a2846221fbe888899748ceb4c3e2b1c66b88d3c2e52bb913e5bd49980d8e3d7c822eeb0587509caa19c0805b4d349e46e07037d37d38f28f5460b5
 EBUILD easystroke-0.6.0.ebuild 1227 SHA256 7691e97cd3ac167c0972792641abc7fc8970394e50835b1e94925c62434e0b75 SHA512 4a8616bf5d2e4b33374caf908bcce50189dc7e06a1b7d72e4398dc61bf296df2197945d8b4ef8a634cc34778a54949e0dcf44bd49df771c4e284b33e716f1ac0 WHIRLPOOL 0921a94a3a77127c5321a9971f7cd9ba1ad1a46e980be8d76fee5f1f49b17020bd882772fa39a99314bbd5d8f02e18f22f92bfe424af9edd198d713104ea9371
-MISC ChangeLog 508 SHA256 e6ebe1ebf521e2293fe106542f82d9f33d26366da9f21496647fcb0aae12d476 SHA512 db761db972871610e0998aed72fecbbefe240c87650b4de263d48525890f6d03ff6216bde68f721c2a13a60eb780765abef0b09c84557bc2a607335bb7fdb7f9 WHIRLPOOL 13c475dbcc98f48ba9e59ea4239c0db1c9c946bab68a0ac3fcad3b343d532017d3221ff762678947df7d416205ad4f422f699a44a7963c954204bc6e8114710d
+MISC ChangeLog 790 SHA256 63af8403beb97e625046e9ba17c28119bb497f661dff3d7ebf30bb6d5a2a4a21 SHA512 82dbf265350fb0d342457afb27e6b69f2eafccbe779216fcbc499143a2a9c0662272ff8ed285de0d3ec6f9033f6703296eaff152462ae520d8ba381ef7f563a8 WHIRLPOOL 75a6b9cd0f39353ce93c9ef7bf93b41374d204145d019330dbba8555870aeb883ba4596a5fb0b233916b46a98c44770e271e4ec4fb7636bf5db1444bb6fe54e0
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOOjxkACgkQVWmRsqeSphOm+gCcCGxvFj2PD/wqhfcUsF8MTcWA
-dm0An0V7lkR3Tq6NGx5c6HoFY+ML4Ia8
-=HxrH
+iEYEAREIAAYFAlOPWUUACgkQVWmRsqeSphOV1wCfTXe0lAwESDyVwE5gBsJBXQQF
+NkwAniqF8T2APIzlHUsZ65LyzEnc740r
+=pnyu
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..f8d2578a5168
--- /dev/null
+++ b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild,v 1.1 2014/06/04 17:37:08 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a gesture-recognition application for X11"
+HOMEPAGE="http://sourceforge.net/apps/trac/easystroke/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/boost
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cellrendertextish.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-reinstate-signal-handlers.patch
+	epatch "${FILESDIR}"/${P}-buttons-scroll-send.patch
+
+	tc-export CC CXX PKG_CONFIG
+
+	strip-linguas -i po/
+
+	local es_lingua lang
+	for es_lingua in $( printf "%s\n" po/*.po ); do
+		lang=${es_lingua/po\/}
+		has ${lang/.po/} ${LINGUAS} || rm ${es_lingua}
+	done
+}
+
+src_compile() {
+	emake \
+		AOFLAGS='' \
+		LDFLAGS="${LDFLAGS}" \
+		PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+}
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
new file mode 100644
index 000000000000..27bfa4cfee66
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-buttons-scroll-send.patch
@@ -0,0 +1,43 @@
+From 5388934e722308cd314d65e362ddfaf6e5ab6c94 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Sat, 13 Apr 2013 14:10:35 -0400
+Subject: Make buttons and scroll work properly with 'send'
+
+---
+ handler.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/handler.cc b/handler.cc
+index f47aae3..c1bd279 100644
+--- a/handler.cc
++++ b/handler.cc
+@@ -545,7 +545,7 @@ class AbstractScrollHandler : public Handler {
+ 
+ protected:
+ 	AbstractScrollHandler() : last_t(0), offset_x(0.0), offset_y(0.0) {
+-		if (!prefs.move_back.get() || xstate->current_dev->absolute)
++		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
+ 			return;
+ 		Window dummy1, dummy2;
+ 		int dummy3, dummy4;
+@@ -563,7 +563,7 @@ protected:
+ 	}
+ protected:
+ 	void move_back() {
+-		if (!prefs.move_back.get() || xstate->current_dev->absolute)
++		if (!prefs.move_back.get() || (xstate->current_dev && xstate->current_dev->absolute))
+ 			return;
+ 		XTestFakeMotionEvent(dpy, DefaultScreen(dpy), orig_x, orig_y, 0);
+ 	}
+@@ -1115,6 +1115,8 @@ XState::XState() : current_dev(NULL), in_proximity(false), accepted(true) {
+ 
+ void XState::run_action(RAction act) {
+ 	RModifiers mods = act->prepare();
++	IF_BUTTON(act, b)
++		return handler->replace_child(new ButtonHandler(mods, b));
+ 	if (IS_IGNORE(act))
+ 		return handler->replace_child(new IgnoreHandler(mods));
+ 	if (IS_SCROLL(act))
+-- 
+1.8.4
+
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
new file mode 100644
index 000000000000..2e96346459a8
--- /dev/null
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-reinstate-signal-handlers.patch
@@ -0,0 +1,42 @@
+From 7bda4bd9c705413598ee9b534884bc7f23704932 Mon Sep 17 00:00:00 2001
+From: Thomas Jaeger <ThJaeger@gmail.com>
+Date: Thu, 20 Jun 2013 01:45:20 -0400
+Subject: Reinstate signal handlers that got lost in the gtk3 transition
+
+Also, fix a segfault when handling SIGINT.
+---
+ main.cc | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/main.cc b/main.cc
+index 55d0b3c..8cd9c56 100644
+--- a/main.cc
++++ b/main.cc
+@@ -161,7 +161,12 @@ void quit() {
+ 		xstate->bail_out();
+ 	dead = true;
+ 	win->hide();
+-	xstate->queue(sigc::ptr_fun(&Gtk::Main::quit));
++	Glib::RefPtr<Gio::Application> app = Gio::Application::get_default();
++	xstate->queue(sigc::mem_fun(*app.operator->(), &Gio::Application::quit));
++}
++
++void sig_int(int) {
++	quit();
+ }
+ 
+ class App : public Gtk::Application, Base {
+@@ -371,6 +376,10 @@ void App::on_activate() {
+ 
+ 	create_config_dir();
+ 	unsetenv("DESKTOP_AUTOSTART_ID");
++
++	signal(SIGINT, &sig_int);
++	signal(SIGCHLD, SIG_IGN);
++
+ 	dpy = XOpenDisplay(NULL);
+ 	if (!dpy) {
+ 		printf(_("Couldn't open display.\n"));
+-- 
+1.8.4
+