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

[Antonio Rojas]

    Date: Wednesday, June 17, 2020 @ 19:40:12
  Author: arojas
Revision: 389447

Update to 4.3.0

Modified:
  krita/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-17 19:00:41 UTC (rev 389446)
+++ PKGBUILD	2020-06-17 19:40:12 UTC (rev 389447)
@@ -1,14 +1,15 @@
 # Maintainer: Antonio Rojas <arojas at archlinux,org>
 
 pkgname=krita
-pkgver=4.2.9
-pkgrel=6
+_pkgver=4.3.0
+pkgver=${_pkgver/-/}
+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 boost-libs giflib hicolor-icon-theme)
+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'
@@ -15,35 +16,23 @@
             "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"
-         krita-qt-5.15.patch::"https://invent.kde.org/graphics/krita/-/commit/d5bb12ac.patch")
-sha256sums=('9f85bb81eaf4976af57352a482af1fdb86f338051a991f6f43976e0b65956da8'
-            'SKIP'
-            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
-            '6477ceec976d376172cc82a5a8bf85938a7dffd924286fa79e64ccdab8c901eb'
-            '8fac35357e6f69f919d47e600cc6dff64f08665bed4853219043949032e19370')
+source=("https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz"
+         krita-pyqt5-sip5.patch)
+sha256sums=('d071887c73bffbdc179054826b9752f5e5ab43fdcd9ffdd0402e9ab2ceee4bda'
+            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation at krita.org>
 
 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
-  patch -p1 -i ../krita-qt-5.15.patch # Fix build with Qt 5.15
+  patch -d $pkgname-$_pkgver -p1 -i ../krita-pyqt5-sip5.patch # Fix sip include dir when PyQt5 is compiled with SIP 5
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$_pkgver \
     -DBUILD_TESTING=OFF \
     -DBUILD_KRITA_QT_DESIGNER_PLUGINS=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }