diff --git a/0001-Rename-qdbus-in-startkde.patch b/0001-Rename-qdbus-in-startkde.patch index 196e7f7..1f992f4 100644 --- a/0001-Rename-qdbus-in-startkde.patch +++ b/0001-Rename-qdbus-in-startkde.patch @@ -2,7 +2,7 @@ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake 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 @@ index 91c8a3c..0c658bd 100644 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 diff --git a/create_kdehome.patch b/create_kdehome.patch deleted file mode 100644 index ef21b5f..0000000 --- a/create_kdehome.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 0c658bd..51721d1 100644 ---- a/startkde/startkde.cmake -+++ b/startkde/startkde.cmake -@@ -64,6 +64,14 @@ fi - - mkdir -p $configDir - -+kdehome=$HOME/@KDE_DEFAULT_HOME@ -+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` -+ -+# see kstartupconfig source for usage -+mkdir -m 700 -p $kdehome -+mkdir -m 700 -p $kdehome/share -+mkdir -m 700 -p $kdehome/share/config -+ - #This is basically setting defaults so we can use them with kstartupconfig5 - cat >$configDir/startupconfigkeys <= 4.6.60 @@ -50,6 +49,9 @@ BuildRequires: cmake(KF5DBusAddons) >= 5.15.0 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 @@ Summary: The KDE Plasma Workspace Components 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 @@ workspace. Development files. %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 @@ workspace. Development files. %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 @@ workspace. Development files. %{_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 @@ workspace. Development files. %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 @@ workspace. Development files. %{_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 @@ workspace. Development files. %{_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} diff --git a/require-qt56.diff b/require-qt56.diff new file mode 100644 index 0000000..952e070 --- /dev/null +++ b/require-qt56.diff @@ -0,0 +1,13 @@ +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)