[arch-commits] Commit in krita/repos (3 files)

2020-07-23 Thread Antonio Rojas via arch-commits 
Date: Thursday, July 23, 2020 @ 16:52:35
  Author: arojas
Revision: 392434

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 392433, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-sip5.patch
(from rev 392433, krita/trunk/krita-sip5.patch)

--+
 PKGBUILD |   38 +++
 krita-sip5.patch |  254 +
 2 files changed, 292 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 392433, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-07-23 16:52:35 UTC (rev 392434)
@@ -0,0 +1,38 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+_pkgver=4.3.0
+pkgver=${_pkgver/-/}
+pkgrel=2
+pkgdesc="Edit and paint images"
+arch=(x86_64)
+url="https://krita.org;
+license=(GPL3)
+depends=(kitemviews kitemmodels ki18n kcompletion kguiaddons kcrash qt5-svg 
qt5-multimedia quazip
+ gsl libraw exiv2 openexr fftw boost-libs giflib openjpeg2 
hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 
opencolorio python-pyqt5 libheif
+ qt5-tools sip5)
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 
'opencolorio: for the LUT docker'
+"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;
+ krita-sip5.patch)
+sha256sums=('d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda'
+'08076f5e3aa47a34f358efef16d95ae008dd71bcabc6da83a29f9597c1d25453')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  patch -d $pkgname-$_pkgver -p1 -i ../krita-sip5.patch # Fix build with SIP 5
+}
+
+build() {
+  cmake -B build -S $pkgname-$_pkgver \
+-DBUILD_TESTING=OFF \
+-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: krita/repos/staging-x86_64/krita-sip5.patch (from rev 392433, 
krita/trunk/krita-sip5.patch)
===
--- staging-x86_64/krita-sip5.patch (rev 0)
+++ staging-x86_64/krita-sip5.patch 2020-07-23 16:52:35 UTC (rev 392434)
@@ -0,0 +1,254 @@
+From 3a7bf8ef22fec548f70c022d401a8a5a46e6f100 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev 
+Date: Sat, 4 Jul 2020 13:01:27 +0300
+Subject: [PATCH 1/4] Update pyqt_sip_dir for pyqt5 compiled with sip5
+
+---
+ cmake/modules/FindPyQt5.py | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py
+index e0ef9d7bdb..e138ad3107 100644
+--- a/cmake/modules/FindPyQt5.py
 b/cmake/modules/FindPyQt5.py
+@@ -4,6 +4,7 @@
+ 
+ import sys
+ import os
++from distutils.sysconfig import get_python_lib
+ 
+ try:
+ # On Windows and Python 3.8+ python doesn't load module DLL's
+@@ -40,8 +41,9 @@ try:
+ except ValueError:
+ pass
+ 
+-# FIXME This next line is just a little bit too crude.
+-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
++pyqt_sip_dir = os.path.join(get_python_lib(plat_specific=1), "PyQt5", 
"bindings")
++if not os.path.exists(pyqt_sip_dir):  # Fallback for older PyQt5/SIP
++pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
+ print("pyqt_sip_dir:%s" % pyqt_sip_dir)
+ 
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])
+-- 
+GitLab
+
+
+From ecc99b3a48c9fa7a80b2fade5a6de2a09c1cca82 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev 
+Date: Sat, 4 Jul 2020 13:02:00 +0300
+Subject: [PATCH 2/4] Find sip executable directly instead of relying on
+ FindSIP.py
+
+---
+ cmake/modules/FindSIP.cmake   | 47 ---
+ cmake/modules/FindSIP.py  | 15 --
+ plugins/extensions/pykrita/CMakeLists.txt |  2 +-
+ plugins/extensions/pykrita/sip/CMakeLists.txt |  4 --
+ 4 files changed, 11 insertions(+), 57 deletions(-)
+ delete mode 100644 cmake/modules/FindSIP.py
+
+diff --git a/cmake/modules/FindSIP.cmake b/cmake/modules/FindSIP.cmake
+index 1ca061ff97..001ac6a11b 100644
+--- a/cmake/modules/FindSIP.cmake
 b/cmake/modules/FindSIP.cmake
+@@ -8,17 +8,11 @@
+ #
+ # This file defines the following variables:
+ #
+-# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
+-# suitable for comparison as a string.
+-#
+ # SIP_VERSION_STR - The version of SIP found as a human readable string.
+ #
+ # SIP_EXECUTABLE - Path and filename of the SIP command line executable.
+ #
+-# SIP_INCLUDE_DIR - Directory holding the SIP C++ header file.
+-#
+-#

