[arch-commits] Commit in plasma-desktop/repos (6 files)

Antonio Rojas arojas at archlinux.org
Sun Jul 5 13:19:33 UTC 2015


    Date: Sunday, July 5, 2015 @ 15:19:33
  Author: arojas
Revision: 241825

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  plasma-desktop/repos/extra-i686/touchpad-init.patch
    (from rev 241824, plasma-desktop/trunk/touchpad-init.patch)
  plasma-desktop/repos/extra-x86_64/touchpad-init.patch
    (from rev 241824, plasma-desktop/trunk/touchpad-init.patch)
Deleted:
  plasma-desktop/repos/extra-i686/PKGBUILD
  plasma-desktop/repos/extra-i686/plasma-desktop.install
  plasma-desktop/repos/extra-x86_64/PKGBUILD
  plasma-desktop/repos/extra-x86_64/plasma-desktop.install

-------------------------------------+
 extra-i686/PKGBUILD                 |   44 --------------------
 extra-i686/plasma-desktop.install   |   12 -----
 extra-i686/touchpad-init.patch      |   73 ++++++++++++++++++++++++++++++++++
 extra-x86_64/PKGBUILD               |   44 --------------------
 extra-x86_64/plasma-desktop.install |   12 -----
 extra-x86_64/touchpad-init.patch    |   73 ++++++++++++++++++++++++++++++++++
 6 files changed, 146 insertions(+), 112 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-07-05 13:18:09 UTC (rev 241824)
+++ extra-i686/PKGBUILD	2015-07-05 13:19:33 UTC (rev 241825)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=plasma-desktop
-pkgver=5.3.2
-pkgrel=1
-pkgdesc='KDE Plasma Desktop'
-arch=('i686' 'x86_64')
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=('LGPL')
-depends=('powerdevil' 'polkit-kde-agent'
-         'libcanberra' 'kwin' 'libusb-compat' 'libxkbfile' 'kmenuedit'
-         'systemsettings' 'ksysguard' 'kpeople' 'baloo')
-makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-evdev' 'xf86-input-synaptics' 'xorg-server-devel')
-optdepends=('plasma-nm: Network manager applet')
-conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks')
-replaces=('kcm-touchpad-frameworks')
-install="${pkgname}.install"
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
-md5sums=('535e062e140b8eb25d557aba7eb1bc24')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Deleted: extra-i686/plasma-desktop.install
===================================================================
--- extra-i686/plasma-desktop.install	2015-07-05 13:18:09 UTC (rev 241824)
+++ extra-i686/plasma-desktop.install	2015-07-05 13:19:33 UTC (rev 241825)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: plasma-desktop/repos/extra-i686/touchpad-init.patch (from rev 241824, plasma-desktop/trunk/touchpad-init.patch)
===================================================================
--- extra-i686/touchpad-init.patch	                        (rev 0)
+++ extra-i686/touchpad-init.patch	2015-07-05 13:19:33 UTC (rev 241825)
@@ -0,0 +1,73 @@
+From: Rajeesh K Nambiar <rajeeshknambiar at gmail.com>
+Date: Sat, 27 Jun 2015 11:58:17 +0000
+Subject: Fix touchpad backend initialization.
+X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=3f2e6bd31e0cd7355f95450cdc185e4d37ed2c16
+---
+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
+---
+
+
+--- a/kcms/touchpad/src/backends/x11/xlibbackend.cpp
++++ b/kcms/touchpad/src/backends/x11/xlibbackend.cpp
+@@ -151,8 +151,10 @@
+     XlibBackend(parent)
+ {
+     m_capsAtom.intern(m_connection, SYNAPTICS_PROP_CAPABILITIES);
+-    if (!m_capsAtom.atom())
+-        return;
++    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 @@
+                        "libinput Tapping Enabled",
+                        true);
+ 
+-    if (!identifier.atom())
+-        return;
++    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 @@
+ 
+ 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()
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-07-05 13:18:09 UTC (rev 241824)
+++ extra-x86_64/PKGBUILD	2015-07-05 13:19:33 UTC (rev 241825)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=plasma-desktop
-pkgver=5.3.2
-pkgrel=1
-pkgdesc='KDE Plasma Desktop'
-arch=('i686' 'x86_64')
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=('LGPL')
-depends=('powerdevil' 'polkit-kde-agent'
-         'libcanberra' 'kwin' 'libusb-compat' 'libxkbfile' 'kmenuedit'
-         'systemsettings' 'ksysguard' 'kpeople' 'baloo')
-makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-evdev' 'xf86-input-synaptics' 'xorg-server-devel')
-optdepends=('plasma-nm: Network manager applet')
-conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks')
-replaces=('kcm-touchpad-frameworks')
-install="${pkgname}.install"
-groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
-md5sums=('535e062e140b8eb25d557aba7eb1bc24')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DLIBEXEC_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Deleted: extra-x86_64/plasma-desktop.install
===================================================================
--- extra-x86_64/plasma-desktop.install	2015-07-05 13:18:09 UTC (rev 241824)
+++ extra-x86_64/plasma-desktop.install	2015-07-05 13:19:33 UTC (rev 241825)
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: plasma-desktop/repos/extra-x86_64/touchpad-init.patch (from rev 241824, plasma-desktop/trunk/touchpad-init.patch)
===================================================================
--- extra-x86_64/touchpad-init.patch	                        (rev 0)
+++ extra-x86_64/touchpad-init.patch	2015-07-05 13:19:33 UTC (rev 241825)
@@ -0,0 +1,73 @@
+From: Rajeesh K Nambiar <rajeeshknambiar at gmail.com>
+Date: Sat, 27 Jun 2015 11:58:17 +0000
+Subject: Fix touchpad backend initialization.
+X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=3f2e6bd31e0cd7355f95450cdc185e4d37ed2c16
+---
+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
+---
+
+
+--- a/kcms/touchpad/src/backends/x11/xlibbackend.cpp
++++ b/kcms/touchpad/src/backends/x11/xlibbackend.cpp
+@@ -151,8 +151,10 @@
+     XlibBackend(parent)
+ {
+     m_capsAtom.intern(m_connection, SYNAPTICS_PROP_CAPABILITIES);
+-    if (!m_capsAtom.atom())
+-        return;
++    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 @@
+                        "libinput Tapping Enabled",
+                        true);
+ 
+-    if (!identifier.atom())
+-        return;
++    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 @@
+ 
+ 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()
+



More information about the arch-commits mailing list