[arch-commits] Commit in plasma-desktop/repos (8 files)
Felix Yan
fyan at archlinux.org
Thu Aug 13 06:17:43 UTC 2015
Date: Thursday, August 13, 2015 @ 08:17:42
Author: fyan
Revision: 243384
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
plasma-desktop/repos/testing-i686/
plasma-desktop/repos/testing-i686/PKGBUILD
(from rev 243383, plasma-desktop/trunk/PKGBUILD)
plasma-desktop/repos/testing-i686/plasma-desktop.install
(from rev 243383, plasma-desktop/trunk/plasma-desktop.install)
plasma-desktop/repos/testing-i686/touchpad-init.patch
(from rev 243383, plasma-desktop/trunk/touchpad-init.patch)
plasma-desktop/repos/testing-x86_64/
plasma-desktop/repos/testing-x86_64/PKGBUILD
(from rev 243383, plasma-desktop/trunk/PKGBUILD)
plasma-desktop/repos/testing-x86_64/plasma-desktop.install
(from rev 243383, plasma-desktop/trunk/plasma-desktop.install)
plasma-desktop/repos/testing-x86_64/touchpad-init.patch
(from rev 243383, plasma-desktop/trunk/touchpad-init.patch)
---------------------------------------+
testing-i686/PKGBUILD | 49 +++++++++++++++++++++
testing-i686/plasma-desktop.install | 12 +++++
testing-i686/touchpad-init.patch | 73 ++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 49 +++++++++++++++++++++
testing-x86_64/plasma-desktop.install | 12 +++++
testing-x86_64/touchpad-init.patch | 73 ++++++++++++++++++++++++++++++++
6 files changed, 268 insertions(+)
Copied: plasma-desktop/repos/testing-i686/PKGBUILD (from rev 243383, plasma-desktop/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2015-08-13 06:17:42 UTC (rev 243384)
@@ -0,0 +1,49 @@
+# $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=3
+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" 'touchpad-init.patch')
+md5sums=('535e062e140b8eb25d557aba7eb1bc24'
+ '3a334fccf64dd518d94371dee051723a')
+
+prepare() {
+ mkdir -p build
+
+# Fix touchpad backend initialization https://bugs.kde.org/show_bug.cgi?id=344958
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/touchpad-init.patch
+}
+
+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
+}
Copied: plasma-desktop/repos/testing-i686/plasma-desktop.install (from rev 243383, plasma-desktop/trunk/plasma-desktop.install)
===================================================================
--- testing-i686/plasma-desktop.install (rev 0)
+++ testing-i686/plasma-desktop.install 2015-08-13 06:17:42 UTC (rev 243384)
@@ -0,0 +1,12 @@
+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/testing-i686/touchpad-init.patch (from rev 243383, plasma-desktop/trunk/touchpad-init.patch)
===================================================================
--- testing-i686/touchpad-init.patch (rev 0)
+++ testing-i686/touchpad-init.patch 2015-08-13 06:17:42 UTC (rev 243384)
@@ -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()
+
Copied: plasma-desktop/repos/testing-x86_64/PKGBUILD (from rev 243383, plasma-desktop/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2015-08-13 06:17:42 UTC (rev 243384)
@@ -0,0 +1,49 @@
+# $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=3
+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" 'touchpad-init.patch')
+md5sums=('535e062e140b8eb25d557aba7eb1bc24'
+ '3a334fccf64dd518d94371dee051723a')
+
+prepare() {
+ mkdir -p build
+
+# Fix touchpad backend initialization https://bugs.kde.org/show_bug.cgi?id=344958
+ cd $pkgname-$pkgver
+ patch -p1 -i "$srcdir"/touchpad-init.patch
+}
+
+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
+}
Copied: plasma-desktop/repos/testing-x86_64/plasma-desktop.install (from rev 243383, plasma-desktop/trunk/plasma-desktop.install)
===================================================================
--- testing-x86_64/plasma-desktop.install (rev 0)
+++ testing-x86_64/plasma-desktop.install 2015-08-13 06:17:42 UTC (rev 243384)
@@ -0,0 +1,12 @@
+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/testing-x86_64/touchpad-init.patch (from rev 243383, plasma-desktop/trunk/touchpad-init.patch)
===================================================================
--- testing-x86_64/touchpad-init.patch (rev 0)
+++ testing-x86_64/touchpad-init.patch 2015-08-13 06:17:42 UTC (rev 243384)
@@ -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