* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-chewing/files/, app-i18n/ibus-chewing/
@ 2017-08-16 15:39 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-08-16 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 48bf70c1aac4b38c7f59a05130f6042e62503868
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 15:29:25 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 15:38:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bf70c1
app-i18n/ibus-chewing: fix src_test
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../ibus-chewing/files/ibus-chewing-test.patch | 45 ++++++++++++++++++++++
app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild | 11 +++++-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
new file mode 100644
index 00000000000..abed91d377d
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -0,0 +1,45 @@
+--- a/test/MakerDialogBackend-test.c
++++ b/test/MakerDialogBackend-test.c
+@@ -126,7 +126,7 @@
+ void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
+ {
+ g_value_init(value, gType);
+- backend_command_get_key_value(key, value);
++ mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
+ }
+
+ void change_new_value_from_orig_value(GValue * newValue,
+@@ -169,7 +169,7 @@
+ {
+ GValue storedGValue = { 0 };
+ g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
+- backend_command_get_key_value(key, &storedGValue);
++ mkdg_backend_read(backend, &storedGValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
+ g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
+ g_value_unset(&storedGValue);
+ }
+@@ -219,7 +219,7 @@
+ #define GCONF_KEY "max-chi-symbol-len"
+ GValue origValue = { 0 };
+ g_value_init(&origValue, G_TYPE_BOOLEAN);
+- backend_command_get_key_value(GCONF_KEY, &origValue);
++ mkdg_backend_read(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+
+ GValue newValue = { 0 };
+ g_value_init(&newValue, G_TYPE_BOOLEAN);
+@@ -229,13 +229,13 @@
+
+ GValue storedValue = { 0 };
+ g_value_init(&storedValue, G_TYPE_BOOLEAN);
+- backend_command_get_key_value(GCONF_KEY, &storedValue);
++ mkdg_backend_read(backend, &storedValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+ g_assert(mkdg_g_value_is_equal(&newValue, &storedValue));
+
+ /*
+ * Restore the original value
+ */
+- backend_command_set_key_value(GCONF_KEY, &origValue);
++ mkdg_backend_write(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
+ #undef GCONF_KEY
+ }
+
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
index 6ba022cbe6f..2f5ba84757a 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="6"
CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils gnome2-utils
+inherit cmake-utils gnome2-utils virtualx
MY_P="${P}-Source"
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}"/${PN}-test.patch )
DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE )
src_configure() {
@@ -41,6 +42,14 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ "${EROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
+
+ export GSETTINGS_BACKEND="memory"
+ export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
+ virtx cmake-utils_src_test
+}
+
pkg_preinst() {
gnome2_gconf_savelist
gnome2_schemas_savelist
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-chewing/files/, app-i18n/ibus-chewing/
@ 2025-09-22 22:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-09-22 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 65789a9da8023659cf915b88fa749116a0e62cc6
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Sep 8 12:14:51 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 22:11:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65789a9d
app-i18n/ibus-chewing: add 2.1.7
Update to EAPI8, migrate to meson buildsystem.
Closes: https://bugs.gentoo.org/962534
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43712
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/ibus-chewing/Manifest | 1 +
.../files/ibus-chewing-2.1.7_docdir.patch | 19 ++++++++
app-i18n/ibus-chewing/ibus-chewing-2.1.7.ebuild | 52 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index a6efae009b6d..0de3f95cd610 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,2 +1,3 @@
DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
+DIST ibus-chewing-2.1.7-Source.tar.xz 82140 BLAKE2B 8e2ca94469f46f48d28b0cd088ad4cd763de3050d5df5f27446def8284693aef76354abd276755678dff5ebc7b414822142e001ca0c345e0185b53e3fea64247 SHA512 7a654b6a46e0d0cb5b35900a1cce535e52292b345854afbd20e4de5f8778fb7eeabb66b4786251a705c90d8ad69258af87dc9075505a9d901363317d2467b250
DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-2.1.7_docdir.patch b/app-i18n/ibus-chewing/files/ibus-chewing-2.1.7_docdir.patch
new file mode 100644
index 000000000000..453fb7c25aa3
--- /dev/null
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-2.1.7_docdir.patch
@@ -0,0 +1,19 @@
+From b5e4366b9dbf56e81a05e0a52adbdbd24f8bce4f Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Mon, 8 Sep 2025 15:06:46 +0300
+Subject: [PATCH] Define version for docdir location
+
+--- a/meson.build
++++ b/meson.build
+@@ -15,7 +15,7 @@ ibus_chewing_prefix = get_option('prefix')
+ ibus_chewing_datadir = ibus_chewing_prefix / get_option('datadir')
+ ibus_chewing_libexecdir = ibus_chewing_prefix / get_option('libexecdir')
+ ibus_chewing_localedir = ibus_chewing_prefix / get_option('localedir')
+-ibus_chewing_docdir = ibus_chewing_datadir / 'doc' / 'ibus-chewing'
++ibus_chewing_docdir = ibus_chewing_datadir / 'doc' / 'ibus-chewing-' + meson.project_version()
+
+ ibus_component_dir = ibus_chewing_datadir / 'ibus' / 'component'
+ ibus_chewing_icondir = ibus_chewing_datadir / 'ibus-chewing' / 'icons'
+--
+2.49.1
+
diff --git a/app-i18n/ibus-chewing/ibus-chewing-2.1.7.ebuild b/app-i18n/ibus-chewing/ibus-chewing-2.1.7.ebuild
new file mode 100644
index 000000000000..2914affa6956
--- /dev/null
+++ b/app-i18n/ibus-chewing/ibus-chewing-2.1.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson gnome2-utils virtualx
+
+DESCRIPTION="Chinese Chewing engine for IBus"
+HOMEPAGE="https://github.com/chewing/ibus-chewing"
+SRC_URI="https://github.com/chewing/ibus-chewing/releases/download/v${PV}/${P}-Source.tar.xz"
+
+S="${WORKDIR}/${P}-Source"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-i18n/ibus-1.5.4
+ >=app-i18n/libchewing-0.9.0
+ dev-libs/glib:2
+ gui-libs/libadwaita:1
+ gui-libs/gtk:4
+ virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}/ibus-chewing-2.1.7_docdir.patch"
+)
+
+src_test() {
+ "${BROOT}${GLIB_COMPILE_SCHEMAS}" src/setup --targetdir="${BUILD_DIR}" || die
+
+ export GSETTINGS_BACKEND="memory"
+ export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"
+ virtx meson_src_test -j1
+}
+
+pkg_preinst() {
+ gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-chewing/files/, app-i18n/ibus-chewing/
@ 2025-09-22 22:12 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-09-22 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 5f40ec9ee271f496c75e1714d9c074f889c508ee
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Sep 8 12:16:01 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 22 22:11:34 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f40ec9e
app-i18n/ibus-chewing: drop 1.6.1_p20210117-r1
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43712
Closes: https://github.com/gentoo/gentoo/pull/43712
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-i18n/ibus-chewing/Manifest | 2 -
.../ibus-chewing/files/ibus-chewing-test.patch | 65 ---------------------
.../ibus-chewing-1.6.1_p20210117-r1.ebuild | 67 ----------------------
3 files changed, 134 deletions(-)
diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 0de3f95cd610..3d83b32cb14f 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1,3 +1 @@
-DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6
DIST ibus-chewing-2.1.7-Source.tar.xz 82140 BLAKE2B 8e2ca94469f46f48d28b0cd088ad4cd763de3050d5df5f27446def8284693aef76354abd276755678dff5ebc7b414822142e001ca0c345e0185b53e3fea64247 SHA512 7a654b6a46e0d0cb5b35900a1cce535e52292b345854afbd20e4de5f8778fb7eeabb66b4786251a705c90d8ad69258af87dc9075505a9d901363317d2467b250
-DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c
diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
deleted file mode 100644
index 0d4ddc7a7838..000000000000
--- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/test/IBusChewingPreEdit-test.c
-+++ b/test/IBusChewingPreEdit-test.c
-@@ -514,7 +514,7 @@ void process_key_down_arrow_test()
- key_press_from_key_sym(IBUS_KEY_Down, 0);
- key_press_from_key_sym(IBUS_KEY_Down, 0);
- key_press_from_string("4");
-- assert_pre_edit_substring("世", 1, 1);
-+ assert_pre_edit_substring("勢", 1, 1);
-
- ibus_chewing_pre_edit_clear(self);
- assert_outgoing_pre_edit("", "");
-@@ -752,7 +752,7 @@ void test_arrow_keys_buffer_empty()
- key_press_from_key_sym(IBUS_KEY_Page_Up, 0);
- g_assert(chewing_cand_CurrentPage(self->context) == 0);
- key_press_from_key_sym(IBUS_KEY_Up, 0);
-- g_assert(!ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
-+ g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
-
- key_press_from_string("`");
- g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW));
---- a/test/MakerDialogBackend-test.c
-+++ b/test/MakerDialogBackend-test.c
-@@ -132,7 +132,7 @@ gboolean mkdg_g_value_is_equal(GValue * value1, GValue * value2)
- void backup_key_to_g_value(const gchar * key, GType gType, GValue * value)
- {
- g_value_init(value, gType);
-- backend_command_get_key_value(key, value);
-+ mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
- }
-
- void change_new_value_from_orig_value(GValue * newValue, GValue * origValue)
-@@ -175,7 +175,7 @@ void assert_new_value_is_written(const gchar * key, GValue * newValue)
- {
- GValue storedGValue = { 0 };
- g_value_init(&storedGValue, G_VALUE_TYPE(newValue));
-- backend_command_get_key_value(key, &storedGValue);
-+ mkdg_backend_read(backend, &storedGValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL);
- g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
- g_value_unset(&storedGValue);
- }
-@@ -225,7 +225,7 @@ void int_w_test()
- #define GCONF_KEY "max-chi-symbol-len"
- GValue origValue = { 0 };
- g_value_init(&origValue, G_TYPE_BOOLEAN);
-- backend_command_get_key_value(GCONF_KEY, &origValue);
-+ mkdg_backend_read(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
-
- GValue newValue = { 0 };
- g_value_init(&newValue, G_TYPE_BOOLEAN);
-@@ -235,13 +235,13 @@ void int_w_test()
-
- GValue storedValue = { 0 };
- g_value_init(&storedValue, G_TYPE_BOOLEAN);
-- backend_command_get_key_value(GCONF_KEY, &storedValue);
-+ mkdg_backend_read(backend, &storedValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
- g_assert(mkdg_g_value_is_equal(&newValue, &storedValue));
-
- /*
- * Restore the original value
- */
-- backend_command_set_key_value(GCONF_KEY, &origValue);
-+ mkdg_backend_write(backend, &origValue, QUOTE_ME(PROJECT_SCHEMA_SECTION), GCONF_KEY, NULL);
- #undef GCONF_KEY
- }
-
diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
deleted file mode 100644
index d6c35d025bc9..000000000000
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake gnome2-utils vcs-snapshot virtualx
-
-EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f"
-
-DESCRIPTION="Chinese Chewing engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="app-i18n/ibus
- app-i18n/libchewing
- dev-libs/glib:2
- x11-libs/gtk+:3
- x11-libs/libX11
- nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-build/cmake-fedora
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-gob2.patch
- "${FILESDIR}"/${PN}-test.patch
-)
-DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE )
-
-src_configure() {
- local mycmakeargs=(
- -DGCONF2_SUPPORT=OFF
- -DGSETTINGS_SUPPORT=ON
- -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false
- -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF}
- )
- use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 )
- cmake_src_configure
-}
-
-src_test() {
- "${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die
-
- export GSETTINGS_BACKEND="memory"
- export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin"
- virtx cmake_src_test -j1
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-22 22:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-16 15:39 [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-chewing/files/, app-i18n/ibus-chewing/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2025-09-22 22:12 Sam James
2025-09-22 22:12 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox