Hello community,
here is the log from the commit of package plasma5-desktop for openSUSE:Factory
checked in at 2020-02-14 16:24:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old)
and /work/SRC/openSUSE:Factory/.plasma5-desktop.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop"
Fri Feb 14 16:24:30 2020 rev:118 rq:774303 version:5.18.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes
2020-02-10 21:52:16.066152663 +0100
+++
/work/SRC/openSUSE:Factory/.plasma5-desktop.new.26092/plasma5-desktop.changes
2020-02-14 16:24:46.983171388 +0100
@@ -1,0 +2,20 @@
+Fri Feb 14 09:00:22 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Add %exclude for ibus-emoji-dicts to avoid file conflicts
+
+-------------------------------------------------------------------
+Wed Feb 12 08:37:04 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Ship ibus emoji dicts as part of the emojier subpackage,
+ recommend it by default now
+- Recommend noto-coloremoji-fonts for emojier
+- Drop superfluous -lang recommends
+
+-------------------------------------------------------------------
+Tue Feb 11 16:51:58 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Add patch to unlock widgets by default as the GUI option got
+ dropped (kde#417424):
+ * 0001-unlock-widgets.patch
+
+-------------------------------------------------------------------
New:
----
0001-unlock-widgets.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-desktop.spec ++++++
--- /var/tmp/diff_new_pack.45KZEe/_old 2020-02-14 16:24:47.907171890 +0100
+++ /var/tmp/diff_new_pack.45KZEe/_new 2020-02-14 16:24:47.911171892 +0100
@@ -37,6 +37,8 @@
%endif
# PATCH-FIX-OPENSUSE
Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch
+# PATCH-FIX-UPSTREAM
+Patch2: 0001-unlock-widgets.patch
BuildRequires: extra-cmake-modules >= 1.8.0
BuildRequires: fdupes
BuildRequires: glib2-devel
@@ -146,8 +148,7 @@
Requires: knewstuff-imports
Conflicts: kactivities5 < 5.20.0
Recommends: plasma5-addons
-Suggests: %{name}-emojier
-Recommends: %{name}-lang
+Recommends: %{name}-emojier
Provides: kdebase4-workspace = 5.3.0
Obsoletes: kdebase4-workspace < 5.3.0
Provides: kcm-touchpad = %{version}
@@ -177,12 +178,8 @@
Summary: Selection window for emoji text input
Group: System/GUI/KDE
Requires: %{name} = %{version}
-# This uses .dict files, which are part of the ibus package.
-# That's a huge dep tree and is also known to break things.
-# So until that is fixed, don't install emojier by default.
-Requires: ibus
-# Get it installed automatically at least if ibus is already there
-Supplements: (%{name} and ibus)
+# Other color fonts don't really work that well
+Recommends: noto-coloremoji-fonts
%description emojier
Press Meta+. to open an emoji selection window.
@@ -196,6 +193,9 @@
sed -i"" "s/Name=Desktop/Name=Desktop Containment/g"
containments/desktop/package/metadata.desktop
%build
+ # Reference the local copy (see the comment in the install section)
+ sed -i"" 's#ibus/dicts/#plasma/ibus-emoji-dicts/#g'
applets/kimpanel/backend/ibus/emojier/emojier.cpp
+
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%cmake_build
@@ -219,6 +219,12 @@
# remove this once kpackagetool5 is fixed
find %{buildroot}%{_kf5_appstreamdir} -type f -size 0 -print -delete
+ # The emojier needs .dict files from ibus, which are part of the ibus
package.
+ # That's a huge dep tree and is also known to break things such as keyboard
layout selection.
+ # So until that is fixed (boo#1161584) install the files as part of the
package.
+ mkdir -p %{buildroot}%{_kf5_sharedir}/plasma/ibus-emoji-dicts/
+ cp %{_datadir}/ibus/dicts/emoji-*.dict
%{buildroot}%{_kf5_sharedir}/plasma/ibus-emoji-dicts/
+
# no devel files needed here
rm -rfv %{buildroot}%{_kf5_sharedir}/dbus-1/interfaces/
%fdupes %{buildroot}/%{_prefix}
@@ -293,6 +299,7 @@
%{_kf5_servicetypesdir}/
%{_kf5_datadir}/
%{_kf5_sharedir}/solid/
+%exclude %{_kf5_plasmadir}/ibus-emoji-dicts/
%{_kf5_plasmadir}/
%{_kf5_appstreamdir}/
%{_kf5_libdir}/libexec/kimpanel-ibus-panel
@@ -307,6 +314,7 @@
%{_kf5_applicationsdir}/org.kde.plasma.emojier.desktop
%dir %{_kf5_sharedir}/kglobalaccel
%{_kf5_sharedir}/kglobalaccel/org.kde.plasma.emojier.desktop
+%{_kf5_plasmadir}/ibus-emoji-dicts/
%if %{with lang}
%files lang -f %{name}.lang
++++++ 0001-unlock-widgets.patch ++++++
>From 2bc3c5e92d4789146548e8de4d520cd191994e1c Mon Sep 17 00:00:00 2001
From: Marco Martin <[email protected]>
Date: Tue, 11 Feb 2020 16:41:26 +0100
Subject: [PATCH] unlock widgets
5.18 doesn't offer a way anymore from the gui
so unlock them if they're locked
BUG:417424
---
desktoppackage/contents/updates/unlock_widgets.js | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 desktoppackage/contents/updates/unlock_widgets.js
diff --git a/desktoppackage/contents/updates/unlock_widgets.js
b/desktoppackage/contents/updates/unlock_widgets.js
new file mode 100644
index 000000000..c3322704b
--- /dev/null
+++ b/desktoppackage/contents/updates/unlock_widgets.js
@@ -0,0 +1,2 @@
+
+__AppInterface.locked = false;
--
2.23.0
