[arch-commits] Commit in plasma-desktop/repos/kde-unstable-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, May 18, 2019 @ 21:49:13
  Author: arojas
Revision: 353612

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  plasma-desktop/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 353611, plasma-desktop/kde-unstable/PKGBUILD)
  plasma-desktop/repos/kde-unstable-x86_64/kdebug-407614.patch
    (from rev 353611, plasma-desktop/kde-unstable/kdebug-407614.patch)
Deleted:
  plasma-desktop/repos/kde-unstable-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |  127 +++++++++++++++++++++++++-------------------------
 kdebug-407614.patch |   14 +++++
 2 files changed, 80 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-18 21:48:39 UTC (rev 353611)
+++ PKGBUILD	2019-05-18 21:49:13 UTC (rev 353612)
@@ -1,61 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=plasma-desktop
-pkgname=(plasma-desktop knetattach)
-pkgver=5.15.90
-pkgrel=1
-pkgdesc='KDE Plasma Desktop'
-arch=(x86_64)
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=(LGPL)
-source=("https://download.kde.org/unstable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
-depends=(polkit-kde-agent libxkbfile kmenuedit appstream-qt systemsettings ksysguard kpeople baloo)
-makedepends=(extra-cmake-modules kdoctools boost xf86-input-evdev xf86-input-synaptics xf86-input-libinput xorg-server-devel
-             libibus scim kdesignerplugin)
-groups=(plasma)
-sha256sums=('d615c7301772bf8370e535e0db06850af0ecf18534efad237e21b7158ab88c18'
-            'SKIP')
-validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr at jriddell.org>
-              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
-              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson at kde.org>
-              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package_plasma-desktop() {
-  depends+=(knetattach)
-  optdepends=('plasma-nm: Network manager applet'
-              'powerdevil: power management'
-              'kscreen: screen management'
-              'ibus: kimpanel IBUS support'
-              'scim: kimpanel SCIM support'
-              'discover: manage applications installation from the launcher')
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-# Split knetattach
-  rm "$pkgdir"/usr/{bin/knetattach,share/applications/org.kde.knetattach.desktop}
-}
-
-package_knetattach() {
-  pkgdesc='Wizard which makes it easier to integrate network resources with the Plasma Desktop'
-  depends=(kdelibs4support)
-
-  cd build/knetattach
-  make DESTDIR="$pkgdir" install
-}

Copied: plasma-desktop/repos/kde-unstable-x86_64/PKGBUILD (from rev 353611, plasma-desktop/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-18 21:49:13 UTC (rev 353612)
@@ -0,0 +1,66 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=plasma-desktop
+pkgname=(plasma-desktop knetattach)
+pkgver=5.15.90
+pkgrel=2
+pkgdesc='KDE Plasma Desktop'
+arch=(x86_64)
+url='https://www.kde.org/workspaces/plasmadesktop/'
+license=(LGPL)
+source=("https://download.kde.org/unstable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+        kdebug-407614.patch)
+depends=(polkit-kde-agent libxkbfile kmenuedit appstream-qt systemsettings ksysguard kpeople baloo)
+makedepends=(extra-cmake-modules kdoctools boost xf86-input-evdev xf86-input-synaptics xf86-input-libinput xorg-server-devel
+             libibus scim kdesignerplugin)
+groups=(plasma)
+sha256sums=('d615c7301772bf8370e535e0db06850af0ecf18534efad237e21b7158ab88c18'
+            'SKIP'
+            '39c0a6e32e936b73ad56d20b16a0673a92c562d5a0edffe8b28ac849783584eb')
+validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr at jriddell.org>
+              '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah at kde.org>
+              'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson at kde.org>
+              '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart at gmail.com>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-407614.patch # Fix kded-touchpad crash
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package_plasma-desktop() {
+  depends+=(knetattach)
+  optdepends=('plasma-nm: Network manager applet'
+              'powerdevil: power management'
+              'kscreen: screen management'
+              'ibus: kimpanel IBUS support'
+              'scim: kimpanel SCIM support'
+              'discover: manage applications installation from the launcher')
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+# Split knetattach
+  rm "$pkgdir"/usr/{bin/knetattach,share/applications/org.kde.knetattach.desktop}
+}
+
+package_knetattach() {
+  pkgdesc='Wizard which makes it easier to integrate network resources with the Plasma Desktop'
+  depends=(kdelibs4support)
+
+  cd build/knetattach
+  make DESTDIR="$pkgdir" install
+}

Copied: plasma-desktop/repos/kde-unstable-x86_64/kdebug-407614.patch (from rev 353611, plasma-desktop/kde-unstable/kdebug-407614.patch)
===================================================================
--- kdebug-407614.patch	                        (rev 0)
+++ kdebug-407614.patch	2019-05-18 21:49:13 UTC (rev 353612)
@@ -0,0 +1,14 @@
+diff --git a/kcms/touchpad/src/backends/x11/xcbatom.cpp b/kcms/touchpad/src/backends/x11/xcbatom.cpp
+--- a/kcms/touchpad/src/backends/x11/xcbatom.cpp
++++ b/kcms/touchpad/src/backends/x11/xcbatom.cpp
+@@ -46,6 +46,9 @@
+ {
+     if (!m_fetched) {
+         m_fetched = true;
++        if(!m_connection) {
++            return 0;
++        }
+         m_reply = xcb_intern_atom_reply(m_connection, m_cookie, 0);
+     }
+     if (m_reply) {
+