Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2016-07-15 12:28:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2016-06-13 21:55:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2016-07-15 12:28:47.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 30 12:02:33 UTC 2016 - [email protected] + +- Update to 5.7.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.0.php +- Drop create_kdehome.patch and fix-breeze-sddm-theme-with-many-users.patch +- Add require-qt56.diff: we know our Qt package has the right patch, + so we don't need to depend on 5.6.1 + +------------------------------------------------------------------- Old: ---- create_kdehome.patch fix-breeze-sddm-theme-with-many-users.patch plasma-workspace-5.6.4.tar.xz New: ---- plasma-workspace-5.7.0.tar.xz require-qt56.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.jXYPDI/_old 2016-07-15 12:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.jXYPDI/_new 2016-07-15 12:28:50.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang Name: plasma5-workspace -Version: 5.6.4 +Version: 5.7.0 Release: 0 -%define plasma_version 5.6.4 +%define plasma_version 5.7.0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE @@ -30,14 +30,13 @@ Source99: %{name}-rpmlintrc # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch [email protected] -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch -# PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8 -Patch1: create_kdehome.patch -# PATCH-FIX_OPENSUSE fix-breeze-sddm-theme-with-many-users.patch [email protected] -- Asks for user/password and hide the user list when there's a large number of users -Patch2: fix-breeze-sddm-theme-with-many-users.patch +# PATCH-FIX_OPENSUSE require-qt56.diff +Patch1: require-qt56.diff # PATCH-FIX-OPENSUSE plasmashell-disable-windowclosing-on-logout.patch kde#349805 [email protected] -- Prevent plasma from closing too early on logout resulting in an unusable desktop if the logout is cancelled Patch4: plasmashell-disable-windowclosing-on-logout.patch -# PATCHES 100-200 and above are from upstream 5.6 branch -# PATCHES 201-300 and above are from upstream master/5.7 branch +# PATCHES 100-200 and above are from upstream 5.7 branch +# PATCHES 201-300 and above are from upstream master/5.8 branch +BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: phonon4qt5-devel >= 4.6.60 @@ -50,6 +49,9 @@ BuildRequires: cmake(KF5Declarative) >= 5.15.0 BuildRequires: cmake(KF5DocTools) >= 5.15.0 BuildRequires: cmake(KF5GlobalAccel) >= 5.15.0 +%if 0%{?is_opensuse} || 0%{?suse_version} > 1320 +BuildRequires: cmake(KF5Holidays) +%endif BuildRequires: cmake(KF5I18n) >= 5.15.0 BuildRequires: cmake(KF5IdleTime) >= 5.15.0 BuildRequires: cmake(KF5JsEmbed) >= 5.15.0 @@ -193,9 +195,14 @@ Group: Development/Libraries/KDE Requires: %{name}-libs = %{version}-%{release} Requires: cmake(KF5SysGuard) >= %{plasma_version} +Requires: cmake(KF5Wayland) >= 5.15.0 +Requires: cmake(Qt5Core) >= 5.4.0 +Requires: cmake(Qt5Gui) >= 5.4.0 +Requires: cmake(Qt5Quick) >= 5.4.0 Conflicts: kdebase4-workspace-devel Provides: plasma-workspace5-devel = %{version} Obsoletes: plasma-workspace5-devel <= %{version} +Conflicts: kapptemplate <= 16.03.80 %description devel This package contains the basic packages for a K Desktop Environment @@ -206,7 +213,6 @@ %setup -q -n plasma-workspace-%{plasma_version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %if 0%{?is_opensuse} || 0%{?suse_version} > 1315 %patch4 -p1 %endif @@ -219,6 +225,9 @@ %kf5_makeinstall -C build install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_suse.sh \ %{buildroot}/usr/bin/installdbgsymbols.sh + %suse_update_desktop_file -r %{buildroot}%{_kf5_applicationsdir}/org.kde.klipper.desktop System TrayIcon + mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/ + cp %{_kf5_iconsdir}/breeze/apps/48/klipper.svg %{buildroot}%{_kf5_iconsdir}/hicolor/48x48/apps/ # we have a separate package for Plasma5 session rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions rm -rfv %{buildroot}%{_kf5_sharedir}/wayland-sessions @@ -239,6 +248,7 @@ %{_kf5_libdir}/libplasma-geolocation-interface.so.* %{_kf5_libdir}/libtaskmanager.so.* %{_kf5_libdir}/libweather_ion.so.* +%{_kf5_libdir}/liblegacytaskmanager.so.* %files %defattr(-,root,root) @@ -266,6 +276,7 @@ %config %{_kf5_configdir}/plasmoids.knsrc %config %{_kf5_configdir}/wallpaper.knsrc %config %{_kf5_configdir}/taskmanagerrulesrc +%config %{_kf5_configdir}/legacytaskmanagerrulesrc %dir %{_kf5_libdir}/libexec %{_kf5_libdir}/libexec/ksyncdbusenv %{_kf5_libdir}/libexec/startplasma @@ -295,6 +306,7 @@ %{_kf5_plasmadir}/ %{_kf5_sharedir}/solid/ %{_kf5_sharedir}/kio_desktop/ +%{_kf5_iconsdir}/hicolor/48x48/apps/klipper.svg %files -n drkonqi5 %defattr(-,root,root) @@ -317,14 +329,18 @@ %{_kf5_prefix}/include/kworkspace5/ %{_kf5_prefix}/include/plasma/ %{_kf5_prefix}/include/taskmanager/ +%{_kf5_prefix}/include/legacytaskmanager/ %{_kf5_libdir}/cmake/KRunnerAppDBusInterface/ %{_kf5_libdir}/cmake/KSMServerDBusInterface/ %{_kf5_libdir}/cmake/LibKWorkspace/ %{_kf5_libdir}/cmake/LibTaskManager/ +%{_kf5_libdir}/cmake/LibLegacyTaskManager/ %{_kf5_libdir}/libkworkspace5.so %{_kf5_libdir}/libplasma-geolocation-interface.so %{_kf5_libdir}/libtaskmanager.so +%{_kf5_libdir}/liblegacytaskmanager.so %{_kf5_libdir}/libweather_ion.so +%{_kf5_sharedir}/kdevappwizard/ %{_kf5_sharedir}/dbus-1/interfaces/ %if %{with lang} ++++++ 0001-Rename-qdbus-in-startkde.patch ++++++ --- /var/tmp/diff_new_pack.jXYPDI/_old 2016-07-15 12:28:50.000000000 +0200 +++ /var/tmp/diff_new_pack.jXYPDI/_new 2016-07-15 12:28:50.000000000 +0200 @@ -2,7 +2,7 @@ index 91c8a3c..0c658bd 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake -@@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE +@@ -21,13 +21,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` if [ -n "$bindir" ]; then qbindir=`qtpaths --binaries-dir` @@ -18,7 +18,7 @@ fi # Check if a KDE session already is running and whether it's possible to connect to X -@@ -300,9 +300,9 @@ fi +@@ -291,9 +291,9 @@ export XDG_DATA_DIRS if $qdbus >/dev/null 2>/dev/null; then : # ok else ++++++ plasma-workspace-5.6.4.tar.xz -> plasma-workspace-5.7.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-workspace/plasma-workspace-5.6.4.tar.xz /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma-workspace-5.7.0.tar.xz differ: char 26, line 1 ++++++ require-qt56.diff ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 74e1518..b8c52a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -set(QT_MIN_VERSION "5.6.1") +set(QT_MIN_VERSION "5.6.0") set(KF5_MIN_VERSION "5.18.0") set(INSTALL_SDDM_THEME TRUE) find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets Quick QuickWidgets Concurrent Test Script Network)
