dvratil pushed to plasma-desktop (copr). "5.2.1-5 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 10:59:48 UTC 2015
>From 90eb89798cd6583c50b89bda0fc9d5aa6ff46f21 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 9 Mar 2015 10:56:27 -0500
Subject: 5.2.1-5
- .spec cleanup
- pull in upstream fixes, particularly...
- Top level "tabs" disappears in Kickoff (kde#343524)
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
new file mode 100644
index 0000000..e300eff
--- /dev/null
+++ b/0004-Fix-the-no-checkbox-being-checked-for-displayText-co.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..a4c5cde
--- /dev/null
+++ b/0006-Fix-Bug-266760-The-autostart-kcm-doesn-t-show-the-co.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 0000000..2fb5d2a
--- /dev/null
+++ b/0007-Fix-double-click.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 0000000..85a0abd
--- /dev/null
+++ b/0008-Fix-tabbar-not-showing-up-when-switching-to-favorite.patch
@@ -0,0 +1,44 @@
+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 c74b209..8813df5 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
Name: plasma-desktop
Version: 5.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Plasma Desktop shell
License: GPLv2+ and (GPLv2 or GPLv3)
@@ -14,6 +14,12 @@ 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
+
BuildRequires: libusb-devel
BuildRequires: fontconfig-devel
BuildRequires: libX11-devel
@@ -102,34 +108,37 @@ Obsoletes: kde-runtime-docs < 1:14.12.3-2
%prep
-%setup -q -n %{name}-%{version}
-
-%build
+%autosetup -p1
# Workaround broken path in Dbus service file (until fixed upstream)
sed -i "s/@CMAKE_INSTALL_PREFIX@\///" kcms/kfontinst/dbus/org.kde.fontinst.service.cmake
-mkdir -p %{_target_platform}
+
+%build
+
+mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
+
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang plasmadesktop5 --with-qt --all-name
# No -devel
-rm %{buildroot}/%{_libdir}/libkfontinst{,ui}.so
+rm -fv %{buildroot}%{_libdir}/libkfontinst{,ui}.so
# KDM is dead
-rm -r %{buildroot}/%{_datadir}/kdm
+rm -rv %{buildroot}%{_datadir}/kdm
# Copy konqsidebartng to kde4/apps so that KDE Konqueror can find it
-mkdir -p %{buildroot}/%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/
-cp %{buildroot}/%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop \
- %{buildroot}/%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services
+mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/
+cp %{buildroot}%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop \
+ %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services
+
%check
desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,knetattach}.desktop
@@ -165,6 +174,7 @@ fi
%{_qt5_prefix}/qml/org/kde/plasma/private
%{_kf5_libdir}/libkdeinit5_kaccess.so
%{_kf5_libdir}/kconf_update_bin/*
+# TODO: -libs subpkg -- rex
%{_libdir}/libkfontinst.so.*
%{_libdir}/libkfontinstui.so.*
%{_kf5_qtplugindir}/*.so
@@ -210,6 +220,11 @@ fi
%changelog
+* Mon Mar 09 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.2.1-5
+- .spec cleanup
+- pull in upstream fixes, particularly...
+- Top level "tabs" disappears in Kickoff (kde#343524)
+
* Sat Mar 07 2015 Rex Dieter <rdieter at fedoraproject.org> - 5.2.1-4
- -doc: Obsoletes: kde-runtime-docs (#1199720)
- %%find_lang: drop --with-kde, we want handbooks in -doc instead
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/plasma-desktop.git/commit/?h=copr&id=90eb89798cd6583c50b89bda0fc9d5aa6ff46f21
More information about the scm-commits
mailing list