git » plasma-desktop.git » commit e42ae04

Plasma 5.6.4

author Antonio Rojas
2016-05-10 15:48:01 UTC
committer Antonio Rojas
2016-05-10 15:48:01 UTC
parent 92ebfad82c965ab0daaf2f1ca1077134cc64fc1d

Plasma 5.6.4

PKGBUILD +9 -4
plasma-desktop-gcc6.patch +11 -0

diff --git a/PKGBUILD b/PKGBUILD
index 653573c..5bd4d1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=plasma-desktop
-pkgver=5.6.3
-pkgrel=2
+pkgver=5.6.4
+pkgrel=1
 pkgdesc='KDE Plasma Desktop'
 arch=('i686' 'x86_64')
 url='https://www.kde.org/workspaces/plasmadesktop/'
 license=('LGPL')
-source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz")
+source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz" plasma-desktop-gcc6.patch)
 depends=('powerdevil' 'polkit-kde-agent' 'libcanberra' 'libxkbfile' 'kmenuedit'
          'systemsettings' 'ksysguard' 'kpeople' 'baloo' 'qt5-graphicaleffects')
 makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-evdev' 'xf86-input-synaptics' 'xorg-server-devel'
@@ -20,10 +20,15 @@ optdepends=('plasma-nm: Network manager applet'
 conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks' 'kdeplasma-addons<5.5.95' 'kactivities<5.19.0-3')
 replaces=('kcm-touchpad-frameworks')
 groups=('plasma')
-md5sums=('335d5edb6c85eedeef546d45f5da5001')
+md5sums=('461506709cc3b61df16ed230f1b78856'
+         '82d1604912c9d846676d8a72d270ac04')
 
 prepare() {
   mkdir -p build
+
+# Fix build with GCC 6
+  cd $pkgname-$pkgver
+  patch -p1 -i ../plasma-desktop-gcc6.patch
 }
 
 build() {
diff --git a/plasma-desktop-gcc6.patch b/plasma-desktop-gcc6.patch
new file mode 100644
index 0000000..345307f
--- /dev/null
+++ b/plasma-desktop-gcc6.patch
@@ -0,0 +1,11 @@
+--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+@@ -46,6 +46,7 @@
+  *      Peter Osterlund (petero2@telia.com)
+  */
+ 
++#include <cmath>
+ #include <QDebug>
+ 
+ #include "synapticstouchpad.h"
+