Update #2195 patch backport (it was revised upstream)

2195.patch

@@ -1,4 +1,4 @@
-From 1bed77ad198bc6ad7184674c510425039143fac7 Mon Sep 17 00:00:00 2001
+From 0c77da82ea59bdeb0c50683ba6f7f2b92b15901c Mon Sep 17 00:00:00 2001
 From: Carlos Garnacho <carlosg@gnome.org>
 Date: Wed, 11 Mar 2020 17:08:37 +0100
 Subject: [PATCH] src: Use WAYLAND_DISPLAY on Wayland sessions to make up IBus
@@ -26,7 +26,7 @@ Related: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2341
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/src/ibusshare.c b/src/ibusshare.c
-index 0d50d3f5c..b8e6450f6 100644
+index 0d50d3f5c..e0ef2ce08 100644
 --- a/src/ibusshare.c
 +++ b/src/ibusshare.c
 @@ -100,6 +100,7 @@ ibus_get_socket_path (void)
@@ -37,7 +37,7 @@ index 0d50d3f5c..b8e6450f6 100644
          gchar *p;
  
          path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE"));
-@@ -108,13 +109,17 @@ ibus_get_socket_path (void)
+@@ -108,13 +109,19 @@ ibus_get_socket_path (void)
          }
  
          if (_display == NULL) {
@@ -53,16 +53,9 @@ index 0d50d3f5c..b8e6450f6 100644
          }
  
 -        if (display) {
-+        if (display && !is_wayland) {
++        if (is_wayland) {
++            displaynumber = display;
++        } else if (display) {
              p = display;
              hostname = display;
              for (; *p != ':' && *p != '\0'; p++);
-@@ -133,6 +138,8 @@ ibus_get_socket_path (void)
-                 /* Do not use screennumber
-                  screennumber = p; */
-             }
-+        } else if (display) {
-+            displaynumber = display;
-         }
- 
-         if (hostname[0] == '\0')

ibus.spec

@@ -35,7 +35,7 @@
 
 Name:           ibus
 Version:        1.5.22
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -464,6 +464,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Wed Mar 11 2020 Adam Williamson <awilliam@redhat.com> - 1.5.22-4
+- Update #2195 patch backport (it was revised upstream)
+
 * Wed Mar 11 2020 Adam Williamson <awilliam@redhat.com> - 1.5.22-3
 - Backport PR #2195 to fix ibus with GNOME 3.36.0