[gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-chewing/, app-i18n/ibus-chewing/files/

[Akinori Hattori]

commit:     689ae8298c2db16847019a31851bbc7013e414de
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 13:43:22 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 13:43:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689ae829

app-i18n/ibus-chewing: new snapshot

Closes: https://bugs.gentoo.org/808441
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 app-i18n/ibus-chewing/Manifest                     |  2 +-
 .../ibus-chewing/files/ibus-chewing-test.patch     | 30 ++++++++++++++++++----
 ....ebuild => ibus-chewing-1.6.1_p20210117.ebuild} |  8 +++---
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest
index 71d21d6f696..601982de553 100644
--- a/app-i18n/ibus-chewing/Manifest
+++ b/app-i18n/ibus-chewing/Manifest
@@ -1 +1 @@
-DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39
+DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6

diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
index abed91d377d..0d4ddc7a783 100644
--- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
+++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch
@@ -1,6 +1,26 @@
+--- 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
-@@ -126,7 +126,7 @@
+@@ -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);
@@ -8,8 +28,8 @@
 +    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 @@
+ 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));
@@ -18,7 +38,7 @@
      g_assert(mkdg_g_value_is_equal(newValue, &storedGValue));
      g_value_unset(&storedGValue);
  }
-@@ -219,7 +219,7 @@
+@@ -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);
@@ -27,7 +47,7 @@
  
      GValue newValue = { 0 };
      g_value_init(&newValue, G_TYPE_BOOLEAN);
-@@ -229,13 +229,13 @@
+@@ -235,13 +235,13 @@ void int_w_test()
  
      GValue storedValue = { 0 };
      g_value_init(&storedValue, G_TYPE_BOOLEAN);

diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
similarity index 85%
rename from app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
rename to app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
index ce3dc8a291b..ce610adcc8a 100644
--- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild
+++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117.ebuild
@@ -4,11 +4,13 @@
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake gnome2-utils virtualx
+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/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -19,7 +21,7 @@ RDEPEND="app-i18n/ibus
 	app-i18n/libchewing
 	dev-libs/glib:2
 	dev-util/gob:2
-	x11-libs/gtk+:2
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	gconf? ( gnome-base/gconf )
 	nls? ( virtual/libintl )"