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.22.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cecb6a0929b4
branches:  trunk
changeset: 424367:cecb6a0929b4
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Tue Mar 10 14:13:22 2020 +0000

description:
ibus: update to 1.5.22.

pkgsrc changes:
- remove patches included in a new release
- require the latest unicode-character-database
- update BUILDLINK_API_DEPENDS per configure

Upstream changes:
 https://github.com/ibus/ibus/releases/tag/1.5.22

1.5.22

* GDBusAuthObserver security fix
* Use XDG_CACHE_HOME for Unix socket directory
* Hangul button press handling
* Fix deprecated APIs
* Bug fixes

Code contributors

* Fix restart crash with inotify read() (Robert Hoffmann)
* Make session file header comment more clear (Jason)
* Amend typos (Jason)
* Add NotShowIn and Keywords keys to the desktop entry (Changwoo Ryu)
* Handle small final sigma in ibus_keyval_convert_case (Alex Henrie)

Translation contributors

* Update translation (Catalan) (Antoni Bella Perez)
* Update translation (French) (Julien Humbert)
* Update translation (French) (Jean-Baptiste Holcroft)
* Update translation (German) (Mike FABIAN)
* Update translation (Hebrew) (Yaron Shahrabani)
* Update translation (Hungarian) (Balazs Mesko)
* Update translation (Italian) (Luigi Toscano)
* Update translation (Korean) (Changwoo Ryu)
* Update translation (Persian) (Ahmad Haghighi)
* Update translation (Polish) (Piotr Drag)
* Update translation (Portuguese (Brazil)) (Rafael Fontenelle)
* Update translation (Turkish) (Oguz Ersen)
* Update translation (Ukrainian) (Yuri Chornoivan)

diffstat:

 inputmethod/ibus/Makefile                      |    8 +-
 inputmethod/ibus/Makefile.common               |    4 +-
 inputmethod/ibus/PLIST                         |    3 +-
 inputmethod/ibus/distinfo                      |   16 +-
 inputmethod/ibus/patches/patch-bus_global.c    |   31 --
 inputmethod/ibus/patches/patch-bus_server.c    |  269 -------------------------
 inputmethod/ibus/patches/patch-config.h.in     |   18 -
 inputmethod/ibus/patches/patch-configure       |   87 --------
 inputmethod/ibus/patches/patch-configure.ac    |   47 ----
 inputmethod/ibus/patches/patch-src_ibusshare.c |   17 -
 10 files changed, 13 insertions(+), 487 deletions(-)

diffs (truncated from 586 to 300 lines):

diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/Makefile
--- a/inputmethod/ibus/Makefile Tue Mar 10 12:22:43 2020 +0000
+++ b/inputmethod/ibus/Makefile Tue Mar 10 14:13:22 2020 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.69 2020/03/08 16:47:51 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2020/03/10 14:13:22 tsutsui Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 
 COMMENT=       Intelligent Input Bus
 
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 BUILD_DEPENDS+=        cldr-emoji-annotation>=35.12.14971.0:../../textproc/cldr-emoji-annotation
-BUILD_DEPENDS+=        unicode-character-database>=12.0.0:../../textproc/unicode-character-database
+BUILD_DEPENDS+=        unicode-character-database>=12.1.0:../../textproc/unicode-character-database
 BUILD_DEPENDS+=        unicode-emoji>=12.0:../../textproc/unicode-emoji
 
 GNU_CONFIGURE=                 yes
@@ -61,7 +60,7 @@
 BUILDLINK_DEPMETHOD.gobject-introspection+=    build
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.26.0
+BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.46.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_DEPMETHOD.vala+=     build
@@ -74,6 +73,7 @@
 .include "../../x11/gtk2/modules.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 GTK3_IMMODULES=        yes
+BUILDLINK_API_DEPENDS.gtk3+=           gtk3+>=3.12.0
 .include "../../x11/gtk3/modules.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/Makefile.common
