[arch-commits] Commit in krita/trunk (PKGBUILD krita-qtabletevent.patch)

[Antonio Rojas]

    Date: Monday, May 27, 2019 @ 16:43:21
  Author: arojas
Revision: 354401

Update to 4.2.0

Modified:
  krita/trunk/PKGBUILD
Deleted:
  krita/trunk/krita-qtabletevent.patch

--------------------------+
 PKGBUILD                 |   16 +++--------
 krita-qtabletevent.patch |   63 ---------------------------------------------
 2 files changed, 5 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-27 16:03:46 UTC (rev 354400)
+++ PKGBUILD	2019-05-27 16:43:21 UTC (rev 354401)
@@ -1,13 +1,13 @@
 # Maintainer: Antonio Rojas <arojas at archlinux,org>
 
 pkgname=krita
-pkgver=4.1.8
-pkgrel=3
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="Edit and paint images"
 arch=(x86_64)
 url="https://krita.org"
 license=(GPL3)
-depends=(kitemviews kitemmodels ki18n kcompletion karchive kguiaddons kcrash qt5-svg qt5-multimedia
+depends=(kitemviews kitemmodels ki18n kcompletion karchive kguiaddons kcrash qt5-svg qt5-multimedia quazip
          gsl libraw exiv2 openexr fftw curl boost-libs giflib hicolor-icon-theme desktop-file-utils)
 makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 opencolorio python-pyqt5 libheif sip python-sip)
 optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 'opencolorio: for the LUT docker'
@@ -14,18 +14,12 @@
             "krita-plugin-gmic: G'MIC plugin" 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter')
 conflicts=(calligra-krita krita-l10n)
 replaces=(calligra-krita krita-l10n)
-source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
-        krita-qtabletevent.patch)
-sha256sums=('0476c9e2279f0ae690c2ed02e1aa9c3d491943643f9859355a02657318bd5940'
-            'SKIP'
-            '28adbd1f2218e7088ca0e4b4e46ae01ab29e21f60289df7a53f18869a3482233')
+source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('d5eb5cce8bdb68bc669e8f8f6a41d09821bcc4ef5a4c99de6f7838b1c884abd0')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at krita.org>
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../krita-qtabletevent.patch # Workaround tablet issues with Qt 5.12 https://cgit.kde.org/krita.git/commit/?id=a3193fe2
 }
 
 build() {

Deleted: krita-qtabletevent.patch
===================================================================
--- krita-qtabletevent.patch	2019-05-27 16:03:46 UTC (rev 354400)
+++ krita-qtabletevent.patch	2019-05-27 16:43:21 UTC (rev 354401)
@@ -1,63 +0,0 @@
-From a3193fe273c3f2c3b5493f77724a4bc099ae5e36 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73 at gmail.com>
-Date: Mon, 11 Mar 2019 16:49:31 +0300
-Subject: Add a hacky patch that ensures QTabletEvents to be ignored in
- distribution builds
-
-If we ensure that all the tablet events are ignored, then Qt
-will always generate synthesized mouse events, avoiding the
-problem of lost Enter/Leave events.
-
-We also mark our own build of Qt about the presence of the fix
-(therefore, it doesn't need this hack).
----
- libs/ui/input/kis_input_manager.cpp                | 20 ++++++++++++++++
-
-diff --git a/libs/ui/input/kis_input_manager.cpp b/libs/ui/input/kis_input_manager.cpp
-index 30a4677..d173543 100644
---- a/libs/ui/input/kis_input_manager.cpp
-+++ b/libs/ui/input/kis_input_manager.cpp
-@@ -496,6 +496,13 @@ bool KisInputManager::eventFilterImpl(QEvent * event)
-         //Reset signal compressor to prevent processing events before press late
-         d->resetCompressor();
-         d->eatOneMousePress();
-+
-+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH
-+        // remove this hack when this patch is integrated:
-+        // https://codereview.qt-project.org/#/c/255384/
-+        event->setAccepted(false);
-+#endif
-+
-         break;
-     }
-     case QEvent::TabletMove: {
-@@ -517,6 +524,12 @@ bool KisInputManager::eventFilterImpl(QEvent * event)
-          */
-         d->blockMouseEvents();
- 
-+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH
-+        // remove this hack when this patch is integrated:
-+        // https://codereview.qt-project.org/#/c/255384/
-+        event->setAccepted(false);
-+#endif
-+
-         break;
-     }
-     case QEvent::TabletRelease: {
-@@ -529,6 +542,13 @@ bool KisInputManager::eventFilterImpl(QEvent * event)
-         retval = d->matcher.buttonReleased(tabletEvent->button(), tabletEvent);
-         retval = true;
-         event->setAccepted(true);
-+
-+#if defined Q_OS_LINUX && !defined QT_HAS_ENTER_LEAVE_PATCH
-+        // remove this hack when this patch is integrated:
-+        // https://codereview.qt-project.org/#/c/255384/
-+        event->setAccepted(false);
-+#endif
-+
-         break;
-     }
- 
--- 
-cgit v1.1
-