Accepting request 327213 from KDE:Frameworks5

Update to 5.4.0

OBS-URL: https://build.opensuse.org/request/show/327213
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2015-09-02 05:53:06 +00:00 committed by Git OBS Bridge
commit 817d38db4c
5 changed files with 60 additions and 59 deletions

View File

@ -1,29 +0,0 @@
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4165a547efc59dd42a15d24f21f722d88e4acfb6fb6d6a4db3c3d0ce54fa54c4
size 6860364

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:102e06f9d8c1f2be18aefe009c8d66fa99a1d986f392474490fe37d4d1f3993f
size 6956048

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon Aug 24 17:53:13 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.4.0:
* For more details please see:
https://www.kde.org/announcements/plasma-5.4.0.php
-------------------------------------------------------------------
Sun Aug 16 10:17:06 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.3.95 aka 5.4 beta:
This release of Plasma brings many nice touches for our users
such as much improved high DPI support, KRunner auto-completion
and many new beautiful Breeze icons. It also lays the ground for
the future with a tech preview of Wayland session available.
We're shipping a few new components such as an Audio Volume
Plasma Widget, monitor calibration tool and the User Manager
tool comes out beta.
* For more details please see:
https://www.kde.org/announcements/plasma-5.3.95.php
- Drop 0003-Remove-export-of-QT_PLUGIN_PATH.patch, upstreamed
-------------------------------------------------------------------
Wed Aug 5 18:30:00 UTC 2015 - hrvoje.senjan@gmail.com
- Added patches from upstream to resolve baloo SiC in 5.13.0:
use-the-filepath-as-the-unique-id-of-the-match.patch and
Baloo-Result-header-is-no-longer-installed.patch
-------------------------------------------------------------------
Sun Jun 28 18:32:31 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -18,7 +18,7 @@
%bcond_without lang
Name: plasma5-workspace
Version: 5.3.2
Version: 5.4.0
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0+
@ -31,43 +31,41 @@ Source99: %{name}-rpmlintrc
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
# PATCHES 100-200 and above are from upstream 5.3 branch
# PATCHES 201-300 and above are from upstream master/5.4 branch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.8.0
BuildRequires: kcmutils-devel >= 5.8.0
BuildRequires: kcoreaddons-devel >= 5.8.0
BuildRequires: kcrash-devel >= 5.8.0
BuildRequires: kdbusaddons-devel >= 5.8.0
BuildRequires: kdeclarative-devel >= 5.8.0
BuildRequires: kdelibs4support-devel >= 5.8.0
BuildRequires: kdesu-devel >= 5.8.0
BuildRequires: kdewebkit-devel >= 5.8.0
BuildRequires: kdoctools-devel >= 5.8.0
BuildRequires: kactivities5-devel >= 5.12.0
BuildRequires: kcmutils-devel >= 5.12.0
BuildRequires: kcoreaddons-devel >= 5.12.0
BuildRequires: kcrash-devel >= 5.12.0
BuildRequires: kdbusaddons-devel >= 5.12.0
BuildRequires: kdeclarative-devel >= 5.12.0
BuildRequires: kdelibs4support-devel >= 5.12.0
BuildRequires: kdesu-devel >= 5.12.0
BuildRequires: kdewebkit-devel >= 5.12.0
BuildRequires: kdoctools-devel >= 5.12.0
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel >= 5.8.0
BuildRequires: kidletime-devel >= 5.8.0
BuildRequires: kjsembed-devel >= 5.8.0
BuildRequires: knewstuff-devel >= 5.8.0
BuildRequires: knotifyconfig-devel >= 5.8.0
BuildRequires: kpackage-devel >= 5.8.0
BuildRequires: krunner-devel >= 5.8.0
BuildRequires: ktexteditor-devel >= 5.8.0
BuildRequires: kwallet-framework-devel >= 5.8.0
BuildRequires: kglobalaccel-devel >= 5.12.0
BuildRequires: kidletime-devel >= 5.12.0
BuildRequires: kjsembed-devel >= 5.12.0
BuildRequires: knewstuff-devel >= 5.12.0
BuildRequires: knotifyconfig-devel >= 5.12.0
BuildRequires: kpackage-devel >= 5.12.0
BuildRequires: krunner-devel >= 5.12.0
BuildRequires: ktexteditor-devel >= 5.12.0
BuildRequires: kwallet-framework-devel >= 5.12.0
BuildRequires: kwayland-devel >= %{version}
BuildRequires: kwin5-devel >= %{version}
BuildRequires: kxmlrpcclient5-devel >= 5.8.0
BuildRequires: libKF5NetworkManagerQt-devel >= 5.8.0
BuildRequires: kxmlrpcclient5-devel >= 5.12.0
BuildRequires: libKF5NetworkManagerQt-devel >= 5.12.0
BuildRequires: libkscreen2-devel >= %{version}
BuildRequires: libksysguard5-devel >= %{version}
BuildRequires: libxcb-devel
BuildRequires: pam-devel
BuildRequires: phonon4qt5-devel
BuildRequires: plasma-framework-devel >= 5.8.0
BuildRequires: solid-devel >= 5.8.0
BuildRequires: plasma-framework-devel >= 5.12.0
BuildRequires: solid-devel >= 5.12.0
BuildRequires: update-desktop-files
BuildRequires: wayland-devel >= 1.3.0
BuildRequires: xz
@ -189,7 +187,6 @@ 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 -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5
@ -234,6 +231,7 @@ workspace. Development files.
%{_kf5_bindir}/plasmashell
%{_kf5_bindir}/plasmawindowed
%{_kf5_bindir}/startkde
%{_kf5_bindir}/startplasmacompositor
%{_kf5_bindir}/systemmonitor
%{_kf5_configdir}/autostart/org.kde.klipper.desktop
%{_kf5_configdir}/autostart/plasmashell.desktop
@ -245,6 +243,7 @@ workspace. Development files.
%{_kf5_libdir}/libexec/kcheckpass
%{_kf5_libdir}/libexec/kscreenlocker_greet
%{_kf5_libdir}/libexec/ksyncdbusenv
%{_kf5_libdir}/libexec/startplasma
%{_kf5_libdir}/libkdeinit5_kcminit.so
%{_kf5_libdir}/libkdeinit5_kcminit_startup.so
%{_kf5_libdir}/libkdeinit5_klipper.so
@ -261,6 +260,7 @@ workspace. Development files.
%dir %{_kf5_htmldir}/en
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/klipper/
%doc %{_kf5_htmldir}/en/kcontrol/
%{_kf5_notifydir}/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
@ -271,6 +271,7 @@ workspace. Development files.
%{_kf5_plasmadir}/
%{_kf5_sharedir}/solid/
%{_kf5_sharedir}/sddm/
%{_kf5_sharedir}/kio_desktop/
%files -n drkonqi5
%defattr(-,root,root)