Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2016-08-08 13:56:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2016-07-15 12:29:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2016-08-08 13:56:51.000000000 +0200 @@ -1,0 +2,41 @@ +Sat Jul 30 12:41:41 UTC 2016 - [email protected] + +- Run fdupes to soothe rpmlint + +------------------------------------------------------------------- +Fri Jul 29 15:42:18 UTC 2016 - [email protected] + +- Added patches from upstream: + 0001-don-t-create-activities-by-ourselves.patch + 0002-use-desktopsForActivty-currentActivity.patch + and 0003-correct-typo.patch + +------------------------------------------------------------------- +Thu Jul 28 20:39:40 UTC 2016 - [email protected] + +- Added loop-trough-screens-only-once.patch from upstream + +------------------------------------------------------------------- +Wed Jul 20 08:54:37 UTC 2016 - [email protected] + +- Update to 5.7.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.2.php + +------------------------------------------------------------------- +Wed Jul 13 06:13:34 UTC 2016 - [email protected] + +- Update to 5.7.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.1.php + +------------------------------------------------------------------- +Tue Jul 5 11:52:02 UTC 2016 - [email protected] + +- Use the new %kf5_find_lang macro to create the file list for the + lang package +- Remove rpmlintrc file, it is not needed any more now + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.7.0.tar.xz plasma5-desktop-rpmlintrc New: ---- 0001-don-t-create-activities-by-ourselves.patch 0002-use-desktopsForActivty-currentActivity.patch 0003-correct-typo.patch loop-trough-screens-only-once.patch plasma-desktop-5.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.jmJPwE/_old 2016-08-08 13:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.jmJPwE/_new 2016-08-08 13:56:52.000000000 +0200 @@ -18,19 +18,23 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.7.0 +Version: 5.7.2 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0 Group: System/GUI/KDE Url: http://www.kde.org/ Source: plasma-desktop-%{version}.tar.xz -Source99: %{name}-rpmlintrc Patch0: 0001-Require-xorg-evdev-2.8.99.1.patch # PATCHES 100-200 and above are from upstream 5.7 branch +Patch100: loop-trough-screens-only-once.patch +Patch101: 0001-don-t-create-activities-by-ourselves.patch +Patch102: 0002-use-desktopsForActivty-currentActivity.patch +Patch103: 0003-correct-typo.patch # PATCHES 201-300 and above are from upstream master/5.8 branch BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= 1.8.0 +BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: kf5-filesystem BuildRequires: libpulse-devel @@ -176,18 +180,26 @@ %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" %patch0 -Rp1 %endif +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 # conflict with kactivitimanagerd lang (and unused) rm -rf po/*/kactivities5.po %build - %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build +%if %{with lang} + %kf5_find_lang +%endif # no devel files needed here rm -rfv %{buildroot}%{_kf5_sharedir}/dbus-1/interfaces/ +%fdupes %{buildroot}/%{_prefix} %post -p /sbin/ldconfig @@ -303,10 +315,9 @@ %{_kf5_plugindir}/plasma/dataengine/plasma_engine_kimpanel.so %if %{with lang} -%files lang -%defattr(-,root,root) -%{_kf5_localedir}/ +%files lang -f %{name}.lang %doc %lang(ca) %{_kf5_htmldir}/ca/ +%doc %lang(cs) %{_kf5_htmldir}/cs/ %doc %lang(it) %{_kf5_htmldir}/it/ #doc %%lang(de) %%{_kf5_htmldir}/de/ %doc %lang(nl) %{_kf5_htmldir}/nl/ ++++++ 0001-don-t-create-activities-by-ourselves.patch ++++++ >From 89cb478eb205e5586751311594f2dcf4ec447199 Mon Sep 17 00:00:00 2001 From: Marco Martin <[email protected]> Date: Fri, 29 Jul 2016 12:39:53 +0200 Subject: [PATCH 1/3] don't create activities by ourselves --- desktoppackage/contents/layout.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/desktoppackage/contents/layout.js b/desktoppackage/contents/layout.js index ae47ba561228205f0414d930a2fddc1d69e9ca8a..988f27561a31ed16ce0e560af6b44fcc8914a147 100644 --- a/desktoppackage/contents/layout.js +++ b/desktoppackage/contents/layout.js @@ -1,9 +1,7 @@ loadTemplate("org.kde.plasma.desktop.defaultPanel") -var id = createActivity("Desktop"); -var desktopsArray = desktopsForActivity(id); -print(desktopsArray.length); +var desktopsArray = desktops(); for( var j = 0; j < desktopsArray.length; j++) { desktopsArray[j].wallpaperPlugin = 'org.kde.image'; //var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock"); -- 2.6.6 ++++++ 0002-use-desktopsForActivty-currentActivity.patch ++++++ >From 3b123057a01bff0ae296db7214ee98eb79c22c6f Mon Sep 17 00:00:00 2001 From: Marco Martin <[email protected]> Date: Fri, 29 Jul 2016 13:29:59 +0200 Subject: [PATCH 2/3] use desktopsForActivty(currentActivity()); more future proof --- desktoppackage/contents/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktoppackage/contents/layout.js b/desktoppackage/contents/layout.js index 988f27561a31ed16ce0e560af6b44fcc8914a147..b3a8a1da8187c1fad61214448fe43c469bea1c15 100644 --- a/desktoppackage/contents/layout.js +++ b/desktoppackage/contents/layout.js @@ -1,7 +1,7 @@ loadTemplate("org.kde.plasma.desktop.defaultPanel") -var desktopsArray = desktops(); +var desktopsArray = desktopsForActivty(currentActivity()); for( var j = 0; j < desktopsArray.length; j++) { desktopsArray[j].wallpaperPlugin = 'org.kde.image'; //var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock"); -- 2.6.6 ++++++ 0003-correct-typo.patch ++++++ >From 61389485e8148709786d9a77faefc24abe5d51d7 Mon Sep 17 00:00:00 2001 From: Marco Martin <[email protected]> Date: Fri, 29 Jul 2016 13:42:03 +0200 Subject: [PATCH 3/3] correct typo --- desktoppackage/contents/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktoppackage/contents/layout.js b/desktoppackage/contents/layout.js index b3a8a1da8187c1fad61214448fe43c469bea1c15..e62f46770a99aa11f9a8c0dbb4e99afa3abf9616 100644 --- a/desktoppackage/contents/layout.js +++ b/desktoppackage/contents/layout.js @@ -1,7 +1,7 @@ loadTemplate("org.kde.plasma.desktop.defaultPanel") -var desktopsArray = desktopsForActivty(currentActivity()); +var desktopsArray = desktopsForActivity(currentActivity()); for( var j = 0; j < desktopsArray.length; j++) { desktopsArray[j].wallpaperPlugin = 'org.kde.image'; //var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock"); -- 2.6.6 ++++++ loop-trough-screens-only-once.patch ++++++ From: Marco Martin <[email protected]> Date: Sat, 23 Jul 2016 17:40:58 +0000 Subject: loop trough screens only once X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=88e31e49967e56319f0737d3d6d2ab46d2073f51 --- loop trough screens only once Summary: we are already looping trough screens, creating an activity per screen is wrong Reviewers: ivan, davidedmundson, #plasma Reviewed By: ivan, davidedmundson, #plasma Subscribers: davidedmundson, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D2275 --- --- a/desktoppackage/contents/layout.js +++ b/desktoppackage/contents/layout.js @@ -1,12 +1,10 @@ loadTemplate("org.kde.plasma.desktop.defaultPanel") -for (var i = 0; i < screenCount; ++i) { - var id = createActivity("Desktop"); - var desktopsArray = desktopsForActivity(id); - print(desktopsArray.length); - for( var j = 0; j < desktopsArray.length; j++) { - desktopsArray[j].wallpaperPlugin = 'org.kde.image'; - //var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock"); - } +var id = createActivity("Desktop"); +var desktopsArray = desktopsForActivity(id); +print(desktopsArray.length); +for( var j = 0; j < desktopsArray.length; j++) { + desktopsArray[j].wallpaperPlugin = 'org.kde.image'; + //var clock = desktopsArray[j].addWidget("org.kde.plasma.analogclock"); } ++++++ plasma-desktop-5.7.0.tar.xz -> plasma-desktop-5.7.2.tar.xz ++++++ ++++ 25347 lines of diff (skipped)
