dvratil pushed to plasma-desktop (copr). "Drop upstream patches, install all docbooks"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 11:00:10 UTC 2015
>From 025285c750b97cb1fea5093d43d217c71e2284fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Mon, 23 Mar 2015 14:47:33 +0100
Subject: Drop upstream patches, install all docbooks
diff --git a/0004-Fix-the-no-checkbox-being-checked-for-displayText-co.patch b/0004-Fix-the-no-checkbox-being-checked-for-displayText-co.patch
deleted file mode 100644
index e300eff..0000000
--- a/0004-Fix-the-no-checkbox-being-checked-for-displayText-co.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c50e4b987dc365d741880794ee6f2924065a87a6 Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94 at gmail.com>
-Date: Mon, 2 Mar 2015 08:50:29 +0530
-Subject: [PATCH 4/8] Fix the no checkbox being checked for displayText config
-
-BUG: 344711
-FIXED-IN: Plasma/5.2
----
- applets/pager/package/contents/ui/configGeneral.qml | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/applets/pager/package/contents/ui/configGeneral.qml b/applets/pager/package/contents/ui/configGeneral.qml
-index 1915b76..1004c8e 100644
---- a/applets/pager/package/contents/ui/configGeneral.qml
-+++ b/applets/pager/package/contents/ui/configGeneral.qml
-@@ -66,7 +66,10 @@ Item {
- }
- }
-
-- Component.onCompleted: cfg_currentDesktopSelectedChanged()
-+ Component.onCompleted: {
-+ cfg_currentDesktopSelectedChanged();
-+ cfg_displayedTextChanged();
-+ }
-
- QtControls.ExclusiveGroup {
- id: displayedTextGroup
---
-1.9.3
-
diff --git a/0006-Fix-Bug-266760-The-autostart-kcm-doesn-t-show-the-co.patch b/0006-Fix-Bug-266760-The-autostart-kcm-doesn-t-show-the-co.patch
deleted file mode 100644
index a4c5cde..0000000
--- a/0006-Fix-Bug-266760-The-autostart-kcm-doesn-t-show-the-co.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ecbefe504d792aa5700451e8987ec05fdae2bf1d Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel at kde.org>
-Date: Sat, 7 Mar 2015 15:20:34 +0100
-Subject: [PATCH 6/8] Fix Bug 266760 - The autostart kcm doesn't show the
- correct name immediately after "adding program"
-
-FIXED-IN: Plasma-5.2.1
-BUG: 266760
----
- kcms/autostart/autostart.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/autostart/autostart.cpp b/kcms/autostart/autostart.cpp
-index e948087..fd41fc8 100644
---- a/kcms/autostart/autostart.cpp
-+++ b/kcms/autostart/autostart.cpp
-@@ -302,8 +302,9 @@ void Autostart::slotAddProgram()
- if ( dlg.exec() != QDialog::Accepted )
- return;
- }
-+ KDesktopFile newConf(desktopTemplate.path());
- DesktopStartItem * item = new DesktopStartItem( desktopPath, m_programItem,this );
-- addItem( item, service->name(), m_pathName[0], service->exec() , false);
-+ addItem( item, service->name(), m_pathName[0], newConf.desktopGroup().readEntry("Exec") , false);
- }
-
- void Autostart::slotAddScript()
---
-1.9.3
-
diff --git a/0007-Fix-double-click.patch b/0007-Fix-double-click.patch
deleted file mode 100644
index 2fb5d2a..0000000
--- a/0007-Fix-double-click.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 429d1bb6bfb32c4a4ad3e9e682513ab2625c823c Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel at kde.org>
-Date: Sun, 8 Mar 2015 09:09:01 +0100
-Subject: [PATCH 7/8] Fix double click
-
----
- kcms/autostart/autostart.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/kcms/autostart/autostart.cpp b/kcms/autostart/autostart.cpp
-index fd41fc8..b102323 100644
---- a/kcms/autostart/autostart.cpp
-+++ b/kcms/autostart/autostart.cpp
-@@ -353,14 +353,14 @@ void Autostart::slotRemoveCMD()
-
- void Autostart::slotEditCMD(QTreeWidgetItem* ent)
- {
-+
- if (!ent) return;
-- AutoStartItem *entry = dynamic_cast<AutoStartItem*>( ent );
-- if ( entry )
-+ DesktopStartItem *desktopEntry = dynamic_cast<DesktopStartItem*>( ent );
-+ if ( desktopEntry )
- {
-- const KFileItem kfi = KFileItem( KFileItem::Unknown, KFileItem::Unknown, QUrl( entry->fileName() ), true );
-+ const KFileItem kfi = KFileItem( KFileItem::Unknown, KFileItem::Unknown, QUrl( desktopEntry->fileName() ), true );
- if (! slotEditCMD( kfi ))
- return;
-- DesktopStartItem *desktopEntry = dynamic_cast<DesktopStartItem*>( entry );
- if (desktopEntry) {
- KService service(desktopEntry->fileName().path());
- addItem( desktopEntry, service.name(), m_pathName.value(m_paths.indexOf(desktopEntry->fileName().adjusted(QUrl::RemoveFilename).toString())), service.exec(),false );
---
-1.9.3
-
diff --git a/0008-Fix-tabbar-not-showing-up-when-switching-to-favorite.patch b/0008-Fix-tabbar-not-showing-up-when-switching-to-favorite.patch
deleted file mode 100644
index 85a0abd..0000000
--- a/0008-Fix-tabbar-not-showing-up-when-switching-to-favorite.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 336094f43d82d83f374116862a0f568fe9092224 Mon Sep 17 00:00:00 2001
-From: Bhushan Shah <bhush94 at gmail.com>
-Date: Mon, 9 Mar 2015 21:04:09 +0530
-Subject: [PATCH 8/8] Fix tabbar not showing up when switching to favorites
- from search
-
-when we are in search view tabbar is not visible and immediatly
-switching to favorites causes no tabbar.
-
-BUG: 343524
-FIXED-IN: 5.2.2
----
- applets/kickoff/package/contents/ui/FullRepresentation.qml | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/applets/kickoff/package/contents/ui/FullRepresentation.qml b/applets/kickoff/package/contents/ui/FullRepresentation.qml
-index d978987..0ba18e6 100644
---- a/applets/kickoff/package/contents/ui/FullRepresentation.qml
-+++ b/applets/kickoff/package/contents/ui/FullRepresentation.qml
-@@ -493,6 +493,10 @@ Item {
- target: root
- Keys.forwardTo: [tabBar.layout]
- }
-+ PropertyChanges {
-+ target: tabBar
-+ visible: true
-+ }
- },
- State {
- name: "Applications"
-@@ -500,6 +504,10 @@ Item {
- target: root
- Keys.forwardTo: [root]
- }
-+ PropertyChanges {
-+ target: tabBar
-+ visible: true
-+ }
- },
- State {
- name: "Search"
---
-1.9.3
-
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 67c521b..cf08c0a 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -14,12 +14,6 @@ URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop
%endif
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
-## upstream patches
-Patch4: 0004-Fix-the-no-checkbox-being-checked-for-displayText-co.patch
-Patch6: 0006-Fix-Bug-266760-The-autostart-kcm-doesn-t-show-the-co.patch
-Patch7: 0007-Fix-double-click.patch
-Patch8: 0008-Fix-tabbar-not-showing-up-when-switching-to-favorite.patch
-
## downstream patches
# adjust default kickoff favorites: +konsole +apper
Patch100: plasma-desktop-5.2.1-default_favorites.patch
@@ -217,10 +211,10 @@ fi
%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
%files doc
-%{_docdir}/HTML/en/kcontrol
-%{_docdir}/HTML/en/kfontview
-%{_docdir}/HTML/en/knetattach
-%{_docdir}/HTML/en/plasma-desktop
+%{_docdir}/HTML/*/kcontrol
+%{_docdir}/HTML/*/kfontview
+%{_docdir}/HTML/*/knetattach
+%{_docdir}/HTML/*/plasma-desktop
%changelog
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=copr&id=025285c750b97cb1fea5093d43d217c71e2284fe
More information about the scm-commits
mailing list