git » kwin.git » commit 2efc6c5

Backport some bug fixes (FS#54502)

author Antonio Rojas
2017-06-20 06:31:52 UTC
committer Antonio Rojas
2017-06-20 06:31:52 UTC
parent 4b02011b3997c3ef2f21ecc0ac25bf6257926710

Backport some bug fixes (FS#54502)

PKGBUILD +13 -3

diff --git a/PKGBUILD b/PKGBUILD
index c7f14b7..8679012 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=kwin
 pkgver=5.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc='An easy to use, but flexible, composited Window Manager'
 arch=('i686' 'x86_64')
 url='https://www.kde.org/workspaces/plasmadesktop/'
@@ -13,15 +13,25 @@ makedepends=('extra-cmake-modules' 'qt5-tools' 'kdoctools' 'python')
 optdepends=('qt5-virtualkeyboard: virtual keyboard support for kwin-wayland')
 groups=('plasma')
 conflicts=('kdebase-workspace')
-source=("https://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        kdebug-360841.patch::"https://cgit.kde.org/kwin.git/patch/?id=a6dee74e"
+        kdebug-380440.patch::"https://cgit.kde.org/kwin.git/patch/?id=c45e1655")
 sha256sums=('f257f48c1ac2bfef12b6e953565514448c05391c65daaca181561783a6f16bbf'
-            'SKIP')
+            'SKIP'
+            '7aa428ad31ca3f4f345ae215e7f43aa28159c288652c79d084eea93b6820e65f'
+            'd2c30904b103d724ff1fa2dc127dca204e3b6e56e8bbc6978c9a1442209629d2')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
               'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
 
 prepare() {
   mkdir -p build
+
+# Fix keyboard input in desktop effects https://bugs.kde.org/show_bug.cgi?id=360841
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kdebug-360841.patch
+# Fix switching desktops through edge https://bugs.kde.org/show_bug.cgi?id=380440
+  patch -p1 -i ../kdebug-380440.patch
 }
 
 build() {