pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod/ibus ibus: update to 1.5.25.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d5686ae50fd3
branches: trunk
changeset: 457230:d5686ae50fd3
user: tsutsui <tsutsui%pkgsrc.org@localhost>
date: Sat Aug 21 17:40:17 2021 +0000
description:
ibus: update to 1.5.25.
pkgsrc changes:
- remove patches fixed in the upstream
Upstream changes:
https://github.com/ibus/ibus/releases/tag/1.5.25
https://github.com/ibus/ibus/releases/tag/1.5.24
1.5.25
fujiwarat released this Aug 20, 2021
* src/tests: Run gnome-session with no-overview mode 214b60a bc7811c ab6b958
* client/gtk2: Implement ibus_im_context_set_surrounding_with_selection()
d105a39
* Code reviews e9e1642 17ae266
* src/ibuscomposetable: Do not include the same compose file a755d16
* src/ibusenginesimple: Multi_key to 0xB7 7e12d58 2fc1a02
* src/ibusenginesimple: Make Compose preedit less intrusive 3e2609e df49566
4259f16 5bd2ecc
* Change default Emoji shortcut key b952d30
* setup: Enhance engine search function a4939f6
* client/gtk2/ibusimcontext: Enable sync process in GTK4 a823161
* engine: Update simple.xml with xkeyboard-config 2.33 934c456 238eb61
Code Contributors:
* src/ibuscomposetable: Add support for the include directive (lf-) 9f9c88b
* src/ibuscomposetable: Fix a buffer overflow in compose handling (lf-)
7f09379
* client/x11: Add support for XFixes ClientDisconnectMode (Olivier Fourdan)
71ca4a9
* setup: Start ibus-daemon with the --daemonize option (Gunnar Hjalmarsson)
e465011
* src: Fix a typo in ibusenginesimple.h (user202729) bc265fb
Translation Contributors:
* po: Update translation (Spanish) (Emilio Herrera) c0170ae
* po: Update translation (Bengali) (Abu Huraira) 1239c93
* po: Update translation (Finnish) (Jan Kuparinen) 3ceecf3
* po: Update translation (Occitan) (Quentin PAGES) 6e1588d
* po: Update translation (Chinese (Simplified) (zh_CN)) (Liu Tao) 883f517
* po: Update translation (Russian) (Alexey Rubtsov) a7ebfc9
* po: Update translation (Japanese) (Korean) (simmon) b85c399
* po: Update translation (Korean) (Seong-ho Cho) 904f162
* po: Update translation (Korean) (JungHee Lee) 32d54e0
1.5.24
fujiwarat released this Feb 21, 2021
Features & Bug Fixes:
* Add GTK4 IM module c7928b1 d0a47c3
* Search engine name directly ef4c5c7
* Update IBusInputPurpose and IBusInputHints in ibustypes.h b72efea
* Warn deprecated IBus XKB engines /w dialog 5322c44
* Update simple.xml 5012b69
* Add CI 30a3641
* Fix arguments in GLib.DBusSignalCallback for Vala 0.50 dd4cc5b
* Fix to build emoji-*.dict in CLDR 38 aa558de
* Fix build environments 02338ce 5d68b00 29959e1
Code Contributors:
* Warning dialog for any deprecated IBus XKB engine (Gunnar Hjalmarsson)
aec2ac7
* Hide IBus Preferences from AppStream (Gunnar Hjalmarsson) 72ca5c9
Translation Contributors:
* Update translation (Danish) (scootergrisen) 2d49256
* Update translation (Bengali) (Tawsif Hossain Shafi) abca464
* Update translation (Spanish) (Adolfo Jayme Barrientos) c62043f
* Update translation (Spanish) (Emilio Herrera) 54224ee
* Update translation (Portuguese (Brazil)) (Henrique Roberto Gattermann
Mittelstaedt) 54652f5
* Update translation (Polish) (Piotr Drag) fece06e
* Update translation (Turkish) (Oguz Ersen) ceea329
* Update translation (Ukrainian) (Yuri Chornoivan) 3af102b
* Update translation (Swedish) (Sebastian Rasmussen) e9cd26d
* Update translation (German) (Mike FABIAN) 37ec730
* Update translation (Chinese (Simplified) (zh_CN)) (Dingzhong Chen) ceea02e
* Update translation (Finnish) (Jan Kuparinen) 1470078
* Update translation (Finnish) (Ricky Tigg) ef49742
* Update translation (French) (Julien Humbert) 5834205
diffstat:
inputmethod/ibus/Makefile | 3 +-
inputmethod/ibus/Makefile.common | 4 +-
inputmethod/ibus/PLIST | 3 +-
inputmethod/ibus/distinfo | 16 +++----
inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c | 16 ++++---
inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c | 16 ++++---
inputmethod/ibus/patches/patch-ui_gtk3_application.vala | 29 -------------
inputmethod/ibus/patches/patch-ui_gtk3_extension.vala | 31 --------------
8 files changed, 30 insertions(+), 88 deletions(-)
diffs (248 lines):
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/Makefile
--- a/inputmethod/ibus/Makefile Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/Makefile Sat Aug 21 17:40:17 2021 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.78 2021/04/14 07:28:19 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2021/08/21 17:40:17 tsutsui Exp $
-PKGREVISION= 4
.include "Makefile.common"
COMMENT= Intelligent Input Bus
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/Makefile.common
--- a/inputmethod/ibus/Makefile.common Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/Makefile.common Sat Aug 21 17:40:17 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2020/10/03 16:43:17 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.18 2021/08/21 17:40:17 tsutsui Exp $
#
# used by inputmethod/ibus/Makefile
# used by inputmethod/ibus-python/Makefile
-DISTNAME= ibus-1.5.23
+DISTNAME= ibus-1.5.25
CATEGORIES= inputmethod
MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/PLIST
--- a/inputmethod/ibus/PLIST Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/PLIST Sat Aug 21 17:40:17 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/10/06 04:27:39 mef Exp $
+@comment $NetBSD: PLIST,v 1.20 2021/08/21 17:40:17 tsutsui Exp $
bin/ibus
bin/ibus-daemon
bin/ibus-setup
@@ -325,6 +325,7 @@
share/locale/mr/LC_MESSAGES/ibus10.mo
share/locale/nb/LC_MESSAGES/ibus10.mo
share/locale/nl/LC_MESSAGES/ibus10.mo
+share/locale/oc/LC_MESSAGES/ibus10.mo
share/locale/or/LC_MESSAGES/ibus10.mo
share/locale/pa/LC_MESSAGES/ibus10.mo
share/locale/pl/LC_MESSAGES/ibus10.mo
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/distinfo
--- a/inputmethod/ibus/distinfo Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/distinfo Sat Aug 21 17:40:17 2021 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.25 2020/10/17 05:25:46 mef Exp $
+$NetBSD: distinfo,v 1.26 2021/08/21 17:40:17 tsutsui Exp $
-SHA1 (ibus-1.5.23.tar.gz) = 99f093568588b3c7695230768560eb1645ed80de
-RMD160 (ibus-1.5.23.tar.gz) = c3500c682257fb0699dbba429670e895f058846e
-SHA512 (ibus-1.5.23.tar.gz) = 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
-Size (ibus-1.5.23.tar.gz) = 3557661 bytes
-SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
-SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
+SHA1 (ibus-1.5.25.tar.gz) = 4058f9b11781f9d33927c2464da6ebcaa5c2a83a
+RMD160 (ibus-1.5.25.tar.gz) = bc487af811e30ca453a429affc386eb8c12486f1
+SHA512 (ibus-1.5.25.tar.gz) = 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
+Size (ibus-1.5.25.tar.gz) = 3669787 bytes
+SHA1 (patch-client_gtk2_ibusimcontext.c) = 8c7d0134600e0a56997853f51b9b05689bc35d83
+SHA1 (patch-client_gtk3_ibusimcontext.c) = 27fa6ecf69299f4db5f5788fa6fc1aec02254266
SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4
-SHA1 (patch-ui_gtk3_application.vala) = 29ad7b1b44a7eb7888a263515c49335da42e62ec
-SHA1 (patch-ui_gtk3_extension.vala) = 276f9ffea8cb9b1fa39321e47fddf941757b2d8d
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c
--- a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c Sat Aug 21 17:40:17 2021 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.2 2017/11/05 04:19:15 tsutsui Exp $
+$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.3 2021/08/21 17:40:17 tsutsui Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
---- client/gtk2/ibusimcontext.c.orig 2017-10-22 10:31:49.000000000 +0000
+--- client/gtk2/ibusimcontext.c.orig 2021-08-20 00:48:40.000000000 +0000
+++ client/gtk2/ibusimcontext.c
-@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -714,6 +714,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
@@ -15,8 +15,8 @@
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
-@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
-
+@@ -834,10 +837,7 @@ ibus_im_context_class_init (IBusIMContex
+ #if !GTK_CHECK_VERSION (3, 98, 4)
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
@@ -24,9 +24,9 @@
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
+ #endif
- _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -849,23 +849,24 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
@@ -37,6 +37,7 @@
static void
ibus_im_context_class_fini (IBusIMContextClass *class)
{
+ #if !GTK_CHECK_VERSION (3, 98, 4)
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
@@ -45,6 +46,7 @@
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
+ #endif
g_bus_unwatch_name (_daemon_name_watch_id);
}
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c
--- a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c Sat Aug 21 17:08:25 2021 +0000
+++ b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c Sat Aug 21 17:40:17 2021 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.2 2017/11/05 04:19:15 tsutsui Exp $
+$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.3 2021/08/21 17:40:17 tsutsui Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
---- client/gtk3/ibusimcontext.c.orig 2017-10-22 10:31:49.000000000 +0000
+--- client/gtk3/ibusimcontext.c.orig 2021-08-20 00:48:40.000000000 +0000
+++ client/gtk3/ibusimcontext.c
-@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
+@@ -714,6 +714,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
@@ -15,8 +15,8 @@
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
-@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
-
+@@ -834,10 +837,7 @@ ibus_im_context_class_init (IBusIMContex
+ #if !GTK_CHECK_VERSION (3, 98, 4)
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
@@ -24,9 +24,9 @@
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
+ #endif
- _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
+@@ -849,23 +849,24 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
@@ -37,6 +37,7 @@
static void
ibus_im_context_class_fini (IBusIMContextClass *class)
{
+ #if !GTK_CHECK_VERSION (3, 98, 4)
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
@@ -45,6 +46,7 @@
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
+ #endif
g_bus_unwatch_name (_daemon_name_watch_id);
}
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/patches/patch-ui_gtk3_application.vala
--- a/inputmethod/ibus/patches/patch-ui_gtk3_application.vala Sat Aug 21 17:08:25 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-ui_gtk3_application.vala,v 1.1 2020/10/17 05:25:46 mef Exp $
-
- Fix Build Error:
-
- git clone https://github.com/ibus/ibus.git
- git show dd4cc5b028c35f9bb8f
-
- Info provided by @tristelo of Twitter, thanks
-
---- ui/gtk3/application.vala.orig 2020-10-17 05:12:46.065207466 +0000
-+++ ui/gtk3/application.vala
-@@ -69,7 +69,7 @@ class Application {
- }
-
- private void bus_name_acquired_cb(DBusConnection connection,
-- string sender_name,
-+ string? sender_name,
- string object_path,
- string interface_name,
- string signal_name,
-@@ -80,7 +80,7 @@ class Application {
- }
-
- private void bus_name_lost_cb(DBusConnection connection,
-- string sender_name,
-+ string? sender_name,
- string object_path,
- string interface_name,
- string signal_name,
diff -r 5c94024a3dcb -r d5686ae50fd3 inputmethod/ibus/patches/patch-ui_gtk3_extension.vala
--- a/inputmethod/ibus/patches/patch-ui_gtk3_extension.vala Sat Aug 21 17:08:25 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ui_gtk3_extension.vala,v 1.1 2020/10/17 05:25:46 mef Exp $
-
- Fix Error:
-extension.vala:54.37-54.56: error: Argument 7: Cannot convert from `void ExtensionGtk.bus_name_acquired_cb (GLib.DBusConnection, string, string, string, string, GLib.Variant)' to `void
GLib.DBusSignalCallback (GLib.DBusConnection, string?, string, string, string, GLib.Variant)'
- bus_name_acquired_cb);
- ^^^^^^^^^^^^^^^^^^^^
- git clone https://github.com/ibus/ibus.git
- git show dd4cc5b028c35f9bb8f
-
- Info provided by @tristelo of Twitter, thanks
-
---- ui/gtk3/extension.vala.orig 2020-10-17 05:13:08.696559322 +0000
-+++ ui/gtk3/extension.vala
-@@ -67,7 +67,7 @@ class ExtensionGtk : Gtk.Application {
-
-
- private void bus_name_acquired_cb(DBusConnection connection,
-- string sender_name,
-+ string? sender_name,
- string object_path,
- string interface_name,
- string signal_name,
-@@ -78,7 +78,7 @@ class ExtensionGtk : Gtk.Application {
- }
-
- private void bus_name_lost_cb(DBusConnection connection,
-- string sender_name,
-+ string? sender_name,
- string object_path,
- string interface_name,
- string signal_name,
Home |
Main Index |
Thread Index |
Old Index