Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2021-09-09 23:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus" Thu Sep 9 23:07:22 2021 rev:111 rq:917758 version:1.5.25 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2021-07-22 22:43:04.403222253 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new.1899/ibus.changes 2021-09-09 23:07:27.328824780 +0200 @@ -1,0 +2,33 @@ +Wed Sep 8 13:04:55 UTC 2021 - Predrag Ivanovi?? <[email protected]> + +- Refresh ibus-socket-name-compatibility.patch +- Add ibus-missing-include.patch to fix build on Leap +- Add ibus-fix-wrong-cursor-location.patch + (based on https://github.com/ibus/ibus/commit/936a0e76df79d92a8bdc03e9205330fb84a2083e.patch) + (gh#ibus/ibus#2337) +- Drop ibus-python-install-dir.patch + Two reasons: it's for, disabled in .spec, python2, and patch forces + the re-generation of configure, which requires aclocal-1.16, + unavailable on Leap-15.3, and that breaks the build. + +------------------------------------------------------------------- +Mon Sep 6 13:36:21 UTC 2021 - Hillwood Yang <[email protected]> + +- Update version to 1.5.25 + * src/tests: Run gnome-session with no-overview mode + * client/gtk2: Implement ibus_im_context_set_surrounding_with_selection + * src/ibuscomposetable: Do not include the same compose file + * src/ibusenginesimple: Multi_key to 0xB7 + * src/ibusenginesimple: Make Compose preedit less intrusive + * Change default Emoji shortcut key + * setup: Enhance engine search function + * client/gtk2/ibusimcontext: Enable sync process in GTK4 + * engine: Update simple.xml with xkeyboard-config 2.33 + * src/ibuscomposetable: Add support for the include directive (lf-) + * src/ibuscomposetable: Fix a buffer overflow in compose handling (lf-) + * client/x11: Add support for XFixes ClientDisconnectMode (Olivier Fourdan) + * setup: Start ibus-daemon with the --daemonize option (Gunnar Hjalmarsson) + * src: Fix a typo in ibusenginesimple.h (user202729) + * Update translations + +------------------------------------------------------------------- Old: ---- ibus-1.5.24.tar.gz New: ---- ibus-1.5.25.tar.gz ibus-fix-wrong-cursor-location.patch ibus-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.mFf69W/_old 2021-09-09 23:07:27.972825528 +0200 +++ /var/tmp/diff_new_pack.mFf69W/_new 2021-09-09 23:07:27.976825532 +0200 @@ -25,7 +25,7 @@ %endif Name: ibus -Version: 1.5.24 +Version: 1.5.25 Release: 0 Summary: The "Intelligent Input Bus" input method License: LGPL-2.1-or-later @@ -64,6 +64,9 @@ # Qt5 does not be update to the new version and patch for ibus on Leap 15, # it still needs this patch on leap 15. (boo#1187202) Patch15: ibus-socket-name-compatibility.patch +Patch16: ibus-missing-include.patch +# PATCH-FIX-UPSTREAM ibus-fix-wrong-cursor-location.patch gh#ibus/ibus#2337 +Patch17: ibus-fix-wrong-cursor-location.patch BuildRequires: fdupes BuildRequires: gettext-devel BuildRequires: gobject-introspection-devel >= 0.9.6 @@ -146,7 +149,7 @@ Summary: IBus input method support for gtk2 applications Group: System/I18n/Chinese Requires: %{name} = %{version} -Supplements: packageand(ibus:gtk2) +Supplements: (ibus and gtk2) %{gtk2_immodule_requires} %description gtk @@ -157,7 +160,7 @@ Group: System/I18n/Chinese BuildRequires: pkgconfig(gtk+-3.0) Requires: %{name} = %{version} -Supplements: packageand(ibus:gtk3) +Supplements: (ibus and gtk3) %{gtk3_immodule_requires} %description gtk3 @@ -181,7 +184,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %patch4 -p1 %patch8 -p1 %if 0%{?sle_version} < 150200 && 0%{?suse_version} <=1500 @@ -200,10 +203,11 @@ %patch12 -p1 %if 0%{?suse_version} <= 1500 %patch15 -p1 +%patch16 -p1 %endif +%patch17 -p1 %build -autoreconf -fi %configure --disable-static \ --enable-gtk3 \ --enable-vala \ @@ -335,7 +339,7 @@ # This file is not a config file. Users may not modify it. %config %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings %config %{_sysconfdir}/dconf/profile/ibus -%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop +%config %{_sysconfdir}/xdg/autostart/ibus-autostart.desktop %{_mandir}/man1/ibus.1%{ext_man} %{_mandir}/man1/ibus-daemon.1%{ext_man} %{_mandir}/man1/ibus-setup.1%{ext_man} ++++++ ibus-1.5.24.tar.gz -> ibus-1.5.25.tar.gz ++++++ ++++ 34392 lines of diff (skipped) ++++++ ibus-fix-wrong-cursor-location.patch ++++++ diff -Naur ibus-1.5.25/client/gtk2/ibusimcontext.c ibus-1.5.25.new/client/gtk2/ibusimcontext.c --- ibus-1.5.25/client/gtk2/ibusimcontext.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/client/gtk2/ibusimcontext.c 2021-09-08 14:58:40.500448136 +0200 @@ -1497,7 +1497,10 @@ #if GTK_CHECK_VERSION (3, 98, 4) #elif GTK_CHECK_VERSION (2, 91, 0) - area.y += gdk_window_get_height (ibusimcontext->client_window); + if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { + area.x = 0; + area.y += gdk_window_get_height (ibusimcontext->client_window); + } #else if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { gint w, h; diff -Naur ibus-1.5.25/client/gtk3/ibusimcontext.c ibus-1.5.25.new/client/gtk3/ibusimcontext.c --- ibus-1.5.25/client/gtk3/ibusimcontext.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/client/gtk3/ibusimcontext.c 2021-09-08 14:59:39.992371070 +0200 @@ -1497,7 +1497,10 @@ #if GTK_CHECK_VERSION (3, 98, 4) #elif GTK_CHECK_VERSION (2, 91, 0) - area.y += gdk_window_get_height (ibusimcontext->client_window); + if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { + area.x = 0; + area.y += gdk_window_get_height (ibusimcontext->client_window); + } #else if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) { gint w, h; ++++++ ibus-missing-include.patch ++++++ diff -Naur ibus-1.5.25/conf/dconf/main.c ibus-1.5.25.new/conf/dconf/main.c --- ibus-1.5.25/conf/dconf/main.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/conf/dconf/main.c 2021-09-08 13:53:17.833396607 +0200 @@ -21,6 +21,7 @@ * USA */ +#include <errno.h> #include <ibus.h> #include <stdlib.h> #include <locale.h> diff -Naur ibus-1.5.25/conf/memconf/main.c ibus-1.5.25.new/conf/memconf/main.c --- ibus-1.5.25/conf/memconf/main.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/conf/memconf/main.c 2021-09-08 13:53:43.513361844 +0200 @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA */ +#include <errno.h> #include <ibus.h> #include <stdlib.h> #include <locale.h> diff -Naur ibus-1.5.25/portal/portal.c ibus-1.5.25.new/portal/portal.c --- ibus-1.5.25/portal/portal.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/portal/portal.c 2021-09-08 14:07:36.300242490 +0200 @@ -30,6 +30,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <errno.h> #include "ibus-portal-dbus.h" diff -Naur ibus-1.5.25/src/ibuscomposetable.c ibus-1.5.25.new/src/ibuscomposetable.c --- ibus-1.5.25/src/ibuscomposetable.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/src/ibuscomposetable.c 2021-09-08 13:15:25.184529800 +0200 @@ -19,6 +19,7 @@ * USA */ +#include <errno.h> #include <glib.h> #include <glib/gstdio.h> #include <stdlib.h> diff -Naur ibus-1.5.25/src/ibusemoji.c ibus-1.5.25.new/src/ibusemoji.c --- ibus-1.5.25/src/ibusemoji.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/src/ibusemoji.c 2021-09-08 13:22:14.227971403 +0200 @@ -23,6 +23,7 @@ #include <config.h> #endif +#include <errno.h> #include <glib.h> #include <glib/gstdio.h> #include "ibusemoji.h" diff -Naur ibus-1.5.25/src/ibusregistry.c ibus-1.5.25.new/src/ibusregistry.c --- ibus-1.5.25/src/ibusregistry.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/src/ibusregistry.c 2021-09-08 13:25:08.191728353 +0200 @@ -23,6 +23,7 @@ #include <gio/gio.h> #include <glib/gstdio.h> #include <string.h> +#include <errno.h> #include "ibusinternal.h" #include "ibusmarshalers.h" diff -Naur ibus-1.5.25/src/ibusshare.c ibus-1.5.25.new/src/ibusshare.c --- ibus-1.5.25/src/ibusshare.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/src/ibusshare.c 2021-09-08 13:29:17.527380024 +0200 @@ -32,6 +32,7 @@ #include <stdio.h> #include <string.h> #include <ibus.h> +#include <errno.h> static gchar *_display = NULL; diff -Naur ibus-1.5.25/src/ibusunicode.c ibus-1.5.25.new/src/ibusunicode.c --- ibus-1.5.25/src/ibusunicode.c 2021-08-20 02:48:40.000000000 +0200 +++ ibus-1.5.25.new/src/ibusunicode.c 2021-09-08 13:32:06.475144580 +0200 @@ -23,6 +23,7 @@ #include <config.h> #endif +#include <errno.h> #include <glib.h> #include <glib/gstdio.h> #include "ibusinternal.h" ++++++ ibus-socket-name-compatibility.patch ++++++ --- /var/tmp/diff_new_pack.mFf69W/_old 2021-09-09 23:07:28.644826307 +0200 +++ /var/tmp/diff_new_pack.mFf69W/_new 2021-09-09 23:07:28.644826307 +0200 @@ -1,11 +1,6 @@ -This writes ~/.config/ibus/bus/SOCKETPATH with the old name. -Author: Changwoo Ryu -Last-Update: 2020-05-01 -Bug: https://bugreports.qt.io/browse/QTBUG-82910 -Forwarded: not-needed, workaround - ---- a/src/ibusshare.c -+++ b/src/ibusshare.c +diff -Naur ibus-1.5.25/src/ibusshare.c ibus-1.5.25.new/src/ibusshare.c +--- ibus-1.5.25/src/ibusshare.c 2021-08-20 02:48:40.000000000 +0200 ++++ ibus-1.5.25.new/src/ibusshare.c 2021-09-08 19:41:27.233077477 +0200 @@ -90,79 +90,132 @@ return g_getenv("IBUS_SESSION_ID"); } @@ -193,7 +188,7 @@ return path; } -@@ -248,19 +301,45 @@ +@@ -243,14 +296,42 @@ return address; } @@ -202,6 +197,8 @@ void ibus_write_address (const gchar *address) { ++ ++ + const gchar *socket_path; + const gchar *socket_path_compat; + @@ -215,7 +212,7 @@ + if (g_getenv ("GNOME_SETUP_DISPLAY") != NULL && + strcmp (g_getenv ("GNOME_SETUP_DISPLAY"), g_getenv ("DISPLAY")) == 0) { + /* Running from gnome-shell with the setup display; write the socket -+ * address to an additional path for X11 clients */ +++ * address to an additional path for X11 clients */ + socket_path_compat = ibus_get_socket_path_gnome_xwayland_compat (); + if (socket_path_compat != NULL) + ibus_write_address_internal (address, socket_path_compat); @@ -232,12 +229,20 @@ - path = g_path_get_dirname (ibus_get_socket_path ()); + path = g_path_get_dirname (socket_path); - g_mkdir_with_parents (path, 0700); + errno = 0; + if (g_mkdir_with_parents (path, 0700)) { + g_warning ("Failed to mkdir %s: %s", path, g_strerror (errno)); +@@ -260,11 +341,11 @@ g_free (path); -- g_unlink (ibus_get_socket_path ()); + errno = 0; +- if (g_unlink (ibus_get_socket_path ())) { ++ if (g_unlink (socket_path)) { + g_warning ("Failed to unlink %s: %s", +- ibus_get_socket_path (), g_strerror (errno)); ++ socket_path, g_strerror (errno)); + } - pf = fopen (ibus_get_socket_path (), "w"); -+ g_unlink (socket_path); + pf = fopen (socket_path, "w"); g_return_if_fail (pf != NULL); ++++++ setup-switch-im.patch ++++++ --- /var/tmp/diff_new_pack.mFf69W/_old 2021-09-09 23:07:28.664826331 +0200 +++ /var/tmp/diff_new_pack.mFf69W/_new 2021-09-09 23:07:28.668826336 +0200 @@ -1,6 +1,6 @@ -diff -Nur ibus-1.5.23/setup/main.py ibus-1.5.23-new/setup/main.py ---- ibus-1.5.23/setup/main.py 2020-09-29 18:58:24.000000000 +0800 -+++ ibus-1.5.23-new/setup/main.py 2020-09-30 13:44:05.023868829 +0800 +diff -Nur ibus-1.5.25/setup/main.py ibus-1.5.25-new/setup/main.py +--- ibus-1.5.25/setup/main.py 2021-08-20 08:48:40.000000000 +0800 ++++ ibus-1.5.25-new/setup/main.py 2021-09-06 20:54:06.205651597 +0800 @@ -508,11 +508,16 @@ self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args) @@ -29,7 +29,7 @@ - GLib.timeout_add_seconds(timeout, lambda *args: main_loop.quit()) - self.__bus.connect("connected", lambda *args: main_loop.quit()) - -- os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim") +- os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim", "--daemonize") - - main_loop.run() -