[arch-commits] Commit in krita/repos (3 files)

2020-06-02 Thread Antonio Rojas via arch-commits 
Date: Tuesday, June 2, 2020 @ 09:05:18
  Author: arojas
Revision: 388065

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  krita/repos/kde-unstable-x86_64/
  krita/repos/kde-unstable-x86_64/PKGBUILD
(from rev 388064, krita/kde-unstable/PKGBUILD)
  krita/repos/kde-unstable-x86_64/krita-pyqt5-sip5.patch
(from rev 388064, krita/kde-unstable/krita-pyqt5-sip5.patch)

+
 PKGBUILD   |   43 +++
 krita-pyqt5-sip5.patch |   22 ++
 2 files changed, 65 insertions(+)

Copied: krita/repos/kde-unstable-x86_64/PKGBUILD (from rev 388064, 
krita/kde-unstable/PKGBUILD)
===
--- kde-unstable-x86_64/PKGBUILD(rev 0)
+++ kde-unstable-x86_64/PKGBUILD2020-06-02 09:05:18 UTC (rev 388065)
@@ -0,0 +1,43 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+_pkgver=4.3.0-beta2
+pkgver=${_pkgver/-/}
+pkgrel=1
+pkgdesc="Edit and paint images"
+arch=(x86_64)
+url="https://krita.org;
+license=(GPL3)
+depends=(kitemviews kitemmodels ki18n kcompletion kguiaddons kcrash qt5-svg 
qt5-multimedia quazip
+ gsl libraw exiv2 openexr fftw boost-libs giflib openjpeg2 
hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 
opencolorio python-pyqt5 libheif
+ qt5-tools sip python-sip)
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 
'opencolorio: for the LUT docker'
+"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/unstable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz;
+ krita-pyqt5-sip5.patch)
+sha256sums=('5de9dcc9ee95b5ffdc14997d4a77f5e15462e099f237740c1beff46b2ac3808e'
+'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$_pkgver
+  patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is 
compiled with SIP 5
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$_pkgver \
+-DBUILD_TESTING=OFF \
+-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/kde-unstable-x86_64/krita-pyqt5-sip5.patch (from rev 
388064, krita/kde-unstable/krita-pyqt5-sip5.patch)
===
--- kde-unstable-x86_64/krita-pyqt5-sip5.patch  (rev 0)
+++ kde-unstable-x86_64/krita-pyqt5-sip5.patch  2020-06-02 09:05:18 UTC (rev 
388065)
@@ -0,0 +1,22 @@
+diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py
+index 5849f40868..a42ba6c624 100644
+--- a/cmake/modules/FindPyQt5.py
 b/cmake/modules/FindPyQt5.py
+@@ -2,7 +2,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import sys
++import sys, site
+ import os
+ 
+ try:
+@@ -41,7 +41,7 @@ except ValueError:
+ pass
+ 
+ # FIXME This next line is just a little bit too crude.
+-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
++pyqt_sip_dir = os.path.join(site.getsitepackages()[0], "PyQt5", "bindings")
+ print("pyqt_sip_dir:%s" % pyqt_sip_dir)
+ 
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])

[arch-commits] Commit in krita/repos (3 files)

2020-05-12 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 12, 2020 @ 08:33:27
  Author: arojas
Revision: 383281

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 383280, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-pyqt5-sip5.patch
(from rev 383280, krita/trunk/krita-pyqt5-sip5.patch)

+
 PKGBUILD   |   46 ++
 krita-pyqt5-sip5.patch |   22 ++
 2 files changed, 68 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 383280, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-05-12 08:33:27 UTC (rev 383281)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.2.9
+pkgrel=4
+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 quazip
+ gsl libraw exiv2 openexr fftw boost-libs giflib hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 
opencolorio python-pyqt5 libheif
+ qt5-tools sip python-sip)
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 
'opencolorio: for the LUT docker'
+"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-pyqt5-sip5.patch
+ 
krita-deadlock-qt5.14.2.patch::"https://invent.kde.org/kde/krita/commit/afed6a9e.patch;)
+sha256sums=('9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8'
+'SKIP'
+'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
+'6477ceec976d376172cc82a5a8bf85938a7dffd924286fa79e64ccdab8c901eb')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is 
compiled with SIP 5
+  patch -p1 -i ../krita-deadlock-qt5.14.2.patch # Fix deadlock on plugin load 
with Qt 5.14.2
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DBUILD_TESTING=OFF \
+-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-pyqt5-sip5.patch (from rev 383280, 
krita/trunk/krita-pyqt5-sip5.patch)
===
--- staging-x86_64/krita-pyqt5-sip5.patch   (rev 0)
+++ staging-x86_64/krita-pyqt5-sip5.patch   2020-05-12 08:33:27 UTC (rev 
383281)
@@ -0,0 +1,22 @@
+diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py
+index 5849f40868..a42ba6c624 100644
+--- a/cmake/modules/FindPyQt5.py
 b/cmake/modules/FindPyQt5.py
