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

[Antonio Rojas via arch-commits]

Date: Monday, March 23, 2020 @ 14:29:32
  Author: arojas
Revision: 378407

Update to 4.2.9

Modified:
  krita/trunk/PKGBUILD
  krita/trunk/krita-pyqt5-sip5.patch

+
 PKGBUILD   |   19 ++-
 krita-pyqt5-sip5.patch |   12 ++--
 2 files changed, 12 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-23 14:20:52 UTC (rev 378406)
+++ PKGBUILD2020-03-23 14:29:32 UTC (rev 378407)
@@ -1,14 +1,14 @@
 # Maintainer: Antonio Rojas 
 
 pkgname=krita
-pkgver=4.2.8.2
-pkgrel=2
+pkgver=4.2.9
+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 quazip
- gsl libraw exiv2 openexr fftw curl boost-libs giflib 
hicolor-icon-theme desktop-file-utils)
+ 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'
@@ -15,15 +15,11 @@
 "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}
- 
kdebug-410867.patch::"https://invent.kde.org/kde/krita/commit/ca07d42c.patch;
- 
kdebug-414672.patch::"https://invent.kde.org/kde/krita/commit/2dc2ed5f.patch;
+source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}
  krita-pyqt5-sip5.patch)
-sha256sums=('80f741fa11245ff20a99f529f5f62def17791f3ad2c9aec5c5cf5440ae1fcba7'
+sha256sums=('9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8'
 'SKIP'
-'cfc9c7b2accbb730be3d9e2c92e5d501d2e3465841c97efae84602987e8cae3b'
-'181802a9273133a654f6aac2b1760b91beffa8e631b2aa162b5b10d342d5f712'
-'68ad86663cabc05eca84bbb3fab367e86febddfb408e90d0733ecb0ccdf499eb')
+'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

 
 prepare() {
@@ -30,9 +26,6 @@
   mkdir -p build
 
   cd $pkgname-$pkgver
-  patch -p1 -i ../kdebug-410867.patch # Fix crash on close
-  patch -p1 -i ../kdebug-414672.patch # Fix crash on transform tool
-
   patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is 
compiled with SIP 5
 }
 

Modified: krita-pyqt5-sip5.patch
===
--- krita-pyqt5-sip5.patch  2020-03-23 14:20:52 UTC (rev 378406)
+++ krita-pyqt5-sip5.patch  2020-03-23 14:29:32 UTC (rev 378407)
@@ -2,16 +2,16 @@
 index 5849f40868..a42ba6c624 100644
 --- a/cmake/modules/FindPyQt5.py
 +++ b/cmake/modules/FindPyQt5.py
-@@ -3,7 +3,7 @@
+@@ -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 PyQt5.Qt
 -import sys
 +import sys, site
- import os.path
+ import os
  
- print("pyqt_version:%06.0x" % PyQt5.Qt.PYQT_VERSION)
-@@ -30,7 +30,7 @@ except ValueError:
+ try:
+@@ -41,7 +41,7 @@ except ValueError:
  pass
  
  # FIXME This next line is just a little bit too crude.
@@ -19,4 +19,4 @@
 +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.Qt.PYQT_CONFIGURATION["sip_flags"])
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])

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

[Antonio Rojas via arch-commits]

Date: Monday, December 16, 2019 @ 11:56:53
  Author: arojas
Revision: 371566

Fix build with pyqt5 compiled with sip5

Added:
  krita/trunk/krita-pyqt5-sip5.patch
Modified:
  krita/trunk/PKGBUILD

+
 PKGBUILD   |8 ++--
 krita-pyqt5-sip5.patch |   22 ++
 2 files changed, 28 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-16 11:56:51 UTC (rev 371565)
+++ PKGBUILD2019-12-16 11:56:53 UTC (rev 371566)
@@ -17,11 +17,13 @@
 replaces=(calligra-krita krita-l10n)
 
source=("https://download.kde.org/stable/krita/${pkgver%.*}/$pkgname-$pkgver.tar.gz"{,.sig}
  
kdebug-410867.patch::"https://invent.kde.org/kde/krita/commit/ca07d42c.patch;
- 
kdebug-414672.patch::"https://invent.kde.org/kde/krita/commit/2dc2ed5f.patch;)
+ 
kdebug-414672.patch::"https://invent.kde.org/kde/krita/commit/2dc2ed5f.patch;
+ krita-pyqt5-sip5.patch)
 sha256sums=('80f741fa11245ff20a99f529f5f62def17791f3ad2c9aec5c5cf5440ae1fcba7'
 'SKIP'
 'cfc9c7b2accbb730be3d9e2c92e5d501d2e3465841c97efae84602987e8cae3b'
-'181802a9273133a654f6aac2b1760b91beffa8e631b2aa162b5b10d342d5f712')
+'181802a9273133a654f6aac2b1760b91beffa8e631b2aa162b5b10d342d5f712'
+'68ad86663cabc05eca84bbb3fab367e86febddfb408e90d0733ecb0ccdf499eb')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt 

 
 prepare() {
@@ -30,6 +32,8 @@
   cd $pkgname-$pkgver
   patch -p1 -i ../kdebug-410867.patch # Fix crash on close
   patch -p1 -i ../kdebug-414672.patch # Fix crash on transform tool
+
+  patch -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is 
compiled with SIP 5
 }
 
 build() {

Added: krita-pyqt5-sip5.patch
===
--- krita-pyqt5-sip5.patch  (rev 0)
+++ krita-pyqt5-sip5.patch  2019-12-16 11:56:53 UTC (rev 371566)
@@ -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
+@@ -3,7 +3,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+ import PyQt5.Qt
+-import sys
++import sys, site
+ import os.path
+ 
+ print("pyqt_version:%06.0x" % PyQt5.Qt.PYQT_VERSION)
+@@ -30,7 +30,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.Qt.PYQT_CONFIGURATION["sip_flags"])