[arch-commits] Commit in plasma-desktop/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Tue May 10 15:55:42 UTC 2016
Date: Tuesday, May 10, 2016 @ 17:55:42
Author: arojas
Revision: 267334
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
plasma-desktop/repos/extra-i686/PKGBUILD
(from rev 267333, plasma-desktop/trunk/PKGBUILD)
plasma-desktop/repos/extra-i686/plasma-desktop-gcc6.patch
(from rev 267333, plasma-desktop/trunk/plasma-desktop-gcc6.patch)
plasma-desktop/repos/extra-x86_64/PKGBUILD
(from rev 267333, plasma-desktop/trunk/PKGBUILD)
plasma-desktop/repos/extra-x86_64/plasma-desktop-gcc6.patch
(from rev 267333, plasma-desktop/trunk/plasma-desktop-gcc6.patch)
Deleted:
plasma-desktop/repos/extra-i686/PKGBUILD
plasma-desktop/repos/extra-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 45 -------------
extra-i686/plasma-desktop-gcc6.patch | 11 +++
extra-x86_64/PKGBUILD | 45 -------------
extra-x86_64/plasma-desktop-gcc6.patch | 11 +++
5 files changed, 122 insertions(+), 90 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-10 15:55:23 UTC (rev 267333)
+++ extra-i686/PKGBUILD 2016-05-10 15:55:42 UTC (rev 267334)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=plasma-desktop
-pkgver=5.6.3
-pkgrel=2
-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")
-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'
- 'libibus' 'scim' 'python')
-optdepends=('plasma-nm: Network manager applet'
- 'ibus: kimpanel IBUS support'
- 'scim: kimpanel SCIM support')
-conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks' 'kdeplasma-addons<5.5.95' 'kactivities<5.19.0-3')
-replaces=('kcm-touchpad-frameworks')
-groups=('plasma')
-md5sums=('335d5edb6c85eedeef546d45f5da5001')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_LIBEXECDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: plasma-desktop/repos/extra-i686/PKGBUILD (from rev 267333, plasma-desktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-10 15:55:42 UTC (rev 267334)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=plasma-desktop
+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" 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'
+ 'libibus' 'scim' 'python')
+optdepends=('plasma-nm: Network manager applet'
+ 'ibus: kimpanel IBUS support'
+ 'scim: kimpanel SCIM support')
+conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks' 'kdeplasma-addons<5.5.95' 'kactivities<5.19.0-3')
+replaces=('kcm-touchpad-frameworks')
+groups=('plasma')
+md5sums=('461506709cc3b61df16ed230f1b78856'
+ '82d1604912c9d846676d8a72d270ac04')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with GCC 6
+ cd $pkgname-$pkgver
+ patch -p1 -i ../plasma-desktop-gcc6.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: plasma-desktop/repos/extra-i686/plasma-desktop-gcc6.patch (from rev 267333, plasma-desktop/trunk/plasma-desktop-gcc6.patch)
===================================================================
--- extra-i686/plasma-desktop-gcc6.patch (rev 0)
+++ extra-i686/plasma-desktop-gcc6.patch 2016-05-10 15:55:42 UTC (rev 267334)
@@ -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 at telia.com)
+ */
+
++#include <cmath>
+ #include <QDebug>
+
+ #include "synapticstouchpad.h"
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-10 15:55:23 UTC (rev 267333)
+++ extra-x86_64/PKGBUILD 2016-05-10 15:55:42 UTC (rev 267334)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=plasma-desktop
-pkgver=5.6.3
-pkgrel=2
-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")
-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'
- 'libibus' 'scim' 'python')
-optdepends=('plasma-nm: Network manager applet'
- 'ibus: kimpanel IBUS support'
- 'scim: kimpanel SCIM support')
-conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks' 'kdeplasma-addons<5.5.95' 'kactivities<5.19.0-3')
-replaces=('kcm-touchpad-frameworks')
-groups=('plasma')
-md5sums=('335d5edb6c85eedeef546d45f5da5001')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_LIBEXECDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: plasma-desktop/repos/extra-x86_64/PKGBUILD (from rev 267333, plasma-desktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-10 15:55:42 UTC (rev 267334)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=plasma-desktop
+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" 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'
+ 'libibus' 'scim' 'python')
+optdepends=('plasma-nm: Network manager applet'
+ 'ibus: kimpanel IBUS support'
+ 'scim: kimpanel SCIM support')
+conflicts=('kdebase-workspace' 'kcm-touchpad-frameworks' 'kdeplasma-addons<5.5.95' 'kactivities<5.19.0-3')
+replaces=('kcm-touchpad-frameworks')
+groups=('plasma')
+md5sums=('461506709cc3b61df16ed230f1b78856'
+ '82d1604912c9d846676d8a72d270ac04')
+
+prepare() {
+ mkdir -p build
+
+# Fix build with GCC 6
+ cd $pkgname-$pkgver
+ patch -p1 -i ../plasma-desktop-gcc6.patch
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: plasma-desktop/repos/extra-x86_64/plasma-desktop-gcc6.patch (from rev 267333, plasma-desktop/trunk/plasma-desktop-gcc6.patch)
===================================================================
--- extra-x86_64/plasma-desktop-gcc6.patch (rev 0)
+++ extra-x86_64/plasma-desktop-gcc6.patch 2016-05-10 15:55:42 UTC (rev 267334)
@@ -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 at telia.com)
+ */
+
++#include <cmath>
+ #include <QDebug>
+
+ #include "synapticstouchpad.h"
+
More information about the arch-commits
mailing list