+@@ -2,7 +2,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import sys
++import sys, site
+ import os
+ 
+ try:
+@@ -41,7 +41,7 @@ except ValueError:
+ pass
+ 
+ # FIXME This next line is just a little bit too crude.
+-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
++pyqt_sip_dir = os.path.join(site.getsitepackages()[0], "PyQt5", "bindings")
+ print("pyqt_sip_dir:%s" % pyqt_sip_dir)
+ 
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])

[arch-commits] Commit in krita/repos (3 files)

2020-05-09 Thread Antonio Rojas via arch-commits 
Date: Saturday, May 9, 2020 @ 14:59:36
  Author: arojas
Revision: 382954

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 382953, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-pyqt5-sip5.patch
(from rev 382953, krita/trunk/krita-pyqt5-sip5.patch)

+
 PKGBUILD   |   46 ++
 krita-pyqt5-sip5.patch |   22 ++
 2 files changed, 68 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 382953, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2020-05-09 14:59:36 UTC (rev 382954)
@@ -0,0 +1,46 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.2.9
+pkgrel=3
+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 quazip
+ gsl libraw exiv2 openexr fftw boost-libs giflib hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 
opencolorio python-pyqt5 libheif
+ qt5-tools sip python-sip)
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 
'opencolorio: for the LUT docker'
+"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-pyqt5-sip5.patch
+ 
krita-deadlock-qt5.14.2.patch::"https://invent.kde.org/kde/krita/commit/afed6a9e.patch;)
+sha256sums=('9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8'
+'SKIP'
+'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
+'6477ceec976d376172cc82a5a8bf85938a7dffd924286fa79e64ccdab8c901eb')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is 
compiled with SIP 5
+  patch -p1 -i ../krita-deadlock-qt5.14.2.patch # Fix deadlock on plugin load 
with Qt 5.14.2
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DBUILD_TESTING=OFF \
+-DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-pyqt5-sip5.patch (from rev 382953, 
krita/trunk/krita-pyqt5-sip5.patch)
===
--- staging-x86_64/krita-pyqt5-sip5.patch   (rev 0)
+++ staging-x86_64/krita-pyqt5-sip5.patch   2020-05-09 14:59:36 UTC (rev 
382954)
@@ -0,0 +1,22 @@
+diff --git a/cmake/modules/FindPyQt5.py b/cmake/modules/FindPyQt5.py
+index 5849f40868..a42ba6c624 100644
+--- a/cmake/modules/FindPyQt5.py
 b/cmake/modules/FindPyQt5.py
+@@ -2,7 +2,7 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-import sys
++import sys, site
+ import os
+ 
+ try:
+@@ -41,7 +41,7 @@ except ValueError:
+ pass
+ 
+ # FIXME This next line is just a little bit too crude.
+-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
++pyqt_sip_dir = os.path.join(site.getsitepackages()[0], "PyQt5", "bindings")
+ print("pyqt_sip_dir:%s" % pyqt_sip_dir)
+ 
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])

[arch-commits] Commit in krita/repos (3 files)

2019-05-18 Thread Felix Yan via arch-commits 
Date: Saturday, May 18, 2019 @ 08:13:32
  Author: felixonmars
Revision: 353574

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 353573, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-qtabletevent.patch
(from rev 353573, krita/trunk/krita-qtabletevent.patch)

--+
 PKGBUILD |   43 ++
 krita-qtabletevent.patch |   63 +
 2 files changed, 106 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 353573, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-05-18 08:13:32 UTC (rev 353574)
@@ -0,0 +1,43 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.1.8
+pkgrel=3
+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
+ 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'
+"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')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+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() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-qtabletevent.patch (from rev 353573, 
krita/trunk/krita-qtabletevent.patch)
===
--- staging-x86_64/krita-qtabletevent.patch (rev 0)
+++ staging-x86_64/krita-qtabletevent.patch 2019-05-18 08:13:32 UTC (rev 
353574)
@@ -0,0 +1,63 @@
+From a3193fe273c3f2c3b5493f77724a4bc099ae5e36 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+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
++
+

