diff --git a/.gitignore b/.gitignore index 78adb60..ffb3db6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /plasma-desktop-5.3.1.tar.xz /plasma-desktop-5.3.2.tar.xz +/plasma-desktop-5.4.0.tar.xz diff --git a/0001-Fix-touchpad-backend-initialization.patch b/0001-Fix-touchpad-backend-initialization.patch deleted file mode 100644 index 401a28d..0000000 --- a/0001-Fix-touchpad-backend-initialization.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 3f2e6bd31e0cd7355f95450cdc185e4d37ed2c16 Mon Sep 17 00:00:00 2001 -From: Rajeesh K Nambiar -Date: Sat, 27 Jun 2015 13:58:17 +0200 -Subject: [PATCH] Fix touchpad backend initialization. - -Libinput driver, even when unistalled was leaving 'Libinput Tapping -Enabled' atom active (xlsatoms | grep -i tap). Mutter/Clutter/Gtk+ were -causing this, as noted in https://bugzilla.redhat.com/show_bug.cgi? -id=1199825. This caused the non-existent libinput backend initialization -resulting in 'No touchpad found' error even when synaptics driver was -installed. -Fix this by checking backend instantiation errors. - -BUG: 344958,349214 -REVIEW: 124172 -FIXED-IN: 5.4.0 ---- - kcms/touchpad/src/backends/x11/xlibbackend.cpp | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/kcms/touchpad/src/backends/x11/xlibbackend.cpp b/kcms/touchpad/src/backends/x11/xlibbackend.cpp -index 2acb162..b55a45f 100644 ---- a/kcms/touchpad/src/backends/x11/xlibbackend.cpp -+++ b/kcms/touchpad/src/backends/x11/xlibbackend.cpp -@@ -151,8 +151,10 @@ XlibSynapticsBackend::XlibSynapticsBackend(QObject *parent) : - XlibBackend(parent) - { - m_capsAtom.intern(m_connection, SYNAPTICS_PROP_CAPABILITIES); -- if (!m_capsAtom.atom()) -+ if (!m_capsAtom.atom()) { -+ m_errorString = i18nc("Synaptics touchpad driver","Synaptics backend not found"); - return; -+ } - - m_device = findTouchpad(m_capsAtom); - if (m_device == XIAllDevices) { -@@ -275,8 +277,10 @@ XlibLibinputBackend::XlibLibinputBackend(QObject *parent) : - "libinput Tapping Enabled", - true); - -- if (!identifier.atom()) -+ if (!identifier.atom()) { -+ m_errorString = i18nc("Libinput touchpad driver","Libinput backend not found"); - return; -+ } - - m_device = findTouchpad(identifier); - if (m_device == XIAllDevices) { -@@ -318,15 +322,17 @@ XlibLibinputBackend::XlibLibinputBackend(QObject *parent) : - - XlibBackend* XlibBackend::initialize(QObject *parent) - { -+ XlibBackend* backend = nullptr; - QScopedPointer display(XOpenDisplay(0)); - xcb_connection_t *connection = XGetXCBConnection(display.data()); - XcbAtom synaptics_prop_capablities, libinput_prop_tapping; - -- libinput_prop_tapping.intern(connection, "libinput Tapping Enabled"); -- if (libinput_prop_tapping.atom()) -- return new XlibLibinputBackend(parent); -- else -- return new XlibSynapticsBackend(parent); -+ backend = new XlibLibinputBackend(parent); -+ if (! backend->errorString().isNull()) { -+ delete backend; -+ backend = new XlibSynapticsBackend(parent); -+ } -+ return backend; - } - - XlibBackend::~XlibBackend() --- -2.4.3 - diff --git a/do_not_reset_shortcut_for_changing_layout.patch b/do_not_reset_shortcut_for_changing_layout.patch deleted file mode 100644 index a4ccd71..0000000 --- a/do_not_reset_shortcut_for_changing_layout.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d5d809aa349a72a4c6fa7c031c4cfe6938ea3eaa Mon Sep 17 00:00:00 2001 -From: Ivan Romanov -Date: Sun, 5 Jul 2015 00:46:16 +0500 -Subject: [PATCH] keyboard: do not reset shortcut for changing layout - -With KGlobalAccel::NoAutoloading after restarting plasma -Ctrl-Alt-K always is set to 'Switch to Next Keyboard Layout' ---- - kcms/keyboard/bindings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcms/keyboard/bindings.cpp b/kcms/keyboard/bindings.cpp -index a11941f..968721f 100644 ---- a/kcms/keyboard/bindings.cpp -+++ b/kcms/keyboard/bindings.cpp -@@ -42,7 +42,7 @@ KeyboardLayoutActionCollection::KeyboardLayoutActionCollection(QObject* parent, - toggleAction->setText( i18n(actionName) ); - KGlobalAccel::self()->setShortcut(toggleAction, - QList() << QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_K), -- KGlobalAccel::NoAutoloading); -+ KGlobalAccel::Autoloading); - if( configAction ) { - toggleAction->setProperty("isConfigurationAction", true); - } --- -2.4.3 - diff --git a/plasma-desktop-fix-fontinst-service-path.patch b/plasma-desktop-fix-fontinst-service-path.patch deleted file mode 100644 index c2dc466..0000000 --- a/plasma-desktop-fix-fontinst-service-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/kcms/kfontinst/config-fontinst.h.cmake b/kcms/kfontinst/config-fontinst.h.cmake -index f2e6014..b44e8de 100644 ---- a/kcms/kfontinst/config-fontinst.h.cmake -+++ b/kcms/kfontinst/config-fontinst.h.cmake -@@ -1,7 +1,7 @@ - #ifndef __CONFIG_FONTINST_H__ - #define __CONFIG_FONTINST_H__ - --#define KFONTINST_LIB_EXEC_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}" -+#define KFONTINST_LIB_EXEC_DIR "${KAUTH_HELPER_INSTALL_DIR}" - - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_LOCALE_H 1 -diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake -index e212a88..a2915b5 100644 ---- a/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake -+++ b/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=org.kde.fontinst --Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst -+Exec=@KAUTH_HELPER_INSTALL_DIR@/fontinst - -diff --git a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake -index be6927f..c8b540f 100644 ---- a/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake -+++ b/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.kde.fontinst --Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst -+Exec=@KAUTH_HELPER_INSTALL_DIR/fontinst - User=root - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 529cb21..88d3bcd 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,6 +1,6 @@ Name: plasma-desktop -Version: 5.3.2 -Release: 6%{?dist} +Version: 5.4.0 +Release: 1%{?dist} Summary: Plasma Desktop shell License: GPLv2+ and (GPLv2 or GPLv3) @@ -18,18 +18,15 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve # adjust default kickoff favorites: -preferred_browser(buggy) +konqueror +konsole +apper Patch100: plasma-desktop-5.2.1-default_favorites.patch # FIXME: make upstreamable, fix dup'd PREFIX KAUTH_HELPER_INSTALL_DIR when using absolute paths -Patch101: plasma-desktop-fix-fontinst-service-path.patch # Default to Folder containment (rather than Desktop) Patch102: plasma-desktop-fedora_layout.patch ## upstream patches # master branch -Patch1: 0001-Fix-touchpad-backend-initialization.patch ## upstreamable patches # https://bugzilla.redhat.com/show_bug.cgi?id=1234082 # https://git.reviewboard.kde.org/r/124255/ -Patch50: do_not_reset_shortcut_for_changing_layout.patch BuildRequires: libusb-devel BuildRequires: fontconfig-devel @@ -171,9 +168,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # No -devel rm -fv %{buildroot}%{_libdir}/libkfontinst{,ui}.so -# KDM is dead -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 \ @@ -288,6 +282,12 @@ fi %changelog +* Fri Aug 21 2015 Daniel Vrátil - 5.4.0-1 +- Plasma 5.4.0 + +* Thu Aug 13 2015 Daniel Vrátil - 5.3.95-1 +- Plasma 5.3.95 + * Wed Jul 29 2015 Fedora Release Engineering - 5.3.2-6 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 diff --git a/sources b/sources index 5f2e1b3..9f34269 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -535e062e140b8eb25d557aba7eb1bc24 plasma-desktop-5.3.2.tar.xz +105aa6d93f32ad99b7afa0c7674aa795 plasma-desktop-5.4.0.tar.xz