[pkgsrc/trunk]: pkgsrc/inputmethod/ibus ibus, ibus-python: update to 1.5.21.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/inputmethod/ibus ibus, ibus-python: update to 1.5.21.
From: tsutsui <tsutsui%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:55:20 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e32ba45e830c
branches:  trunk
changeset: 401267:e32ba45e830c
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Sat Sep 14 04:26:39 2019 +0000

description:
ibus, ibus-python: update to 1.5.21.

pkgsrc changes:
 - pull upstream fixes (will appear in the next version):
  - bus: Implement GDBusAuthObserver callback (to avoid #2116 conflicts)
    https://github.com/ibus/ibus/commit/3d442dbf936d197aa11ca0a71663c2bc61696151
  - g_dbus_server_new_sync() is failed with address unix:tmpdir=/tmp/ibus
    https://github.com/ibus/ibus/issues/2116
  - Save address file in XDG_RUNTIME_DIR
    https://github.com/ibus/ibus/pull/2128
 - explicitly pull Unicode 12.0 packages to avoid unexpected inconsistency
 - drop obsolete gconf from CONFIGURE_ARGS

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

 1.5.21
 * Enable to run ibus-setup with a different python
 * Update ibusunicodegen.h for Unicode UCD 12.0
 * Fixes build issues
 * Enhance tests
 * Add ibus.its for IME's component files
 * Make ISO 639 language names with title
 * Keep preedit cursor_pos and visible in clearing preedit text
 * Support long sequences and multiple output characters for compose table
 * Disable panel extension for gnome-initial-setup user
 * Exit ibus-daemon with parent's death
 * Update Wayland input-method protocol to unstable v1
* Indistinguishable address of ibus-daemon (Gunnar Hjalmarsson)
* Update LOCALES_STRING (Hodong Kim)
* Fix typos (Changwoo Ryu)

diffstat:

 inputmethod/ibus/Makefile                      |   10 +-
 inputmethod/ibus/Makefile.common               |    4 +-
 inputmethod/ibus/PLIST                         |   42 ++-
 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, 509 insertions(+), 32 deletions(-)

diffs (truncated from 649 to 300 lines):

diff -r 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/Makefile
--- a/inputmethod/ibus/Makefile Sat Sep 14 03:47:17 2019 +0000
+++ b/inputmethod/ibus/Makefile Sat Sep 14 04:26:39 2019 +0000
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.65 2019/07/21 22:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2019/09/14 04:26:39 tsutsui Exp $
 
-PKGREVISION= 3
 .include "Makefile.common"
 
 COMMENT=       Intelligent Input Bus
 
 DEPENDS+=      ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-BUILD_DEPENDS+=        cldr-emoji-annotation>=34.0.0.0:../../textproc/cldr-emoji-annotation
-BUILD_DEPENDS+=        unicode-character-database-[0-9]*:../../textproc/unicode-character-database
-BUILD_DEPENDS+=        unicode-emoji-[0-9]*:../../textproc/unicode-emoji
+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-emoji>=12.0:../../textproc/unicode-emoji
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
@@ -24,7 +23,6 @@
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=       --enable-dconf
-CONFIGURE_ARGS+=       --enable-gconf
 CONFIGURE_ARGS+=       --enable-gtk2
 CONFIGURE_ARGS+=       --enable-gtk3
 CONFIGURE_ARGS+=       --enable-surrounding-text
diff -r 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/Makefile.common
--- a/inputmethod/ibus/Makefile.common  Sat Sep 14 03:47:17 2019 +0000
+++ b/inputmethod/ibus/Makefile.common  Sat Sep 14 04:26:39 2019 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.14 2019/03/02 02:16:32 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/09/14 04:26:39 tsutsui Exp $
 #
 # used by inputmethod/ibus/Makefile
 # used by inputmethod/ibus-python/Makefile
 
-DISTNAME=      ibus-1.5.20
+DISTNAME=      ibus-1.5.21
 CATEGORIES=    inputmethod
 MASTER_SITES=  https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
 
diff -r 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/PLIST
--- a/inputmethod/ibus/PLIST    Sat Sep 14 03:47:17 2019 +0000
+++ b/inputmethod/ibus/PLIST    Sat Sep 14 04:26:39 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/03/02 02:16:32 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/09/14 04:26:39 tsutsui Exp $
 bin/ibus
 bin/ibus-daemon
 bin/ibus-setup
@@ -69,6 +69,8 @@
 share/dbus-1/services/org.freedesktop.portal.IBus.service
 share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
 share/examples/ibus/dconf/profile/ibus
+share/gettext/its/ibus.its
+share/gettext/its/ibus.loc
 share/gir-1.0/IBus-1.0.gir
 share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
 share/gtk-doc/html/ibus/IBusAttrList.html
@@ -245,33 +247,33 @@
 share/ibus/keymaps/kr
 share/ibus/keymaps/modifiers
 share/ibus/keymaps/us
-share/ibus/setup/emojilang.py
+share/ibus/setup/emojilang.pyo
 share/ibus/setup/emojilang.pyc
-share/ibus/setup/emojilang.pyo
-share/ibus/setup/engineabout.py
-share/ibus/setup/engineabout.pyc
 share/ibus/setup/engineabout.pyo
-share/ibus/setup/enginecombobox.py
-share/ibus/setup/enginecombobox.pyc
+share/ibus/setup/engineabout.pyc
 share/ibus/setup/enginecombobox.pyo
-share/ibus/setup/enginedialog.py
+share/ibus/setup/enginecombobox.pyc
+share/ibus/setup/enginedialog.pyo
 share/ibus/setup/enginedialog.pyc
-share/ibus/setup/enginedialog.pyo
-share/ibus/setup/enginetreeview.py
+share/ibus/setup/enginetreeview.pyo
 share/ibus/setup/enginetreeview.pyc
-share/ibus/setup/enginetreeview.pyo
-share/ibus/setup/i18n.py
+share/ibus/setup/i18n.pyo
 share/ibus/setup/i18n.pyc
-share/ibus/setup/i18n.pyo
-share/ibus/setup/icon.py
-share/ibus/setup/icon.pyc
 share/ibus/setup/icon.pyo
-share/ibus/setup/keyboardshortcut.py
-share/ibus/setup/keyboardshortcut.pyc
+share/ibus/setup/icon.pyc
 share/ibus/setup/keyboardshortcut.pyo
-share/ibus/setup/main.py
+share/ibus/setup/keyboardshortcut.pyc
+share/ibus/setup/main.pyo
 share/ibus/setup/main.pyc
-share/ibus/setup/main.pyo
+share/ibus/setup/emojilang.py
+share/ibus/setup/engineabout.py
+share/ibus/setup/enginecombobox.py
+share/ibus/setup/enginedialog.py
+share/ibus/setup/enginetreeview.py
+share/ibus/setup/i18n.py
+share/ibus/setup/icon.py
+share/ibus/setup/keyboardshortcut.py
+share/ibus/setup/main.py
 share/ibus/setup/setup.ui
 share/icons/hicolor/16x16/apps/ibus-keyboard.png
 share/icons/hicolor/22x22/apps/ibus-keyboard.png
@@ -303,6 +305,7 @@
 share/locale/hi/LC_MESSAGES/ibus10.mo
 share/locale/hu/LC_MESSAGES/ibus10.mo
 share/locale/ia/LC_MESSAGES/ibus10.mo
+share/locale/id/LC_MESSAGES/ibus10.mo
 share/locale/it/LC_MESSAGES/ibus10.mo
 share/locale/ja/LC_MESSAGES/ibus10.mo
 share/locale/kn/LC_MESSAGES/ibus10.mo
@@ -325,6 +328,7 @@
 share/locale/ta/LC_MESSAGES/ibus10.mo
 share/locale/te/LC_MESSAGES/ibus10.mo
 share/locale/tg/LC_MESSAGES/ibus10.mo
+share/locale/tr/LC_MESSAGES/ibus10.mo
 share/locale/uk/LC_MESSAGES/ibus10.mo
 share/locale/ur/LC_MESSAGES/ibus10.mo
 share/locale/vi/LC_MESSAGES/ibus10.mo
diff -r 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/distinfo
--- a/inputmethod/ibus/distinfo Sat Sep 14 03:47:17 2019 +0000
+++ b/inputmethod/ibus/distinfo Sat Sep 14 04:26:39 2019 +0000
@@ -1,10 +1,16 @@
-$NetBSD: distinfo,v 1.21 2019/03/02 02:16:32 tsutsui Exp $
+$NetBSD: distinfo,v 1.22 2019/09/14 04:26:39 tsutsui Exp $
 
-SHA1 (ibus-1.5.20.tar.gz) = 3d4e919bc9a2d4aa3e68570cf55647167c6be560
-RMD160 (ibus-1.5.20.tar.gz) = 51c290b2e52235988c0ad4831d581d884dc42f2a
-SHA512 (ibus-1.5.20.tar.gz) = 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
-Size (ibus-1.5.20.tar.gz) = 3393487 bytes
+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 (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 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/patches/patch-bus_global.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/ibus/patches/patch-bus_global.c       Sat Sep 14 04:26:39 2019 +0000
@@ -0,0 +1,31 @@
+$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 6dbec7357dcb -r e32ba45e830c inputmethod/ibus/patches/patch-bus_server.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/ibus/patches/patch-bus_server.c       Sat Sep 14 04:26:39 2019 +0000
@@ -0,0 +1,269 @@
+$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)
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/cldr-emoji-annotation to 35....
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated inputmethode/ibus and inputmethode/ib...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated textproc/cldr-emoji-annotation to 35....
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated inputmethode/ibus and inputmethode/ib...
Indexes:
Home | Main Index | Thread Index | Old Index