[arch-commits] Commit in krita/repos (3 files)

2018-09-17 Thread Evangelos Foutras via arch-commits 
Date: Tuesday, September 18, 2018 @ 02:58:13
  Author: foutrelis
Revision: 334840

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 334839, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-libraw-0.19.patch
(from rev 334839, krita/trunk/krita-libraw-0.19.patch)

-+
 PKGBUILD|   42 +++
 krita-libraw-0.19.patch |   54 ++
 2 files changed, 96 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 334839, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-09-18 02:58:13 UTC (rev 334840)
@@ -0,0 +1,42 @@
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.1.1
+pkgrel=5
+pkgdesc="Edit and paint images"
+arch=(x86_64)
+url="https://krita.org;
+license=(GPL3)
+depends=(kio kitemmodels gsl libraw exiv2 openexr fftw curl boost-libs giflib 
qt5-declarative hicolor-icon-theme)
+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'
+"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-libraw-0.19.patch)
+sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
+'SKIP'
+'975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krita-libraw-0.19.patch # Remove features no longer 
available in libraw 0.19
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-libraw-0.19.patch (from rev 334839, 
krita/trunk/krita-libraw-0.19.patch)
===
--- staging-x86_64/krita-libraw-0.19.patch  (rev 0)
+++ staging-x86_64/krita-libraw-0.19.patch  2018-09-18 02:58:13 UTC (rev 
334840)
@@ -0,0 +1,54 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..cdf5b507ec 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
 b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
+-case RawDecodingSettings::LINENR:
+-{
+-// (100 - 1000) => (0.001 - 0.02) conversion.
+-raw.imgdata.params.linenoise= 
m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.0011;
+-raw.imgdata.params.cfaline  = true;
+-break;
+-}
+-
+-case RawDecodingSettings::IMPULSENR:
+-{
+-// (100 - 1000) => (0.005 - 0.05) conversion.
+-raw.imgdata.params.lclean   = 
m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
+-raw.imgdata.params.cclean   = 
m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
+-raw.imgdata.params.cfa_clean= true;
+-break;
+-}
+ default:   // No Noise Reduction
+ {
+ raw.imgdata.params.threshold= 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
+-raw.imgdata.params.linenoise= 0;
+-raw.imgdata.params.cfaline  = false;
+-raw.imgdata.params.lclean   = 0;
+-raw.imgdata.params.cclean   = 0;
+-raw.imgdata.params.cfa_clean= false;
+ break;
+ }
+ }
+ 
+-// Chromatic aberration correction.
+-raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
+-raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
+-raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
+-
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
+ raw.imgdata.params.exp_shift  = 
m_parent->m_rawDecodingSettings.expoCorrectionShift;
+@@ -461,8 +435,6 @@ bool

[arch-commits] Commit in krita/repos (3 files)

2018-08-19 Thread Antonio Rojas via arch-commits 
Date: Sunday, August 19, 2018 @ 09:19:32
  Author: arojas
Revision: 332634

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 332633, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-libraw-0.19.patch
(from rev 332633, krita/trunk/krita-libraw-0.19.patch)

-+
 PKGBUILD|   43 
 krita-libraw-0.19.patch |   54 ++
 2 files changed, 97 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 332633, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-19 09:19:32 UTC (rev 332634)
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 262594 2016-03-26 20:49:29Z arojas $
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.1.1
+pkgrel=4
+pkgdesc="Edit and paint images"
+arch=(x86_64)
+url="https://krita.org;
+license=(GPL3)
+depends=(kio kitemmodels gsl libraw exiv2 openexr fftw curl boost-libs giflib 
qt5-declarative hicolor-icon-theme)
+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'
+"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-libraw-0.19.patch)
+sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
+'SKIP'
+'975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krita-libraw-0.19.patch # Remove features no longer 
available in libraw 0.19
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-libraw-0.19.patch (from rev 332633, 
krita/trunk/krita-libraw-0.19.patch)
===
--- staging-x86_64/krita-libraw-0.19.patch  (rev 0)
+++ staging-x86_64/krita-libraw-0.19.patch  2018-08-19 09:19:32 UTC (rev 
332634)
@@ -0,0 +1,54 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..cdf5b507ec 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
 b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