--- a/inputmethod/ibus/Makefile.common  Tue Mar 10 12:22:43 2020 +0000
+++ b/inputmethod/ibus/Makefile.common  Tue Mar 10 14:13:22 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.15 2019/09/14 04:26:39 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.16 2020/03/10 14:13:22 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=      ibus-1.5.21
+DISTNAME=      ibus-1.5.22
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/PLIST
--- a/inputmethod/ibus/PLIST    Tue Mar 10 12:22:43 2020 +0000
+++ b/inputmethod/ibus/PLIST    Tue Mar 10 14:13:22 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/09/14 11:34:18 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.17 2020/03/10 14:13:22 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -322,6 +322,7 @@
 share/locale/or/LC_MESSAGES/ibus10.mo
 share/locale/pa/LC_MESSAGES/ibus10.mo
 share/locale/pl/LC_MESSAGES/ibus10.mo
+share/locale/pt/LC_MESSAGES/ibus10.mo
 share/locale/pt_BR/LC_MESSAGES/ibus10.mo
 share/locale/ru/LC_MESSAGES/ibus10.mo
 share/locale/sq/LC_MESSAGES/ibus10.mo
diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/distinfo
--- a/inputmethod/ibus/distinfo Tue Mar 10 12:22:43 2020 +0000
+++ b/inputmethod/ibus/distinfo Tue Mar 10 14:13:22 2020 +0000
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.22 2019/09/14 04:26:39 tsutsui Exp $
+$NetBSD: distinfo,v 1.23 2020/03/10 14:13:22 tsutsui Exp $
 
-SHA1 (ibus-1.5.21.tar.gz) = 3073a6bde235e8f9e80272b7e3fc7804fde82b15
-RMD160 (ibus-1.5.21.tar.gz) = 58b0e80e4a888cbbce517ef57af1490ae22625cb
-SHA512 (ibus-1.5.21.tar.gz) = c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
-Size (ibus-1.5.21.tar.gz) = 3463069 bytes
-SHA1 (patch-bus_global.c) = e077fa736d555f4ded92c7b74c59d6cdbd4a66e0
-SHA1 (patch-bus_server.c) = 061cb3949b9a401297fa946294a325d5be6aca81
+SHA1 (ibus-1.5.22.tar.gz) = 355cd1902ebe9f446a112bad7e380b14689eb7ba
+RMD160 (ibus-1.5.22.tar.gz) = cba1bab2278c8a3cc643b6812d980c34e2411fab
+SHA512 (ibus-1.5.22.tar.gz) = 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
+Size (ibus-1.5.22.tar.gz) = 3578251 bytes
 SHA1 (patch-client_gtk2_ibusimcontext.c) = 14ab1d048e3052b547ca181e098adbe3c23ab5bd
 SHA1 (patch-client_gtk3_ibusimcontext.c) = de369bcc2945190b1a30833be4b49f8b6d68c005
-SHA1 (patch-config.h.in) = 9e22cde5eef6b514fd43eb5835b372e1bbccb0ed
-SHA1 (patch-configure) = e2da88347ce529e478d589435181df096e0ebcb9
-SHA1 (patch-configure.ac) = 01dcd2f60d16577e11ca570348876e79a314b81f
-SHA1 (patch-src_ibusshare.c) = 58e1f93ed2a3f4cd2982997c87648e511441aaca
 SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
 SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4
diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/patches/patch-bus_global.c
--- a/inputmethod/ibus/patches/patch-bus_global.c       Tue Mar 10 12:22:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-bus_global.c,v 1.1 2019/09/14 04:26:39 tsutsui Exp $
-
-- pull upstream fix
-  g_dbus_server_new_sync() is failed with address unix:tmpdir=/tmp/ibus
-  https://github.com/ibus/ibus/issues/2116
-
---- bus/global.c.orig  2019-08-23 11:08:34.000000000 +0000
-+++ bus/global.c
-@@ -2,7 +2,7 @@
- /* vim:set et sts=4: */
- /* ibus - The Input Bus
-  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang%gmail.com@localhost>
-- * Copyright (C) 2008-2010 Red Hat, Inc.
-+ * Copyright (C) 2008-2019 Red Hat, Inc.
-  * Copyright (c) 2012 Google, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -21,10 +21,12 @@
-  * USA
-  */
- 
-+#include <config.h>
-+
- #include "global.h"
- 
- gchar **g_argv = NULL;
--gchar *g_address = "unix:tmpdir=/tmp/ibus";
-+gchar *g_address = IBUS_SOCKET_DIR;
- gchar *g_cache = "auto";
- gboolean g_mempro = FALSE;
- gboolean g_verbose = FALSE;
diff -r f436f6f8ac74 -r cecb6a0929b4 inputmethod/ibus/patches/patch-bus_server.c
--- a/inputmethod/ibus/patches/patch-bus_server.c       Tue Mar 10 12:22:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-$NetBSD: patch-bus_server.c,v 1.1 2019/09/14 04:26:39 tsutsui Exp $
-
-- pull upstream fixes
- - g_dbus_server_new_sync() is failed with address unix:tmpdir=/tmp/ibus
-   https://github.com/ibus/ibus/issues/2116
- - bus: Implement GDBusAuthObserver callback
-   https://github.com/ibus/ibus/commit/3d442dbf936d197aa11ca0a71663c2bc61696151
-
---- bus/server.c.orig  2019-08-23 11:08:34.000000000 +0000
-+++ bus/server.c
-@@ -2,7 +2,8 @@
- /* vim:set et sts=4: */
- /* bus - The Input Bus
-  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang%gmail.com@localhost>
-- * Copyright (C) 2008-2010 Red Hat, Inc.
-+ * Copyright (C) 2011-2019 Takao Fujiwara <takao.fujiwara1%gmail.com@localhost>
-+ * Copyright (C) 2008-2019 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -21,6 +22,8 @@
-  */
- #include "server.h"
- 
-+#include <errno.h>
-+#include <glib/gstdio.h>
- #include <gio/gio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -70,16 +73,63 @@ _restart_server (void)
- }
- 
- /**
-+ * bus_allow_mechanism_cb:
-+ * @observer: A #GDBusAuthObserver.
-+ * @mechanism: The name of the mechanism.
-+ * @user_data: always %NULL.
-+ *
-+ * Check if @mechanism can be used to authenticate the other peer.
-+ * Returns: %TRUE if the peer's mechanism is allowed.
-+ */
-+static gboolean
-+bus_allow_mechanism_cb (GDBusAuthObserver     *observer,
-+                        const gchar           *mechanism,
-+                        G_GNUC_UNUSED gpointer user_data)
-+{
-+    if (g_strcmp0 (mechanism, "EXTERNAL") == 0)
-+        return TRUE;
-+    return FALSE;
-+}
-+
-+/**
-+ * bus_authorize_authenticated_peer_cb:
-+ * @observer: A #GDBusAuthObserver.
-+ * @stream: A #GIOStream.
-+ * @credentials: A #GCredentials.
-+ * @user_data: always %NULL.
-+ *
-+ * Check if a peer who has already authenticated should be authorized.
-+ * Returns: %TRUE if the peer's credential is authorized.
-+ */
-+static gboolean
-+bus_authorize_authenticated_peer_cb (GDBusAuthObserver     *observer,
-+                                     GIOStream             *stream,
-+                                     GCredentials          *credentials,
-+                                     G_GNUC_UNUSED gpointer user_data)
-+{
-+    gboolean authorized = FALSE;
-+    if (credentials) {
-+        GCredentials *own_credentials = g_credentials_new ();
-+        if (g_credentials_is_same_user (credentials, own_credentials, NULL))
-+            authorized = TRUE;
-+        g_object_unref (own_credentials);
-+    }
-+    return authorized;
-+}
-+
-+/**
-  * bus_new_connection_cb:
-- * @user_data: always NULL.
-- * @returns: TRUE when the function can handle the connection.
-+ * @observer: A #GDBusAuthObserver.
-+ * @dbus_connection: A #GDBusconnection.
-+ * @user_data: always %NULL.
-  *
-  * Handle incoming connections.
-+ * Returns: %TRUE when the function can handle the connection.
-  */
- static gboolean
--bus_new_connection_cb (GDBusServer     *server,
--                       GDBusConnection *dbus_connection,
--                       gpointer         user_data)
-+bus_new_connection_cb (GDBusServer           *server,
-+                       GDBusConnection       *dbus_connection,
-+                       G_GNUC_UNUSED gpointer user_data)
- {
-     BusConnection *connection = bus_connection_new (dbus_connection);
-     bus_dbus_impl_new_connection (dbus, connection);
-@@ -94,9 +144,9 @@ bus_new_connection_cb (GDBusServer     *
- }
- 
- static void
--_server_connect_start_portal_cb (GObject      *source_object,
--                                 GAsyncResult *res,
--                                 gpointer      user_data)
-+_server_connect_start_portal_cb (GObject               *source_object,
-+                                 GAsyncResult          *res,
-+                                 G_GNUC_UNUSED gpointer user_data)
- {
-     GVariant *result;
-     GError *error = NULL;
-@@ -113,9 +163,9 @@ _server_connect_start_portal_cb (GObject
- }
- 
- static void
--bus_acquired_handler (GDBusConnection *connection,
--                      const gchar     *name,
--                      gpointer         user_data)
-+bus_acquired_handler (GDBusConnection       *connection,
-+                      const gchar           *name,
-+                      G_GNUC_UNUSED gpointer user_data)
- {
-     g_dbus_connection_call (connection,
-                             IBUS_SERVICE_PORTAL,
-@@ -132,37 +182,121 @@ bus_acquired_handler (GDBusConnection *c
-                             NULL);
- }
- 
-+static gchar *
-+_bus_extract_address (void)
-+{
-+    gchar *socket_address = g_strdup (g_address);
-+    gchar *p;
-+
-+#define IF_REPLACE_VARIABLE_WITH_FUNC(variable, func, format)           \
-+    if ((p = g_strstr_len (socket_address, -1, (variable)))) {          \
-+        gchar *sub1 = g_strndup (socket_address, p - socket_address);   \
-+        gchar *sub2 = g_strdup (p + strlen (variable));                 \
-+        gchar *tmp = g_strdup_printf ("%s" format "%s",                 \
-+                                      sub1, (func) (), sub2);           \
-+        g_free (sub1);                                                  \
-+        g_free (sub2);                                                  \
-+        g_free (socket_address);                                        \
-+        socket_address = tmp;                                           \
-+    }
-+
-+    IF_REPLACE_VARIABLE_WITH_FUNC ("$XDG_RUNTIME_DIR",
-+                                   g_get_user_runtime_dir,
-+                                   "%s")
-+    else
-+    IF_REPLACE_VARIABLE_WITH_FUNC ("$XDG_CACHE_HOME",
-+                                   g_get_user_cache_dir,
-+                                   "%s")
-+    else
-+    IF_REPLACE_VARIABLE_WITH_FUNC ("$UID", getuid, "%d")
-+
-+#undef IF_REPLACE_VARIABLE_WITH_FUNC
-+
-+    return socket_address;
-+}
-+
- void
- bus_server_init (void)
- {
-+#define IBUS_UNIX_TMPDIR        "unix:tmpdir="
-+#define IBUS_UNIX_PATH          "unix:path="
-+#define IBUS_UNIX_ABSTRACT      "unix:abstract="
-+#define IBUS_UNIX_DIR           "unix:dir="



Home | Main Index | Thread Index | Old Index