gentoo resync : 20.10.2021

4 files changed, 62 insertions, 7 deletions

diff --git a/app-i18n/ibus-handwrite/Manifest b/app-i18n/ibus-handwrite/Manifest
index f25313319dae..7da1de444ece 100644
--- a/app-i18n/ibus-handwrite/Manifest
+++ b/app-i18n/ibus-handwrite/Manifest
@@ -1,4 +1,6 @@
+AUX ibus-handwrite-blink.patch 647 BLAKE2B ed7914488f5d2fd69bb9c262d88b3b60cdccdbe5f37ce90a393cc99fd91dd1e862a18f2db70ebd83c357b0b06e4bdb5d63db72e421072db0551caaddcc52b7f2 SHA512 6b493fb3a964d36c63cc29d0f906a58041f93d2dd4008cf49e58540a833573e78492331203a69a0a880bb4eea8d34fbb8c953ee91af3d2ef2dc74a51c01fe977
 AUX ibus-handwrite-headers.patch 406 BLAKE2B cb683592e24d58d2fcd4718374e0d5e8cb51c6300f5123a3d9d43c34e24a3f3413dac5b256e6e7fb74494870d449ccc4a22fc5916a27407fe7c11af391ced5b3 SHA512 4629c68451d3b3ede478b03241d58c66f1a94be0caa05b4cf22d0287beb059c807e398457f0aaaccc6d0f85b9cb987153bae213d949e78afc2c66a6880baa7d7
+AUX ibus-handwrite-nested-function.patch 715 BLAKE2B e827ee4fdd65ab9dfb6aa2e484aff8d47d2a11993dc15668d34539c89adface47344aa724851d71a80424de46022b3adaf769259d995c61f290a816d7ff20658 SHA512 6df7fb76af1e229669b5e7d945daa01b1b61249cd244211388dc26d69a417ca49edb10f9adb2f5a7dd695b730926b6cda9570e1957341c94afce797016fcdb58
 DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1
-EBUILD ibus-handwrite-3.0.0.ebuild 770 BLAKE2B b0d1f161950a855bc15c07874adc08febc65267f17ff4226b2ea61319c0efd2ae2bc82d29be4f35dc8fdfe13f9196650e63dccadc46e134c68d31b3b0be6b3ee SHA512 f229abca3430d75ff899e7acd70df8490f338c36128e463f59e4bdb31e939a9fa06f6fa7307ba02d69ce583d45c0886149b7b5e3ad94e2394558f05d54f3a9d6
+EBUILD ibus-handwrite-3.0.0-r1.ebuild 857 BLAKE2B 946020fb670f50354396a66d03547e798515a9d99fb591810a23e6342bfb1efefdef0b2be1b18796295b580da08191af225be99655a2b9968cbb68f401cbfb28 SHA512 991e936fc7dc9b384582879f72803510f98f5e19ede9719d19acacffc15c934249331fc84c50e0de37842075b2452dd457e1940afaf1c812ae069632d4e0afa5
 MISC metadata.xml 335 BLAKE2B 5d4efa4813ffaf66e29f26f03ff8dcbb29fc4ece8cee37a73930c67f05ccd74f9c0fe928f81b1c65639d28912e9926684dc667c359be4f2e8b499450b8433890 SHA512 8fc0585a3c14f950d2f979faa9d5636da0446b7b170df75859a03eb3128d3c68cdeaabd894cf2e59729719a907274190a885dd0981ef5f4a8bac3aa16dab115f
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
new file mode 100644
index 000000000000..7954f2018c2e
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch
@@ -0,0 +1,23 @@
+From fcffa8f1ed798db3c2c4db0dbfc953f3147d37ba Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Mon, 31 Aug 2020 15:32:48 +0800
+Subject: [PATCH] Fix focus in/out issue
+
+---
+ src/engine.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index da01f06..d3d924e 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -155,9 +155,7 @@ static void ibus_handwrite_engine_focus_in(IBusHandwriteEngine *engine)
+ 
+ static void ibus_handwrite_engine_focus_out(IBusHandwriteEngine *engine)
+ {
+-	UI_hide_ui(engine);
+ 	printf("%s \n", __func__);
+-
+ }
+ 
+ static void ibus_handwrite_engine_reset(IBusHandwriteEngine *engine)
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
new file mode 100644
index 000000000000..96cbc118fa4f
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch
@@ -0,0 +1,26 @@
+--- a/src/UI_gtk.c
++++ b/src/UI_gtk.c
+@@ -74,6 +74,11 @@
+ 	return TRUE;
+ }
+ 
++static void clicked(GtkButton *button, IBusHandwriteEngine *engine)
++{
++    ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
++}
++
+ static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
+ {
+ 	int i;
+@@ -98,11 +103,6 @@
+ 
+ 		gtk_widget_show(bt);
+ 
+-		void clicked(GtkButton *button, IBusHandwriteEngine *engine)
+-		{
+-			ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
+-		}
+-
+ 		g_object_set_data(G_OBJECT(bt),"order",GINT_TO_POINTER(i));
+ 		g_signal_connect(bt,"clicked",G_CALLBACK(clicked),engine);
+ 
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
index cbabf59f6792..ffbab3234760 100644
--- a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 DESCRIPTION="Hand write recognition/input for IBus"
 HOMEPAGE="https://github.com/microcai/ibus-handwrite"
 SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls +zinnia"
@@ -19,11 +19,15 @@ RDEPEND="app-i18n/ibus
 		app-i18n/zinnia
 		app-i18n/zinnia-tomoe
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-blink.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-nested-function.patch
+)
 
 src_configure() {
 	econf \