+-case RawDecodingSettings::LINENR:
+-{
+-// (100 - 1000) => (0.001 - 0.02) conversion.
+-raw.imgdata.params.linenoise= 
m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.0011;
+-raw.imgdata.params.cfaline  = true;
+-break;
+-}
+-
+-case RawDecodingSettings::IMPULSENR:
+-{
+-// (100 - 1000) => (0.005 - 0.05) conversion.
+-raw.imgdata.params.lclean   = 
m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
+-raw.imgdata.params.cclean   = 
m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
+-raw.imgdata.params.cfa_clean= true;
+-break;
+-}
+ default:   // No Noise Reduction
+ {
+ raw.imgdata.params.threshold= 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
+-raw.imgdata.params.linenoise= 0;
+-raw.imgdata.params.cfaline  = false;
+-raw.imgdata.params.lclean   = 0;
+-raw.imgdata.params.cclean   = 0;
+-raw.imgdata.params.cfa_clean= false;
+ break;
+ }
+ }
+ 
+-// Chromatic aberration correction.
+-raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
+-raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
+-raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
+-
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
+ raw.imgdata.params.exp_shift  =

[arch-commits] Commit in krita/repos (3 files)

2018-08-18 Thread Antonio Rojas via arch-commits 
Date: Saturday, August 18, 2018 @ 10:51:05
  Author: arojas
Revision: 332245

archrelease: copy trunk to staging-x86_64

Added:
  krita/repos/staging-x86_64/
  krita/repos/staging-x86_64/PKGBUILD
(from rev 332244, krita/trunk/PKGBUILD)
  krita/repos/staging-x86_64/krita-libraw-0.19.patch
(from rev 332244, krita/trunk/krita-libraw-0.19.patch)

-+
 PKGBUILD|   43 
 krita-libraw-0.19.patch |   54 ++
 2 files changed, 97 insertions(+)

Copied: krita/repos/staging-x86_64/PKGBUILD (from rev 332244, 
krita/trunk/PKGBUILD)
===
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-08-18 10:51:05 UTC (rev 332245)
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 262594 2016-03-26 20:49:29Z arojas $
+# Maintainer: Antonio Rojas 
+
+pkgname=krita
+pkgver=4.1.1
+pkgrel=3
+pkgdesc="Edit and paint images"
+arch=(x86_64)
+url="https://krita.org;
+license=(GPL3)
+depends=(kio kitemmodels gsl libraw exiv2 openexr fftw curl boost-libs giflib 
qt5-declarative hicolor-icon-theme)
+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'
+"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-libraw-0.19.patch)
+sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3'
+'SKIP'
+'975b33492764f80f3b462a2bc589996f97ab1d7e667139023345e7eec40762ab')
+validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krita-libraw-0.19.patch # Remove features no longer 
available in libraw 0.19
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krita/repos/staging-x86_64/krita-libraw-0.19.patch (from rev 332244, 
krita/trunk/krita-libraw-0.19.patch)
===
--- staging-x86_64/krita-libraw-0.19.patch  (rev 0)
+++ staging-x86_64/krita-libraw-0.19.patch  2018-08-18 10:51:05 UTC (rev 
332245)
@@ -0,0 +1,54 @@
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..cdf5b507ec 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
 b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
+-case RawDecodingSettings::LINENR:
+-{
+-// (100 - 1000) => (0.001 - 0.02) conversion.
+-raw.imgdata.params.linenoise= 
m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.0011;
+-raw.imgdata.params.cfaline  = true;
+-break;
+-}
+-
+-case RawDecodingSettings::IMPULSENR:
+-{
+-// (100 - 1000) => (0.005 - 0.05) conversion.
+-raw.imgdata.params.lclean   = 
m_parent->m_rawDecodingSettings.NRThreshold * 5E-5;
+-raw.imgdata.params.cclean   = 
m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5;
+-raw.imgdata.params.cfa_clean= true;
+-break;
+-}
+ default:   // No Noise Reduction
+ {
+ raw.imgdata.params.threshold= 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
+-raw.imgdata.params.linenoise= 0;
+-raw.imgdata.params.cfaline  = false;
+-raw.imgdata.params.lclean   = 0;
+-raw.imgdata.params.cclean   = 0;
+-raw.imgdata.params.cfa_clean= false;
+ break;
+ }
+ }
+ 
+-// Chromatic aberration correction.
+-raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
+-raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
+-raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
+-
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
+ raw.imgdata.params.exp_shift  =