OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=16

2014-09-11 15:06:32 +00:00
parent 311b38d92d
commit b96b006bea
7 changed files with 73 additions and 18 deletions
--- a/0001-Rename-qdbus-in-startkde.patch
+++ b/0001-Rename-qdbus-in-startkde.patch
@@ -1,5 +1,5 @@
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 40e3377..37c2840 100644
+index 91c8a3c..0c658bd 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
@@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE
@@ -18,7 +18,7 @@ index 40e3377..37c2840 100644
 fi
 
 # Check if a KDE session already is running and whether it's possible to connect to X
-@@ -294,9 +294,9 @@ fi
+@@ -300,9 +300,9 @@ fi
 if $qdbus >/dev/null 2>/dev/null; then
     : # ok
 else
--- a/0003-Remove-export-of-QT_PLUGIN_PATH.patch
+++ b/0003-Remove-export-of-QT_PLUGIN_PATH.patch
@@ -0,0 +1,29 @@
+From dde9b1c1930d333d8daff25c73400e1e67f3c630 Mon Sep 17 00:00:00 2001
+From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
+Date: Sun, 7 Sep 2014 22:55:24 +0200
+Subject: [PATCH 3/3] Remove export of QT_PLUGIN_PATH
+
+---
+ startkde/startkde.cmake | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index 51721d1..1d67be0 100644
+--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
+@@ -220,12 +220,6 @@ for prefix in `echo $scriptpath`; do
+   done
+ done
+ 
+-# Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+-# TODO: Do we really need this?
+-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+-export QT_PLUGIN_PATH
+-
+ # Activate the kde font directories.
+ #
+ # There are 4 directories that may be used for supplying fonts for KDE.
+-- 
+2.1.0
+
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -0,0 +1 @@
+plasma5-workspace-libs 
--- a/create_kdehome.patch
+++ b/create_kdehome.patch
@@ -1,5 +1,5 @@
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 48f7062..434455f 100644
+index 0c658bd..51721d1 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
@@ -64,6 +64,14 @@ fi
--- a/plasma-workspace-5.0.1.tar.xz
+++ b/plasma-workspace-5.0.1.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f7827caa9251ee7662e4099e273ae795c0c16ece4c6e017ce5627be99f72bba
-size 6185064
--- a/plasma-workspace-5.0.95~git20140911.tar.xz
+++ b/plasma-workspace-5.0.95~git20140911.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ac50154db0dc29533e1f7c59c5a683ffebaed879c607dfff7238cea31cc7b0b
+size 4792876
--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@@ -17,17 +17,20 @@


 Name:           plasma5-workspace
-Version:        5.0.1
+Version:        5.0.95~git20140911
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Url:            http://www.kde.org/
-Source0:        plasma-workspace-%{version}.tar.xz
+Source:         plasma-workspace-%{version}.tar.xz
+Source1:        baselibs.conf
 # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch cgiboudeaux@gmx.com -- 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 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins
+Patch2:         0003-Remove-export-of-QT_PLUGIN_PATH.patch
 BuildRequires:  alsa-devel
 BuildRequires:  baloo5-devel >= 5.0.0
 BuildRequires:  kactivities5-devel >= 5.0.0
@@ -108,6 +111,8 @@ Recommends:     kio-extras5
 Recommends:     phonon4qt5-backend
 # people should be able to adjust desktop
 Recommends:     systemsettings5
+# so Qt4-only apps have some colors in tray
+Recommends:     sni-qt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description
@@ -129,10 +134,19 @@ KGlobalAccel allows you to have global accelerators that are independent
 of the focused window. Unlike regular shortcuts, the application's window
 does not need focus for them to be activated.

+%package libs
+Summary:        The KDE Plasma Workspace Components
+Group:          Development/Libraries/KDE
+
+%description libs
+This package contains the basic packages for a K Desktop Environment
+workspace.
+
 %package devel
 Summary:        The KDE Plasma Workspace Components
 Group:          Development/Libraries/KDE
-Requires:       %{name} = %{version}
+Requires:       %{name}-libs = %{version}
+Requires:       drkonqi5 = %{version}
 Conflicts:      kdebase4-workspace-devel
 Provides:       plasma-workspace5-devel = %{version}
 Obsoletes:      plasma-workspace5-devel <= %{version}
@@ -145,6 +159,7 @@ workspace. Development files.
 %setup -q -n plasma-workspace-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1

 %build
  %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF -DKDE_DEFAULT_HOME=.kde4
@@ -161,6 +176,10 @@ workspace. Development files.

 %postun -p /sbin/ldconfig

+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %post -n drkonqi5 -p /sbin/ldconfig

 %postun -n drkonqi5 -p /sbin/ldconfig
@@ -169,6 +188,14 @@ workspace. Development files.

 %postun -n kglobalaccel5 -p /sbin/ldconfig

+%files libs
+%defattr(-,root,root)
+%doc COPYING*
+%{_kf5_libdir}/libkworkspace5.so.*
+%{_kf5_libdir}/libplasma-geolocation-interface.so.*
+%{_kf5_libdir}/libtaskmanager.so.*
+%{_kf5_libdir}/libweather_ion.so.*
+
 %files
 %defattr(-,root,root)
 %doc COPYING*
@@ -183,6 +210,7 @@ workspace. Development files.
 %{_kf5_bindir}/kstartupconfig5
 %{_kf5_bindir}/kuiserver5
 %{_kf5_bindir}/plasmashell
+%{_kf5_bindir}/plasmawindowed
 %{_kf5_bindir}/startkde
 %{_kf5_bindir}/systemmonitor
 %{_kf5_configdir}/autostart/org.kde.klipper.desktop
@@ -199,13 +227,10 @@ workspace. Development files.
 %{_kf5_libdir}/libkdeinit5_klipper.so
 %{_kf5_libdir}/libkdeinit5_ksmserver.so
 %{_kf5_libdir}/libkdeinit5_kuiserver5.so
-%{_kf5_libdir}/libkworkspace.so.*
-%{_kf5_libdir}/libplasma-geolocation-interface.so.*
-%{_kf5_libdir}/libtaskmanager.so.*
-%{_kf5_libdir}/libweather_ion.so.*
 %{_kf5_plugindir}/
 %{_kf5_qmldir}/
 %{_kf5_applicationsdir}/org.kde.klipper.desktop
+%{_kf5_applicationsdir}/plasma-windowed.desktop
 %{_kf5_configkcfgdir}/freespacenotifier.kcfg
 %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service
 %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service
@@ -244,16 +269,16 @@ workspace. Development files.
 %files devel
 %defattr(-,root,root)
 %doc COPYING*
-%{_includedir}/KDE/
-%{_includedir}/kworkspace/
-%{_includedir}/plasma/
-%{_includedir}/taskmanager/
+%{_kf5_prefix}/include/KDE/
+%{_kf5_prefix}/include/kworkspace5/
+%{_kf5_prefix}/include/plasma/
+%{_kf5_prefix}/include/taskmanager/
 %{_kf5_libdir}/cmake/KRunnerAppDBusInterface/
 %{_kf5_libdir}/cmake/KSMServerDBusInterface/
 %{_kf5_libdir}/cmake/LibKWorkspace/
 %{_kf5_libdir}/cmake/LibTaskManager/
 %{_kf5_libdir}/cmake/ScreenSaverDBusInterface/
-%{_kf5_libdir}/libkworkspace.so
+%{_kf5_libdir}/libkworkspace5.so
 %{_kf5_libdir}/libplasma-geolocation-interface.so
 %{_kf5_libdir}/libtaskmanager.so
 %{_kf5_libdir}/libweather_ion.so