* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-handwrite/files/, app-i18n/ibus-handwrite/
@ 2017-08-12 16:06 Akinori Hattori
0 siblings, 0 replies; 4+ messages in thread
From: Akinori Hattori @ 2017-08-12 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 3ccaa0fc8598fdc581dd78cbcc3356b7d1bf02f1
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 16:02:51 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 16:02:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ccaa0fc
app-i18n/ibus-handwrite: fix implicit declarations
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../files/ibus-handwrite-headers.patch | 20 ++++++++++++++++++++
.../ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild | 5 ++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch
new file mode 100644
index 00000000000..f1cb4d57462
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-headers.patch
@@ -0,0 +1,20 @@
+--- a/src/handrecog_lucykila.c
++++ b/src/handrecog_lucykila.c
+@@ -14,6 +14,7 @@
+ #include <sys/fcntl.h>
+ #include <sys/mman.h>
+ #include <math.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+
+--- a/src/main.c
++++ b/src/main.c
+@@ -3,6 +3,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <ibus.h>
+ #include <locale.h>
+ #include <gtk/gtkgl.h>
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
index ac74a30b986..6965a9cf27e 100644
--- a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
-PATCHES=( "${FILESDIR}"/${PN}-link.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-link.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-handwrite/files/, app-i18n/ibus-handwrite/
@ 2020-01-21 23:47 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-01-21 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 808f686d9d23d07ed543496a93ad20386ace9dce
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 21 23:47:12 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 23:47:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808f686d
app-i18n/ibus-handwrite: Remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-i18n/ibus-handwrite/Manifest | 1 -
.../ibus-handwrite/files/ibus-handwrite-link.patch | 11 ------
.../ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild | 44 ----------------------
3 files changed, 56 deletions(-)
diff --git a/app-i18n/ibus-handwrite/Manifest b/app-i18n/ibus-handwrite/Manifest
index 122444d676c..c6b9e388ae0 100644
--- a/app-i18n/ibus-handwrite/Manifest
+++ b/app-i18n/ibus-handwrite/Manifest
@@ -1,2 +1 @@
-DIST ibus-handwrite-2.1.4.tar.bz2 237980 BLAKE2B 7f8fae383a779b2893e5e014b5dcbdcb48a7f541f04e6b829dffd008fa95b73eb3e1af395c29e68a9c80e7cfdc95928f0a360f84df62c1dc06a9431d1dcf4eec SHA512 fca7129edb7433e7ea6df1ce67b3f27285fe102cc029a7a1bdb8ba0402407bd81724d1b14667d342ef41491acff03e9c152b748e4fee5387f315d4673c2964e6
DIST ibus-handwrite-3.0.0.tar.bz2 239452 BLAKE2B 379b283565efc16c75c1811e096f814a4a0f009ab469a7bc251f34889bd62c7158379a63b71529db942969a3444a6be42f3db3bc5787993f8e15f86a6a7ddb76 SHA512 ed9b2b35919f3e061230c7085c88e5ce80ee978ffa7f8391e74364e8d6152f0d88a08f91ec58b55fc7067e9fe45d03018760ccfca7b026f36211fa344d16c9b1
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
deleted file mode 100644
index 1d8415fbaf8..00000000000
--- a/app-i18n/ibus-handwrite/files/ibus-handwrite-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,6 +80,8 @@
- AM_CONDITIONAL(WITH_ZINNIA,[false])
- ])
-
-+AC_CHECK_LIB([m],[atan2])
-+
- # check ibus
- PKG_CHECK_MODULES(IBUS, [
- ibus-1.0 >= 1.3
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
deleted file mode 100644
index 6965a9cf27e..00000000000
--- a/app-i18n/ibus-handwrite/ibus-handwrite-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Hand write recognition/input for IBus"
-HOMEPAGE="https://github.com/microcai/ibus-handwrite"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls +zinnia"
-
-RDEPEND="app-i18n/ibus
- x11-libs/gtk+:2
- x11-libs/gtkglext
- nls? ( virtual/libintl )
- zinnia? (
- app-i18n/zinnia
- app-i18n/zinnia-tomoe
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-headers.patch
- "${FILESDIR}"/${PN}-link.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable zinnia) \
- $(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-handwrite/files/, app-i18n/ibus-handwrite/
@ 2021-10-14 12:45 Akinori Hattori
0 siblings, 0 replies; 4+ messages in thread
From: Akinori Hattori @ 2021-10-14 12:45 UTC (permalink / raw
To: gentoo-commits
commit: bcbb5da0e0f053c69889beab5d94d336f4be75c5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 14 12:43:00 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct 14 12:43:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcbb5da0
app-i18n/ibus-handwrite: fix blink
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
.../files/ibus-handwrite-blink.patch | 23 ++++++++++++++++++++++
...3.0.0.ebuild => ibus-handwrite-3.0.0-r1.ebuild} | 5 ++++-
2 files changed, 27 insertions(+), 1 deletion(-)
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 00000000000..7954f2018c2
--- /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/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
similarity index 90%
rename from app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
rename to app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
index 9846756601f..a57383c4952 100644
--- a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild
@@ -23,7 +23,10 @@ DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig
nls? ( sys-devel/gettext )"
-PATCHES=( "${FILESDIR}"/${PN}-headers.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-blink.patch
+ "${FILESDIR}"/${PN}-headers.patch
+)
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-handwrite/files/, app-i18n/ibus-handwrite/
@ 2025-01-24 12:25 WANG Xuerui
0 siblings, 0 replies; 4+ messages in thread
From: WANG Xuerui @ 2025-01-24 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 37c4c089a7710b7ed49f23412f39ae4841691846
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Wed Jan 22 12:35:23 2025 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 12:25:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37c4c089
app-i18n/ibus-handwrite: update EAPI 7 -> 8, port to C99
Ports upstream patch, fixes compilation with GCC14/C99/C23
[xen0n: drop stable keywords]
Closes: https://bugs.gentoo.org/919178
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40258
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>
.../files/ibus-handwrite-3.0.0-fix-compile.patch | 103 +++++++++++++++++++++
.../ibus-handwrite/ibus-handwrite-3.0.0-r2.ebuild | 38 ++++++++
app-i18n/ibus-handwrite/metadata.xml | 3 +
3 files changed, 144 insertions(+)
diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-3.0.0-fix-compile.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-3.0.0-fix-compile.patch
new file mode 100644
index 000000000000..fd0b0a19ac9b
--- /dev/null
+++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-3.0.0-fix-compile.patch
@@ -0,0 +1,103 @@
+https://bugs.gentoo.org/919178
+https://github.com/microcai/ibus-handwrite/commit/04694e914a3a0ba957474d5018e65816d7fa5d59
+From 7f48b7b62964771e648f96181f83a1cf6f15c47a Mon Sep 17 00:00:00 2001
+From: Peng Wu <pwu@redhat.com>
+Date: Mon, 5 Feb 2024 13:58:03 +0800
+Subject: [PATCH] Fix compile issues
+
+---
+ src/UI_gtk.c | 6 +++---
+ src/engine.c | 10 ++++------
+ src/engine.h | 2 +-
+ src/handrecog_zinnia.c | 2 +-
+ 4 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/UI_gtk.c b/src/UI_gtk.c
+index 152d2b6..5ecf1de 100644
+--- a/src/UI_gtk.c
++++ b/src/UI_gtk.c
+@@ -58,7 +58,7 @@ static gboolean paint_lines(GtkWidget *widget, cairo_t * cr, IBusHandwriteEngine
+ cairo_set_line_cap(cr,CAIRO_LINE_CAP_ROUND);
+ cairo_set_line_join(cr,CAIRO_LINE_JOIN_ROUND);
+
+- gdk_cairo_set_source_color (cr, engine->color);
++ gdk_cairo_set_source_rgba (cr, engine->color);
+
+ //已经录入的笔画
+ for (i = 0; i < engine->engine->strokes->len ; i++ )
+@@ -94,7 +94,7 @@ static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
+
+ g_object_set(G_OBJECT(bt), "expand", TRUE, NULL);
+
+- gtk_grid_attach(GTK_TABLE(widget), bt, i%5, i/5, 1, 1);
++ gtk_grid_attach(GTK_GRID(widget), bt, i%5, i/5, 1, 1);
+
+ gtk_widget_show(bt);
+
+@@ -247,7 +247,7 @@ void UI_buildui(IBusHandwriteEngine * engine)
+ gtk_window_set_position(GTK_WINDOW(engine->drawpanel),GTK_WIN_POS_MOUSE);
+
+ GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+- gtk_box_set_homogeneous(vbox, FALSE);
++ gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
+
+ gtk_container_add(GTK_CONTAINER(engine->drawpanel),vbox);
+
+diff --git a/src/engine.c b/src/engine.c
+index d3d924e..d9d9a71 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -89,6 +89,7 @@ static void ibus_handwrite_engine_init(IBusHandwriteEngine *handwrite)
+ #endif
+
+ handwrite->engine = ibus_handwrite_recog_new(handwrite->engine_type);
++ handwrite->color[0].alpha = 1.0;
+ handwrite->engine->engine = handwrite;
+ }
+
+@@ -186,16 +187,13 @@ void ibus_handwrite_property_activate(IBusEngine *engine,const gchar *prop_name,
+ {
+ g_debug("color choose");
+
+- GtkWidget * dialog = gtk_color_selection_dialog_new(prop_name);
++ GtkWidget * dialog = gtk_color_chooser_dialog_new(prop_name, NULL);
+
+-
+- GtkWidget * color_sel = gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog));
+-
+- gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(color_sel),handwrite->color);
++ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(dialog),handwrite->color);
+
+ gtk_dialog_run(GTK_DIALOG(dialog));
+
+- gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(color_sel),handwrite->color);
++ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(dialog),handwrite->color);
+
+ gtk_widget_destroy(dialog);
+ }
+diff --git a/src/engine.h b/src/engine.h
+index d2099d2..f86b124 100644
+--- a/src/engine.h
++++ b/src/engine.h
+@@ -25,7 +25,7 @@ struct _IBusHandwriteEngine
+ GtkWidget * drawpanel;
+ GtkWidget * lookuppanel;
+ GdkPoint lastpoint;
+- GdkColor color[1]; // color used by pen
++ GdkRGBA color[1]; // color used by pen
+ guint mouse_state;
+ IbusHandwriteRecog * engine;
+ LineStroke currentstroke;
+diff --git a/src/handrecog_zinnia.c b/src/handrecog_zinnia.c
+index 3d8512d..955f4a5 100644
+--- a/src/handrecog_zinnia.c
++++ b/src/handrecog_zinnia.c
+@@ -74,7 +74,7 @@ static gboolean ibus_handwrite_recog_zinnia_domatch(IbusHandwriteRecog*obj,int w
+
+ LineStroke cl;
+
+- guint width,height;
++ gint width,height;
+
+ obj->matched = g_array_set_size(obj->matched,0);
+
diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r2.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..38477db238bb
--- /dev/null
+++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls +zinnia"
+
+RDEPEND="app-i18n/ibus
+ x11-libs/gtk+:3
+ nls? ( virtual/libintl )
+ zinnia? (
+ app-i18n/zinnia
+ app-i18n/zinnia-tomoe
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-blink.patch
+ "${FILESDIR}"/${PN}-headers.patch
+ "${FILESDIR}"/${PN}-nested-function.patch
+ "${FILESDIR}"/${P}-fix-compile.patch
+)
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_enable zinnia) \
+ $(use_with zinnia zinnia-tomoe "${EPREFIX}"/usr/$(get_libdir)/zinnia/model/tomoe)
+}
diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml
index 06f6070908fc..458f33a0fe71 100644
--- a/app-i18n/ibus-handwrite/metadata.xml
+++ b/app-i18n/ibus-handwrite/metadata.xml
@@ -8,4 +8,7 @@
<use>
<flag name="zinnia">Enable support for <pkg>app-i18n/zinnia</pkg></flag>
</use>
+ <upstream>
+ <remote-id type="github">microcai/ibus-handwrite</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-24 12:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-14 12:45 [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-handwrite/files/, app-i18n/ibus-handwrite/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2025-01-24 12:25 WANG Xuerui
2020-01-21 23:47 David Seifert
2017-08-12 16:06 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox