Date: Saturday, February 14, 2015 @ 22:13:00
Author: andyrtr
Revision: 231396
upgpkg: kwin 5.2.0.1-3
libinput rebuild
Added:
kwin/trunk/libinput.0.8.0.patch
Modified:
kwin/trunk/PKGBUILD
----------------------+
PKGBUILD | 11 ++++++++---
libinput.0.8.0.patch | 25 +++++++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-02-14 20:58:04 UTC (rev 231395)
+++ PKGBUILD 2015-02-14 21:13:00 UTC (rev 231396)
@@ -4,7 +4,7 @@
pkgname=kwin
pkgver=5.2.0.1
_dir=5.2.0
-pkgrel=2
+pkgrel=3
pkgdesc='KDE Window manager'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/workspace/kwin'
@@ -16,9 +16,11 @@
install=${pkgname}.install
conflicts=('kdebase-workspace')
source=("http://download.kde.org/stable/plasma/${_dir}/${pkgname}-${pkgver}.tar.xz";
- 'kdebug-341971.patch')
+ 'kdebug-341971.patch'
+ 'libinput.0.8.0.patch')
md5sums=('47b6ce31b45450fa702098c9f3f5ac95'
- '037db2eab5f9e07c74122f1a5fd4fe31')
+ '037db2eab5f9e07c74122f1a5fd4fe31'
+ '0ccc6b0113e37bd994c65ffb6a4518ff')
prepare() {
mkdir build
@@ -25,6 +27,9 @@
cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/kdebug-341971.patch
+
+ #https://bugs.kde.org/show_bug.cgi?id=342893
+ patch -Np1 -i "${srcdir}"/libinput.0.8.0.patch
}
build() {
Added: libinput.0.8.0.patch
===================================================================
--- libinput.0.8.0.patch (rev 0)
+++ libinput.0.8.0.patch 2015-02-14 21:13:00 UTC (rev 231396)
@@ -0,0 +1,25 @@
+commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
+Author: Martin Gräßlin <mgraess...@kde.org>
+Date: Wed Jan 28 16:20:57 2015 +0100
+
+ Disable libinput integration if >= 0.8 is found
+
+ libinput 0.8 is incompatible causing the build to fail. As we are in
+ dependency freeze the only option is to disable the build.
+
+ BUG: 342893
+ FIXED-IN: 5.2.1
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 550ef57..8d9c593 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES URL
"http://www.freedesktop.org/software
+ PURPOSE "Required for input handling
on Wayland."
+ )
+ set(HAVE_INPUT FALSE)
+-if (Libinput_FOUND AND UDEV_FOUND)
++if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
+ set(HAVE_INPUT TRUE)
+ endif()
+
