Dan Vrátil
9 years ago
parent
2b98b932e1
commit
0e5ee9860a
@ -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
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From 3f2e6bd31e0cd7355f95450cdc185e4d37ed2c16 Mon Sep 17 00:00:00 2001
|
||||
From: Rajeesh K Nambiar <rajeeshknambiar@gmail.com>
|
||||
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, XDisplayCleanup> 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
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From d5d809aa349a72a4c6fa7c031c4cfe6938ea3eaa Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Romanov <drizt@land.ru>
|
||||
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>() << QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_K),
|
||||
- KGlobalAccel::NoAutoloading);
|
||||
+ KGlobalAccel::Autoloading);
|
||||
if( configAction ) {
|
||||
toggleAction->setProperty("isConfigurationAction", true);
|
||||
}
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -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 <locale.h> 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
|
||||
|
||||
Loading…
Reference in new issue