diff --git a/plasma-desktop-5.4.0-default_favorites_f22.patch b/plasma-desktop-5.4.0-default_favorites_f22.patch new file mode 100644 index 0000000..61fe49f --- /dev/null +++ b/plasma-desktop-5.4.0-default_favorites_f22.patch @@ -0,0 +1,21 @@ +diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp +index ce49939..cbfa456 100644 +--- a/applets/kickoff/core/favoritesmodel.cpp ++++ b/applets/kickoff/core/favoritesmodel.cpp +@@ -133,12 +133,14 @@ public: + // Application releases (i.e. find one that is installed regardless of + // whether it uses the current or a previous name). + // BUG: 351550 +- applications << browser ++ applications << "konqbrowser" + << "org.kde.kontact" << "kontact" + << "org.kde.systemsettings" << "systemsettings" + << "org.kde.dolphin" << "dolphin" + << "org.kde.ktpcontactlist" << "ktp-contactlist" +- << "org.kde.kate" << "kate"; ++ << "org.kde.kate" << "kate" ++ << "org.kde.konsole" ++ << "apper"; + + QList desktopFiles; + diff --git a/plasma-desktop.spec b/plasma-desktop.spec index d05b2de..b19739f 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -3,7 +3,7 @@ Name: plasma-desktop Version: 5.4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -18,21 +18,20 @@ URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz ## downstream patches -# adjust default kickoff favorites: -preferred_browser(buggy) +konqueror +konsole +apper +# default kickoff favorites: -preferred_browser(buggy) +firefox +konsole +apper Patch100: plasma-desktop-5.4.0-default_favorites.patch -# FIXME: make upstreamable, fix dup'd PREFIX KAUTH_HELPER_INSTALL_DIR when using absolute paths +# default kickoff favorites: -preferred_browser(buggy) +konqbrowser +konsole +apper +Patch101: plasma-desktop-5.4.0-default_favorites.patch # Default to Folder containment (rather than Desktop) Patch102: plasma-desktop-fedora_layout.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1250238 +# http://bugs.kde.org/show_bug.cgi?id=348678 +Patch103: plasma-desktop-C_locale.patch ## upstream patches # master branch ## upstreamable patches -%if 0%{?fedora} < 24 -# https://bugzilla.redhat.com/show_bug.cgi?id=1250238 -# http://bugs.kde.org/show_bug.cgi?id=348678 -Patch200: plasma-desktop-C_locale.patch -%endif BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -155,7 +154,17 @@ BuildArch: noarch %prep -%autosetup -p1 +%setup -q + +%if 0%{?fedora} > 22 +%patch100 -p1 -b .default_favorites +%else +%patch101 -p1 -b .default_favorites_f22 +%endif +%patch102 -p1 -b .fedora_layout +%if 0%{?fedora} < 24 +%patch103 -p1 -b .C_locale +%endif %build @@ -292,6 +301,9 @@ fi %changelog +* Mon Sep 21 2015 Rex Dieter 5.4.1-5 +- restore f22 default favorites + * Fri Sep 18 2015 Rex Dieter 5.4.1-4 - conditionally apply C.UTF-8 workaround only for < f24 (#1250238)