pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 917700 from home:predivan:branches:M17N

Browse Source 
- 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 936a0e76df.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.

OBS-URL: https://build.opensuse.org/request/show/917700
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=256
This commit is contained in:
Hillwood Yang 2021-09-09 14:12:11 +00:00 committed by Git OBS Bridge
parent 4a0baf5a1c
commit 6fbec4a187
5 changed files with 155 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ibus-fix-wrong-cursor-location.patch Normal file
View File

@ -0,0 +1,30 @@
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;

88
ibus-missing-include.patch Normal file
View File

@ -0,0 +1,88 @@
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"

31
ibus-socket-name-compatibility.patch
View File

@ -1,11 +1,6 @@
This writes ~/.config/ibus/bus/SOCKETPATH with the old name. diff -Naur ibus-1.5.25/src/ibusshare.c ibus-1.5.25.new/src/ibusshare.c
Author: Changwoo Ryu --- ibus-1.5.25/src/ibusshare.c 2021-08-20 02:48:40.000000000 +0200
Last-Update: 2020-05-01 +++ ibus-1.5.25.new/src/ibusshare.c 2021-09-08 19:41:27.233077477 +0200
Bug: https://bugreports.qt.io/browse/QTBUG-82910
Forwarded: not-needed, workaround
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -90,79 +90,132 @@ @@ -90,79 +90,132 @@
return g_getenv("IBUS_SESSION_ID"); return g_getenv("IBUS_SESSION_ID");
} }
@ -193,7 +188,7 @@ Forwarded: not-needed, workaround
return path; return path;
} }
@@ -248,19 +301,45 @@ @@ -243,14 +296,42 @@
return address; return address;
} }
@ -202,6 +197,8 @@ Forwarded: not-needed, workaround
void void
ibus_write_address (const gchar *address) ibus_write_address (const gchar *address)
{ {
+
+
+ const gchar *socket_path; + const gchar *socket_path;
+ const gchar *socket_path_compat; + const gchar *socket_path_compat;
+ +
@ -215,7 +212,7 @@ Forwarded: not-needed, workaround
+ if (g_getenv ("GNOME_SETUP_DISPLAY") != NULL && + if (g_getenv ("GNOME_SETUP_DISPLAY") != NULL &&
+ strcmp (g_getenv ("GNOME_SETUP_DISPLAY"), g_getenv ("DISPLAY")) == 0) { + strcmp (g_getenv ("GNOME_SETUP_DISPLAY"), g_getenv ("DISPLAY")) == 0) {
+ /* Running from gnome-shell with the setup display; write the socket + /* 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 (); + socket_path_compat = ibus_get_socket_path_gnome_xwayland_compat ();
+ if (socket_path_compat != NULL) + if (socket_path_compat != NULL)
+ ibus_write_address_internal (address, socket_path_compat); + ibus_write_address_internal (address, socket_path_compat);
@ -232,12 +229,20 @@ Forwarded: not-needed, workaround
- path = g_path_get_dirname (ibus_get_socket_path ()); - path = g_path_get_dirname (ibus_get_socket_path ());
+ path = g_path_get_dirname (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_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"); - pf = fopen (ibus_get_socket_path (), "w");
+ g_unlink (socket_path);
+ pf = fopen (socket_path, "w"); + pf = fopen (socket_path, "w");
g_return_if_fail (pf != NULL); g_return_if_fail (pf != NULL);

13
ibus.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 8 13:04:55 UTC 2021 - Predrag Ivanović <predivan@mts.rs>
- 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 <hillwood@opensuse.org> Mon Sep 6 13:36:21 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>

7
ibus.spec
View File

@ -64,6 +64,9 @@ Patch12: ibus-disable-engines-preload-in-GNOME.patch
# Qt5 does not be update to the new version and patch for ibus on Leap 15, # 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) # it still needs this patch on leap 15. (boo#1187202)
Patch15: ibus-socket-name-compatibility.patch 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: fdupes
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: gobject-introspection-devel >= 0.9.6
@ -181,7 +184,7 @@ docs for ibus.
%prep %prep
%setup -q %setup -q
%patch0 -p1 #%patch0 -p1
%patch4 -p1 %patch4 -p1
%patch8 -p1 %patch8 -p1
%if 0%{?sle_version} < 150200 && 0%{?suse_version} <=1500 %if 0%{?sle_version} < 150200 && 0%{?suse_version} <=1500
@ -200,7 +203,9 @@ cp -r %{SOURCE11} .
%patch12 -p1 %patch12 -p1
%if 0%{?suse_version} <= 1500 %if 0%{?suse_version} <= 1500
%patch15 -p1 %patch15 -p1
%patch16 -p1
%endif %endif
%patch17 -p1
%build %build
%configure --disable-static \ %configure --disable-static \