4.4.0-beta1

3 files changed, 15 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c99ad90cb8da..eccae757c4aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = krita-beta
 	pkgdesc = Edit and paint images - beta release
-	pkgver = 4.3.0.beta2
+	pkgver = 4.4.0.beta1
 	pkgrel = 1
 	url = https://krita.org
 	arch = x86_64
@@ -20,14 +20,13 @@ pkgbase = krita-beta
 	depends = openexr
 	depends = poppler-qt5
 	depends = opencolorio
+	depends = libheif
+	depends = quazip
+	depends = giflib
 	provides = krita
 	conflicts = krita
-	source = https://download.kde.org/unstable/krita/4.3.0-beta2/krita-4.3.0-beta2.tar.xz
-	source = krita-pyqt5-sip5.patch
-	source = safe-assert.patch
-	sha256sums = 63479ea6b009bc55254ac2df7a043ebd659e5fe5db696e308e01bf1a56c89d32
-	sha256sums = ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8
-	sha256sums = 890edc92a297edbed001263b069767c34fdd51a45969ea12ae760cc4c8f98ee4
+	source = https://download.kde.org/unstable/krita/4.4.0-beta1/krita-4.4.0-beta1.tar.xz
+	sha256sums = e5254f9b5d84a7885ae8ef93fb79448acf0bf9f46fad1d537867419ddbf0455c
 
 pkgname = krita-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 2ff4be150a93..7ff432c80439 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,28 @@
-# Maintainer: Zanny <lordzanny@gmail.com>
+# Maintainer: zan <zan@420blaze.it>
 
 pkgname=krita-beta
-_basever=4.3.0
-_subver=beta2
+_basever=4.4.0
+_subver=beta1
 pkgver="$_basever.$_subver"
 pkgrel=1
 pkgdesc="Edit and paint images - beta release"
 arch=(x86_64)
 url="https://krita.org"
 license=(GPL3)
-depends=(kio fftw hicolor-icon-theme libraw gsl boost-libs exiv2 openexr poppler-qt5 opencolorio)
+depends=(kio fftw hicolor-icon-theme libraw gsl boost-libs exiv2 openexr poppler-qt5 opencolorio libheif quazip giflib)
 makedepends=(extra-cmake-modules kdoctools python boost eigen)
 optdepends=()
 provides=(krita)
 conflicts=(krita)
 _target="krita-$_basever-$_subver"
-source=("https://download.kde.org/unstable/krita/$_basever-$_subver/$_target.tar.xz"
-        'krita-pyqt5-sip5.patch'
-        'safe-assert.patch')
-sha256sums=('63479ea6b009bc55254ac2df7a043ebd659e5fe5db696e308e01bf1a56c89d32'
-            'ab2f33843d8cad31bc13e0eca7dc732cdbfed054924f25ed61102c0d0971c1d8'
-            '890edc92a297edbed001263b069767c34fdd51a45969ea12ae760cc4c8f98ee4')
-
-prepare() {
-  mkdir -p build
-  cd "$_target"
-  patch -Np1 -i ../krita-pyqt5-sip5.patch
-  patch -Np1 < ../safe-assert.patch
-}
+source=("https://download.kde.org/unstable/krita/$_basever-$_subver/$_target.tar.xz")
+sha256sums=('e5254f9b5d84a7885ae8ef93fb79448acf0bf9f46fad1d537867419ddbf0455c')
 
 build() {
-  cd build
-  cmake "../$_target"
-  make
+    cmake -B build -S $_target
+    cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir/" install
+    DESTDIR="$pkgdir" cmake --install build
 }
diff --git a/krita-pyqt5-sip5.patch b/krita-pyqt5-sip5.patch
deleted file mode 100644
index 5d88a3b623ac..000000000000
--- a/krita-pyqt5-sip5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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"])