pull in upstream fixes, update URL

epel9
Rex Dieter 8 years ago
parent 9707ea265b
commit 974cfb1897

6
.gitignore vendored

@ -9,3 +9,9 @@
/plasma-desktop-5.8.6.tar.xz
/plasma-desktop-5.9.3.tar.xz
/plasma-desktop-5.9.4.tar.xz
/0001-Add-missing-member-initialization.patch
/0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch
/0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch
/0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch
/0005-Applet-Alternatives-Fix-icon-size.patch
/0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch

@ -1,12 +0,0 @@
diff -up plasma-desktop-5.8.5/imports/activitymanager/sortedactivitiesmodel.cpp.than plasma-desktop-5.8.5/imports/activitymanager/sortedactivitiesmodel.cpp
--- plasma-desktop-5.8.5/imports/activitymanager/sortedactivitiesmodel.cpp.than 2017-02-13 11:05:27.199853397 -0500
+++ plasma-desktop-5.8.5/imports/activitymanager/sortedactivitiesmodel.cpp 2017-02-13 11:36:19.952794792 -0500
@@ -17,6 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include <functional>
+
// Self
#include "sortedactivitiesmodel.h"

@ -4,10 +4,10 @@
Name: plasma-desktop
Summary: Plasma Desktop shell
Version: 5.9.4
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and (GPLv2 or GPLv3)
URL: https://quickgit.kde.org/?p=%{name}.git
URL: https://cgit.kde.org/%{name}.git
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
@ -24,10 +24,14 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.
Patch100: plasma-desktop-5.8-default_favorites.patch
## upstream patches
Patch1: 0001-Add-missing-member-initialization.patch
Patch2: 0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch
Patch3: 0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch
Patch4: 0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch
Patch5: 0005-Applet-Alternatives-Fix-icon-size.patch
Patch6: 0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch
## upstreamable patches
# fix error: 'placeholders' is not a namespace-name with gcc-7
Patch400: plasma-desktop-5.8.5-gcc7-placeholder.patch
# filter qmk/plugins provides
%global __provides_exclude_from ^(%{_kf5_qmldir}/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$
@ -173,9 +177,14 @@ BuildArch: noarch
%patch100 -p1
## upstream patches
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
## upstreamable patches
%patch400 -p1
%build
%ifarch s390 %{arm}
@ -330,6 +339,9 @@ fi
%changelog
* Fri Apr 14 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-2
- pull in upstream fixes, update URL
* Thu Mar 23 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
- 5.9.4

@ -1 +1,7 @@
SHA512 (plasma-desktop-5.9.4.tar.xz) = 07a5966d45d4d8ea791161958f04d8f69ae5c0545ec0df9175498d669966df6bd7597532411b5574ddd159757b34f0870d1c263704958459e7d60d69e0b8d7f1
SHA512 (0001-Add-missing-member-initialization.patch) = 5d5575142552fe885672cd071dafd928fc4fb64561633ff59df2dac900641c1e627ed0edbc22f9898672f1360ac0047443a41d4a376c588afe63af41d0fd01a5
SHA512 (0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch) = 944fd8a69dcee0c5334240f759cac0ac5e2a7b368a43ba47e6b661299d52aa9e26ed0a2b317b0debbe78f6a2be007ae5d651d677437e9eea909eb41c61f3172b
SHA512 (0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch) = 10c3b4b1205dfc2d039e06831a3a722a3b637142f4a97f6e2c5902da4f82543fe18248901e2fc61ca642e3e1ab6409a93ee4d17d30418a3b9f7989425a169690
SHA512 (0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch) = 4e75b6218c354675dc0d7489cf049e789f74431855d859084207850e16c55582e3161474707848b1682c346b9c60827757dd0d6d1e3e1b014150d055d0bd272b
SHA512 (0005-Applet-Alternatives-Fix-icon-size.patch) = 8dffb1b7b50cd16024bf25b8614cbbb32a52a36f56568c6d7ce9dd87d88a5a04f3e77d83a4b79feee32f012ff819c22b0b3178f94e175edfb44740745ba9e72c
SHA512 (0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch) = 3d925e6e6a9f75e323af74a769d2bec47f2de46029b7a6764f90dff65f4cf7a6865c78cfc7f349c82dbc9a7fd59f9c43db0f89d5eb695e962848ff2a1c0a83b5

Loading…
Cancel
Save