Accepting request 783825 from home:alarrosa:branches:M17N

- Enable wayland and emoji features in SLE 15 SP2 (boo#1165844,
  SLE-11652)
- Remove the with_kde option in the spec file and add a patch
  to remove an unneeded qt5 dependency
  * 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch

- Enable emoji support on armv6l and riscv64, nodejs-emojione is no longer

OBS-URL: https://build.opensuse.org/request/show/783825
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=227

0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch

@@ -0,0 +1,69 @@
+From e257f551179d47cd603a72524444c1f56bc31eac Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa <antonio.larrosa@gmail.com>
+Date: Wed, 11 Mar 2020 11:47:07 +0100
+Subject: [PATCH] Replace the Qt check for appindicator-engine-icon with a flag
+
+Instead of checking the Qt version installed in the system
+at build time in order to guess the plasma version the user
+will be running at runtime, use a configure flag to use
+an engine icon in the panel or not.
+
+This commit adds an --enable-appindicator-engine-icon flag that
+is enabled if appindicator is enabled (the default) and can
+be disabled with --disable-appindicator-engine-icon .
+
+This flag (as well as the check it replace) only seems to
+affect the code at:
+https://github.com/ibus/ibus/commit/35d035bfc48e20eecb3b3b3b14712d73c5fc027b#diff-498e61e4c9c641bf36042acdbb2eee53R1251
+---
+ configure.ac | 27 ++++++++++++++-------------
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2917c10b..6eb6088b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -300,26 +300,27 @@ else
+     AC_SUBST(wayland_scanner_rules)
+ fi
+ 
+-enable_appindicator_engine_icon="no"
+ if test x"$enable_appindicator" = x"yes"; then
+     enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
+ 
+-    # Need qt5-qtbase-devel package
+-    # There is no way to check the version of KStatusNotifierItem and
+-    # check the version of qtbase here.
+-    AC_MSG_CHECKING([for KDE5 appindicator engine icon])
+-    PKG_CHECK_EXISTS([Qt5Gui >= 5.4],
+-        enable_appindicator_engine_icon="yes"
+-    )
+-    AC_MSG_RESULT([$enable_appindicator_engine_icon])
+-
+-fi
+-if test x"$enable_appindicator_engine_icon" != x"yes" ; then
+-    enable_appindicator_engine_icon="no (disabled, need qtbase-devel 5.4 or later)"
++    # --enable-appindicator-engine-icon option.
++    AC_ARG_ENABLE(appindicator_engine_icon,
++       AS_HELP_STRING([--enable-appindicator_engine_icon],
++                       [Build appindicator engine icon support]),
++       [enable_appindicator_engine_icon=$enableval],
++       [enable_appindicator_engine_icon=yes]
++   )
++else
++    enable_appindicator_engine_icon="no (disabled since appindicator is disabled)"
+ fi
++
+ AM_CONDITIONAL([ENABLE_APPINDICATOR_ENGINE_ICON],
+                [test x"$enable_appindicator_engine_icon" = x"yes"])
+ 
++if test x"$enable_appindicator_engine_icon" = x"yes"; then
++    enable_appindicator_engine_icon="yes (enabled, use --disable-appindicator-engine-icon to disable)"
++fi
++
+ # GObject introspection
+ GOBJECT_INTROSPECTION_CHECK([0.6.8])
+ 
+-- 
+2.25.1
+

ibus.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 11 10:56:35 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
+
+- Enable wayland and emoji features in SLE 15 SP2 (boo#1165844,
+  SLE-11652)
+- Remove the with_kde option in the spec file and add a patch
+  to remove an unneeded qt5 dependency
+  * 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch
+
 -------------------------------------------------------------------
 Mon Mar  9 11:42:17 UTC 2020 - Andreas Schwab <schwab@suse.de>
 
@@ -6,7 +15,7 @@ Mon Mar  9 11:42:17 UTC 2020 - Andreas Schwab <schwab@suse.de>
 -------------------------------------------------------------------
 Sat Feb 29 13:17:53 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
 
-- Eable emoji support on armv6l and riscv64, nodejs-emojione is no longer
+- Enable emoji support on armv6l and riscv64, nodejs-emojione is no longer
   BuildRequires
 - Remove invalid build options
 - cleanup spec

ibus.spec

@@ -16,15 +16,14 @@
 #
 
 
-%if 0%{?is_opensuse}
+%if 0%{?is_opensuse} || 0%{?sle_version} >= 150200
 %define with_wayland 1
-%define with_kde 1
 %define with_emoji 1
 %else
 %define with_wayland 0
-%define with_kde 0
 %define with_emoji 0
 %endif
+
 Name:           ibus
 Version:        1.5.22
 Release:        0
@@ -59,6 +58,8 @@ Patch11:        setup-switch-im.patch
 # PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao@suse.com
 # Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
 Patch12:        ibus-disable-engines-preload-in-GNOME.patch
+# PATCH-FIX-UPSTREAM alarrosa@suse.com -- Remove unnecessary qt5 dependency https://github.com/ibus/ibus/pull/2194
+Patch13:        0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch
 BuildRequires:  fdupes
 BuildRequires:  gettext-devel
 BuildRequires:  gobject-introspection-devel >= 0.9.6
@@ -98,9 +99,6 @@ Requires:       python3-gobject-Gdk
 Requires:       typelib-1_0-Gtk-3_0
 Provides:       locale(ja;ko;zh)
 Obsoletes:      ibus-gnome-shell
-%if %{with_kde}
-BuildRequires:  libqt5-qtbase-devel
-%endif
 %if %{with_wayland}
 BuildRequires:  pkgconfig(wayland-client) >= 1.2.0
 %endif
@@ -205,6 +203,7 @@ cp -r %{SOURCE11} .
 %patch11 -p1
 %patch12 -p1
 %endif
+%patch13 -p1
 
 %build
 autoreconf -fi
@@ -216,11 +215,7 @@ autoreconf -fi
 %else
            --disable-emoji-dict \
 %endif
-%if %{with_kde}
            --enable-appindicator \
-%else
-           --disable-appindicator \
-%endif
            --with-python=python3 \
            --disable-python2 \
            --enable-python-library \