Hello community, here is the log from the commit of package ibus for openSUSE:Leap:15.2 checked in at 2020-03-31 07:21:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ibus (Old) and /work/SRC/openSUSE:Leap:15.2/.ibus.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus" Tue Mar 31 07:21:54 2020 rev:31 rq:788617 version:1.5.22 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ibus/ibus.changes 2020-03-20 05:52:28.356046146 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ibus.new.3160/ibus.changes 2020-03-31 07:21:55.346386373 +0200 @@ -1,0 +2,22 @@ +Wed Mar 11 10:56:35 UTC 2020 - Antonio Larrosa <[email protected]> + +- 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 <[email protected]> + +- Enable emoji also on ppc + +------------------------------------------------------------------- +Sat Feb 29 13:17:53 UTC 2020 - Hillwood Yang <[email protected]> + +- Enable emoji support on armv6l and riscv64, nodejs-emojione is no longer + BuildRequires +- Remove invalid build options +- cleanup spec + +------------------------------------------------------------------- New: ---- 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.mifscN/_old 2020-03-31 07:21:56.070386687 +0200 +++ /var/tmp/diff_new_pack.mifscN/_new 2020-03-31 07:21:56.074386689 +0200 @@ -16,19 +16,14 @@ # -%if 0%{?is_opensuse} +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150200 %define with_wayland 1 -%define with_kde 1 -%ifarch armv6l armv6hl ppc riscv64 -%define with_emoji 0 -%else %define with_emoji 1 -%endif %else %define with_wayland 0 -%define with_kde 0 %define with_emoji 0 %endif + Name: ibus Version: 1.5.22 Release: 0 @@ -51,7 +46,7 @@ # PATCH-FIX-UPSTREAM [email protected] # Select an IM engine at the first login Patch8: im-engines-precede-xkb.patch -# PATFH-FIX-OPENSUSE ibus-fix-Signal-does-not-exist.patch [email protected] +# PATCH-FIX-OPENSUSE ibus-fix-Signal-does-not-exist.patch [email protected] # panel.vala: The name `Signal' does not exist in the context of `Posix' in Leap 15.1 and below Patch9: ibus-fix-Signal-does-not-exist.patch # PATCH-FIX-SLE hide-setup-menu.patch bnc#899259 [email protected] @@ -63,23 +58,25 @@ # PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 [email protected] # Disable ibus engines preload in GNOME for These works are handled by gnome-shell. Patch12: ibus-disable-engines-preload-in-GNOME.patch -BuildRequires: dbus-1-glib-devel -BuildRequires: dconf-devel >= 0.7.5 +# PATCH-FIX-UPSTREAM [email protected] -- 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: glib2-devel >= 2.34.0 BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: gtk-doc >= 1.9 -BuildRequires: gtk2-devel -BuildRequires: iso-codes-devel -BuildRequires: libnotify-devel >= 0.7 BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-dbus-python-devel -BuildRequires: python3-devel BuildRequires: python3-gobject-devel BuildRequires: unicode-ucd BuildRequires: update-desktop-files +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(dconf) >= 0.7.5 +BuildRequires: pkgconfig(glib-2.0) >= 2.34.0 +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libnotify) >= 0.7 +BuildRequires: pkgconfig(python3) # copy_deep method is supported since 0.31.1 BuildRequires: vala >= 0.31.1 BuildRequires: x11-tools @@ -102,9 +99,6 @@ 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 @@ -164,7 +158,7 @@ %package gtk3 Summary: IBus input method support for gtk3 applications Group: System/I18n/Chinese -BuildRequires: gtk3-devel +BuildRequires: pkgconfig(gtk+-3.0) Requires: %{name} = %{version} Supplements: packageand(ibus:gtk3) %{gtk3_immodule_requires} @@ -209,6 +203,7 @@ %patch11 -p1 %patch12 -p1 %endif +%patch13 -p1 %build autoreconf -fi @@ -220,23 +215,17 @@ %else --disable-emoji-dict \ %endif -%if %{with_kde} --enable-appindicator \ -%else - --disable-appindicator \ -%endif --with-python=python3 \ --disable-python2 \ --enable-python-library \ --enable-introspection \ - --disable-gconf \ --enable-dconf \ --enable-gtk-doc \ %if %{with_wayland} --enable-wayland \ %endif --enable-surrounding-text \ - --enable-appindicator_engine_icon \ --libexecdir=%{_libdir}/ibus make %{?_smp_mflags} ++++++ 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch ++++++ >From e257f551179d47cd603a72524444c1f56bc31eac Mon Sep 17 00:00:00 2001 From: Antonio Larrosa <[email protected]> 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
