diff options
author | tsutsui <tsutsui@pkgsrc.org> | 2022-09-03 14:14:41 +0000 |
---|---|---|
committer | tsutsui <tsutsui@pkgsrc.org> | 2022-09-03 14:14:41 +0000 |
commit | 5ecb35683a277372a786bdd0d0a07e91a3bbf236 (patch) | |
tree | c2a9951cc83047aa81a394f8ffe50062423df240 | |
parent | 17f92d46fce49df7f8bb1265f3e6afdeebf55cd2 (diff) | |
download | pkgsrc-5ecb35683a277372a786bdd0d0a07e91a3bbf236.tar.gz |
ibus: update to 1.5.27.
pkgsrc changes:
- workaround for unconditional -ldl for ubuntu
https://github.com/ibus/ibus/pull/2442
Upstream changes:
https://github.com/ibus/ibus/releases/tag/1.5.27
1.5.27
* Disable XKB engines in Plasma Wayland 230fb22 b4723eb 9ad0637
* ibusimcontext keycode - 8 for gtk3 keycode generation 8711dc8
* Revert CCedilla change for pt-BR in ibusimcontext 3e5fab4
* Update CI 47303a6 16df64e 79e446e
* Add IBUS_CAP_OSK to IBusCapabilite b94f0c1
* Enable ibus restart in GNOME desktop ab0d176
* Add ibus im-module command 965567d fee26c6 db2ef5d
* Implement new process_key_event for GTK4 c957c5f
* Add focus_in_id()/focus_out_id() class methods 92771d0
* Delete xkb:latam:: in denylist.txt 82e38d9
* Enhance Xutf8TextListToTextProperty d47dbfa
* Revert Emoji shoftcut key to Super-space 1520c39
* Update simple.xml with xkeyboard-config 2.36 ef9bd3b
Code Contributors:
* Fix refcounting issues (Carlos Garnacho) 17648f0
* Fix bashisms in org.freedesktop.IBus.session.GNOME.service (Mitsuya
Shibata) f1c456d
* Update xkb-latin-layouts in gschema (Mike FABIAN) bca7bf0
* Use our own prefix to look up systemd user services dir (Naim Favier)
9f62a40
* Add functionality to change IBus panel themes with available GTK themes
(Hollow Man) 233a3f4 addab9f ff99828
Translation Contributors:
* Update translation (Korean) (simmon) f7c045e d810713
* Update translation (Punjabi) (A S Alam) 5f85888
* Update translation (Italian) (Nathan) 8ec7eff
* Update translation (Ukrainian) (Yuri Chornoivan) 2c262cb 742091b
* Update translation (Japanese) (fujiwarat) f3d7aa9
* Update translation (Estonian) (H A) e88651e
* Update translation (Polish) (Piotr Drag) e78c545
* Update translation (German) (Mike FABIAN) 1f4fe9f
* Update translation (Turkish) (Oguz Ersen) ced5bfb
-rw-r--r-- | inputmethod/ibus/Makefile | 8 | ||||
-rw-r--r-- | inputmethod/ibus/Makefile.common | 4 | ||||
-rw-r--r-- | inputmethod/ibus/distinfo | 12 | ||||
-rw-r--r-- | inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c | 14 | ||||
-rw-r--r-- | inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c | 14 |
5 files changed, 28 insertions, 24 deletions
diff --git a/inputmethod/ibus/Makefile b/inputmethod/ibus/Makefile index a8c2a8cfbc9..ba06156147b 100644 --- a/inputmethod/ibus/Makefile +++ b/inputmethod/ibus/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.90 2022/08/11 05:08:51 gutteridge Exp $ +# $NetBSD: Makefile,v 1.91 2022/09/03 14:14:41 tsutsui Exp $ -PKGREVISION= 4 .include "Makefile.common" COMMENT= Intelligent Input Bus @@ -39,6 +38,11 @@ SUBST_STAGE.dbus= post-configure SUBST_FILES.dbus= src/ibusshare.c SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g' +# Workaround for unconditional -ldl for ubuntu +# https://github.com/ibus/ibus/pull/2442 +.include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} + BUILD_DEFS+= PKG_SYSCONFBASE VARBASE MANCOMPRESSED= yes diff --git a/inputmethod/ibus/Makefile.common b/inputmethod/ibus/Makefile.common index 806b0df3227..bce8b79001a 100644 --- a/inputmethod/ibus/Makefile.common +++ b/inputmethod/ibus/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.19 2022/03/15 13:13:36 tsutsui Exp $ +# $NetBSD: Makefile.common,v 1.20 2022/09/03 14:14:41 tsutsui Exp $ # # used by inputmethod/ibus/Makefile # used by inputmethod/ibus-python/Makefile -DISTNAME= ibus-1.5.26 +DISTNAME= ibus-1.5.27 CATEGORIES= inputmethod MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/ diff --git a/inputmethod/ibus/distinfo b/inputmethod/ibus/distinfo index d19553f97a7..49d0d6076e3 100644 --- a/inputmethod/ibus/distinfo +++ b/inputmethod/ibus/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.29 2022/03/15 13:13:36 tsutsui Exp $ +$NetBSD: distinfo,v 1.30 2022/09/03 14:14:41 tsutsui Exp $ -BLAKE2s (ibus-1.5.26.tar.gz) = 4fe347ac8e771822e53d8c9b723a243e0b7694d1585f47a7e8d23cfbaf17ad28 -SHA512 (ibus-1.5.26.tar.gz) = 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714 -Size (ibus-1.5.26.tar.gz) = 3715263 bytes -SHA1 (patch-client_gtk2_ibusimcontext.c) = 8c7d0134600e0a56997853f51b9b05689bc35d83 -SHA1 (patch-client_gtk3_ibusimcontext.c) = 27fa6ecf69299f4db5f5788fa6fc1aec02254266 +BLAKE2s (ibus-1.5.27.tar.gz) = 8022af9343424988c6fa94445f50f2202f782d9ee7249c5a002bde56121c4e97 +SHA512 (ibus-1.5.27.tar.gz) = b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4 +Size (ibus-1.5.27.tar.gz) = 3779541 bytes +SHA1 (patch-client_gtk2_ibusimcontext.c) = bb957fb47fa7144f0a6cdd0252653aeb0da9ad92 +SHA1 (patch-client_gtk3_ibusimcontext.c) = c3fff3e8d7431ae4b7302026e9fd9f092ec46d88 SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650 SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4 diff --git a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c index cec34a9df1f..84f8fe796a4 100644 --- a/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c +++ b/inputmethod/ibus/patches/patch-client_gtk2_ibusimcontext.c @@ -1,11 +1,11 @@ -$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.3 2021/08/21 17:40:17 tsutsui Exp $ +$NetBSD: patch-client_gtk2_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $ NetBSD 6.99.25's gcc says: error: #pragma GCC diagnostic not allowed inside functions ---- client/gtk2/ibusimcontext.c.orig 2021-08-20 00:48:40.000000000 +0000 +--- client/gtk2/ibusimcontext.c.orig 2022-08-22 15:32:16.000000000 +0000 +++ client/gtk2/ibusimcontext.c -@@ -714,6 +714,9 @@ daemon_name_vanished (GDBusConnection *c +@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c _daemon_is_running = FALSE; } @@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says: static void ibus_im_context_class_init (IBusIMContextClass *class) { -@@ -834,10 +837,7 @@ ibus_im_context_class_init (IBusIMContex +@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex #if !GTK_CHECK_VERSION (3, 98, 4) /* always install snooper */ if (_key_snooper_id == 0) { @@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says: } #endif -@@ -849,23 +849,24 @@ ibus_im_context_class_init (IBusIMContex +@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex NULL, NULL); } @@ -52,5 +52,5 @@ NetBSD 6.99.25's gcc says: } +#pragma GCC diagnostic pop - /* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421. - * Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */ + static void + ibus_im_context_init (GObject *obj) diff --git a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c index 7de2271cfd2..aaee9d472e7 100644 --- a/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c +++ b/inputmethod/ibus/patches/patch-client_gtk3_ibusimcontext.c @@ -1,11 +1,11 @@ -$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.3 2021/08/21 17:40:17 tsutsui Exp $ +$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.4 2022/09/03 14:14:41 tsutsui Exp $ NetBSD 6.99.25's gcc says: error: #pragma GCC diagnostic not allowed inside functions ---- client/gtk3/ibusimcontext.c.orig 2021-08-20 00:48:40.000000000 +0000 +--- client/gtk3/ibusimcontext.c.orig 2022-08-22 15:32:16.000000000 +0000 +++ client/gtk3/ibusimcontext.c -@@ -714,6 +714,9 @@ daemon_name_vanished (GDBusConnection *c +@@ -801,6 +801,9 @@ daemon_name_vanished (GDBusConnection *c _daemon_is_running = FALSE; } @@ -15,7 +15,7 @@ NetBSD 6.99.25's gcc says: static void ibus_im_context_class_init (IBusIMContextClass *class) { -@@ -834,10 +837,7 @@ ibus_im_context_class_init (IBusIMContex +@@ -921,10 +924,7 @@ ibus_im_context_class_init (IBusIMContex #if !GTK_CHECK_VERSION (3, 98, 4) /* always install snooper */ if (_key_snooper_id == 0) { @@ -26,7 +26,7 @@ NetBSD 6.99.25's gcc says: } #endif -@@ -849,23 +849,24 @@ ibus_im_context_class_init (IBusIMContex +@@ -936,23 +936,24 @@ ibus_im_context_class_init (IBusIMContex NULL, NULL); } @@ -52,5 +52,5 @@ NetBSD 6.99.25's gcc says: } +#pragma GCC diagnostic pop - /* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421. - * Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */ + static void + ibus_im_context_init (GObject *obj) |