diff --git a/0001-Fix-favorites-scripting-in-Kickoff.patch b/0001-Fix-favorites-scripting-in-Kickoff.patch new file mode 100644 index 0000000..50b7df1 --- /dev/null +++ b/0001-Fix-favorites-scripting-in-Kickoff.patch @@ -0,0 +1,25 @@ +From 456100e0f9770534f1bfbb79183f598733936961 Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Wed, 6 Jan 2016 20:05:59 +0100 +Subject: [PATCH 1/4] Fix favorites scripting in Kickoff. + +--- + applets/kickoff/package/contents/ui/Kickoff.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/applets/kickoff/package/contents/ui/Kickoff.qml b/applets/kickoff/package/contents/ui/Kickoff.qml +index 8a8c9c5..573804c 100644 +--- a/applets/kickoff/package/contents/ui/Kickoff.qml ++++ b/applets/kickoff/package/contents/ui/Kickoff.qml +@@ -70,7 +70,7 @@ Item { + Connections { + target: plasmoid.configuration + +- onFavoriteAppsChanged: { ++ onFavoritesChanged: { + globalFavorites.favorites = plasmoid.configuration.favorites; + } + } +-- +2.5.0 + diff --git a/0002-Fix-inconsistent-margins-add-missing-listview-margin.patch b/0002-Fix-inconsistent-margins-add-missing-listview-margin.patch new file mode 100644 index 0000000..a8b27cd --- /dev/null +++ b/0002-Fix-inconsistent-margins-add-missing-listview-margin.patch @@ -0,0 +1,63 @@ +From aa99711fe71235ba6a1e4431c43d690673457e26 Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Wed, 6 Jan 2016 20:38:12 +0100 +Subject: [PATCH 2/4] Fix inconsistent margins, add missing listview margin, + drop non-scalable measurements. + +--- + desktoppackage/contents/explorer/WidgetExplorer.qml | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml +index 94cc46b..b7fc76f 100644 +--- a/desktoppackage/contents/explorer/WidgetExplorer.qml ++++ b/desktoppackage/contents/explorer/WidgetExplorer.qml +@@ -33,7 +33,7 @@ import org.kde.plasma.private.shell 2.0 + Item { + id: main + +- width: Math.max(heading.paintedWidth, units.iconSizes.enormous * 2 + units.smallSpacing * 4 + 20) ++ width: Math.max(heading.paintedWidth, units.iconSizes.enormous * 2 + units.smallSpacing * 4 + units.gridUnit * 2) + height: 800//Screen.height + + property QtObject containment +@@ -197,9 +197,6 @@ Item { + top: parent.top + left: parent.left + right: parent.right +- topMargin: 0 +- leftMargin: units.smallSpacing +- rightMargin: units.smallSpacing + } + columns: 2 + +@@ -260,7 +257,6 @@ Item { + right: parent.right + bottom: bottomBar.top + topMargin: units.smallSpacing +- leftMargin: units.smallSpacing + bottomMargin: units.smallSpacing + } + +@@ -280,7 +276,7 @@ Item { + + activeFocusOnTab: true + keyNavigationWraps: true +- cellWidth: width / 2 ++ cellWidth: (width - units.smallSpacing) / 2 + cellHeight: cellWidth + units.gridUnit * 4 + units.smallSpacing * 2 + + delegate: AppletDelegate {} +@@ -329,9 +325,6 @@ Item { + left: parent.left + right: parent.right + bottom: parent.bottom +- leftMargin: units.smallSpacing +- rightMargin: units.smallSpacing +- bottomMargin: units.smallSpacing + } + + spacing: units.smallSpacing +-- +2.5.0 + diff --git a/0003-Add-missing-appletInterface-prop.patch b/0003-Add-missing-appletInterface-prop.patch new file mode 100644 index 0000000..e896461 --- /dev/null +++ b/0003-Add-missing-appletInterface-prop.patch @@ -0,0 +1,99 @@ +From 12a64ed82308b9a368d42f641fb23da8b18c3000 Mon Sep 17 00:00:00 2001 +From: Eike Hein +Date: Sat, 9 Jan 2016 01:56:26 +0100 +Subject: [PATCH 3/4] Add missing appletInterface prop. + +BUG:357638 +--- + applets/kicker/plugin/computermodel.cpp | 15 +++++++++++++++ + applets/kicker/plugin/computermodel.h | 6 ++++++ + applets/kickoff/package/contents/ui/ComputerView.qml | 2 ++ + 3 files changed, 23 insertions(+) + +diff --git a/applets/kicker/plugin/computermodel.cpp b/applets/kicker/plugin/computermodel.cpp +index ffbe6d0..cff2928 100644 +--- a/applets/kicker/plugin/computermodel.cpp ++++ b/applets/kicker/plugin/computermodel.cpp +@@ -140,6 +140,7 @@ ComputerModel::ComputerModel(QObject *parent) : ForwardingModel(parent) + , m_systemAppsModel(new FavoritesModel(this)) + , m_filteredPlacesModel(new FilteredPlacesModel(this)) + , m_appNameFormat(AppEntry::NameOnly) ++, m_appletInterface(nullptr) + { + connect(m_systemAppsModel, &FavoritesModel::favoritesChanged, this, &ComputerModel::systemApplicationsChanged); + m_systemAppsModel->setFavorites(QStringList() << "systemsettings.desktop"); +@@ -176,6 +177,20 @@ void ComputerModel::setAppNameFormat(int format) + } + } + ++QObject *ComputerModel::appletInterface() const ++{ ++ return m_appletInterface; ++} ++ ++void ComputerModel::setAppletInterface(QObject *appletInterface) ++{ ++ if (m_appletInterface != appletInterface) { ++ m_appletInterface = appletInterface; ++ ++ emit appletInterfaceChanged(); ++ } ++} ++ + QStringList ComputerModel::systemApplications() const + { + return m_systemAppsModel->favorites(); +diff --git a/applets/kicker/plugin/computermodel.h b/applets/kicker/plugin/computermodel.h +index bd811a2..ba82d7a 100644 +--- a/applets/kicker/plugin/computermodel.h ++++ b/applets/kicker/plugin/computermodel.h +@@ -75,6 +75,7 @@ class ComputerModel : public ForwardingModel + Q_OBJECT + + Q_PROPERTY(int appNameFormat READ appNameFormat WRITE setAppNameFormat NOTIFY appNameFormatChanged) ++ Q_PROPERTY(QObject* appletInterface READ appletInterface WRITE setAppletInterface NOTIFY appletInterfaceChanged) + Q_PROPERTY(QStringList systemApplications READ systemApplications WRITE setSystemApplications NOTIFY systemApplicationsChanged) + + public: +@@ -86,6 +87,9 @@ class ComputerModel : public ForwardingModel + int appNameFormat() const; + void setAppNameFormat(int format); + ++ QObject *appletInterface() const; ++ void setAppletInterface(QObject *appletInterface); ++ + QStringList systemApplications() const; + void setSystemApplications(const QStringList &apps); + +@@ -95,6 +99,7 @@ class ComputerModel : public ForwardingModel + + Q_SIGNALS: + void appNameFormatChanged() const; ++ void appletInterfaceChanged() const; + void systemApplicationsChanged() const; + + private Q_SLOTS: +@@ -106,6 +111,7 @@ class ComputerModel : public ForwardingModel + FavoritesModel *m_systemAppsModel; + FilteredPlacesModel *m_filteredPlacesModel; + AppEntry::NameFormat m_appNameFormat; ++ QObject *m_appletInterface; + }; + + #endif +diff --git a/applets/kickoff/package/contents/ui/ComputerView.qml b/applets/kickoff/package/contents/ui/ComputerView.qml +index bfdc5f8..0cb189d 100644 +--- a/applets/kickoff/package/contents/ui/ComputerView.qml ++++ b/applets/kickoff/package/contents/ui/ComputerView.qml +@@ -28,6 +28,8 @@ BaseView { + + appNameFormat: rootModel.appNameFormat + ++ appletInterface: plasmoid ++ + favoritesModel: globalFavorites + + Component.onCompleted: { +-- +2.5.0 + diff --git a/plasma-desktop.spec b/plasma-desktop.spec index a6a8d40..fc2ee57 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -4,7 +4,7 @@ Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.5.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://projects.kde.org/plasma-desktop @@ -28,6 +28,9 @@ Patch101: plasma-desktop-5.4.0-default_favorites_f22.patch Patch102: plasma-desktop-fedora_layout.patch ## upstream patches +Patch1: 0001-Fix-favorites-scripting-in-Kickoff.patch +Patch2: 0002-Fix-inconsistent-margins-add-missing-listview-margin.patch +Patch3: 0003-Add-missing-appletInterface-prop.patch ## upstreamable patches #https://bugs.kde.org/show_bug.cgi?id=336089#c43 @@ -54,7 +57,7 @@ BuildRequires: phonon-qt5-devel # PackageKit-Qt 5 is not avaialble on F20, because PackageKit is too old there %if 0%{?fedora} >= 21 BuildRequires: PackageKit-Qt5-devel -Recommends: muon-discover +Recommends: muon-discover >= %{majmin_ver} %endif BuildRequires: kf5-rpm-macros @@ -98,6 +101,9 @@ BuildRequires: desktop-file-utils %ifnarch s390 s390x # for kcm_touchpad BuildRequires: xorg-x11-drv-synaptics-devel +# KCM touchpad has been merged to plasma-desktop in 5.3 +Provides: kcm_touchpad = %{version}-%{release} +Obsoletes: kcm_touchpad < 5.3.0 # for xserver-properties BuildRequires: xorg-x11-server-devel Requires: kf5-kded @@ -106,10 +112,8 @@ Requires: kf5-kded Requires: iso-codes # for kcm_input -%if 0%{?fedora} > 20 BuildRequires: xorg-x11-drv-evdev-devel %endif -%endif # Desktop Requires: plasma-workspace >= %{majmin_ver} @@ -131,13 +135,6 @@ Requires: kwin >= %{majmin_ver} # kickoff -> edit applications (#1229393) Requires: kmenuedit >= %{majmin_ver} -# kickoff -> uninstall feature -Recommends: muon-discover >= %{majmin_ver} - -# KCM touchpad has been merged to plasma-desktop in 5.3 -Provides: kcm_touchpad = %{version}-%{release} -Obsoletes: kcm_touchpad < 5.3.0 - # Virtual provides for plasma-workspace Provides: plasmashell(desktop) = %{version}-%{release} Provides: plasmashell = %{version}-%{release} @@ -164,6 +161,12 @@ BuildArch: noarch %prep %setup -q +# upstream patches +%patch1 -p1 -b .0001 +%patch2 -p1 -b .0002 +%patch3 -p1 -b .0003 + +# upstreamable patches %patch50 -p1 -b .font_preview %if 0%{?fedora} > 22 @@ -228,11 +231,6 @@ fi %files -f plasmadesktop5.lang %license COPYING* -%ifnarch s390 s390x -%if 0%{?fedora} > 20 -%{_bindir}/kapplymousetheme -%endif -%endif %{_bindir}/kaccess %{_bindir}/kfontinst %{_bindir}/kfontview @@ -258,8 +256,15 @@ fi %{_kf5_qmldir}/org/kde/private/desktopcontainment/* %{_kf5_datadir}/plasma/* %ifnarch s390 s390x -%if 0%{?fedora} > 20 +%{_bindir}/kapplymousetheme %{_kf5_datadir}/kcminput +# touchpad +%{_kf5_datadir}/kservices5/kded/touchpad.desktop +%{_bindir}/kcm-touchpad-list-devices +%{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_touchpad.so +%{_datadir}/config.kcfg/touchpad.kcfg +%{_datadir}/config.kcfg/touchpaddaemon.kcfg +%{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml %endif %endif %{_kf5_datadir}/color-schemes @@ -282,10 +287,6 @@ fi %{_kf5_datadir}/kservices5/*.desktop %{_kf5_datadir}/kservices5/ServiceMenus/installfont.desktop %{_kf5_datadir}/kservices5/fonts.protocol -# exclude touchpad for s390/s390x -%ifnarch s390 s390x -%{_kf5_datadir}/kservices5/kded/*.desktop -%endif %{_kf5_datadir}/kservicetypes5/*.desktop %{_kf5_datadir}/kxmlgui5/kfontview %{_kf5_datadir}/kxmlgui5/kfontinst @@ -296,14 +297,6 @@ fi %{_datadir}/dbus-1/system-services/*.service %{_datadir}/polkit-1/actions/org.kde.fontinst.policy %{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy -%ifnarch s390 s390x -# kcm_touchpad -%{_bindir}/kcm-touchpad-list-devices -%{_kf5_qtplugindir}/plasma/dataengine/plasma_engine_touchpad.so -%{_datadir}/config.kcfg/touchpad.kcfg -%{_datadir}/config.kcfg/touchpaddaemon.kcfg -%{_datadir}/dbus-1/interfaces/org.kde.touchpad.xml -%endif %files doc %lang(ca) %{_docdir}/HTML/ca/kcontrol/ @@ -323,6 +316,9 @@ fi %changelog +* Sat Jan 09 2016 Rex Dieter 5.5.3-3 +- pull in some upstream patches, simplify/consolidate s390 blocks + * Sat Jan 09 2016 Rex Dieter 5.5.3-2 - Fix font preview (#1208229, kde#336089)