git » krita.git » commit ec48030

Rebuild with libjxl 0.9 for real

author Antonio Rojas
2024-01-20 17:38:19 UTC
committer Antonio Rojas
2024-01-20 17:38:19 UTC
parent b25ec7642ab76edf0ad3d326a9b6706ff2da7dad
Rebuild with libjxl 0.9 for real

Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/issues/3
.SRCINFO +3 -1
PKGBUILD +6 -3 
diff --git a/.SRCINFO b/.SRCINFO
index 1600f62..8fdd603 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = krita
 	pkgdesc = Edit and paint images
 	pkgver = 5.2.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://krita.org
 	arch = x86_64
 	license = GPL3
@@ -72,6 +72,7 @@ pkgbase = krita
 	source = https://download.kde.org/stable/krita/5.2.2/krita-5.2.2.tar.gz.sig
 	source = xsimd-12.patch
 	source = sip-6.8.patch
+	source = https://invent.kde.org/graphics/krita/-/commit/ace7edcc.patch
 	validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
 	validpgpkeys = E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F
 	validpgpkeys = 064182440C674D9F8D0F6F8B4DA79EDA231C852B
@@ -79,5 +80,6 @@ pkgbase = krita
 	sha256sums = SKIP
 	sha256sums = bdf2fd09b65dfae8fd7817b302486d6b82df8c0d56fd980afac019a82d3cd716
 	sha256sums = bb3b503993030bb98a99c6a0376c65ee74d0c32c1e8932110698682eed1e3d3c
+	sha256sums = da53f913276982ada75cc4dac2e714ab90588b1d0b5bd94905eebe231e6072d6
 
 pkgname = krita
diff --git a/PKGBUILD b/PKGBUILD
index 3829afd..9ee9e9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=krita
 _pkgver=5.2.2
 pkgver=${_pkgver/-/}
-pkgrel=3
+pkgrel=4
 pkgdesc='Edit and paint images'
 arch=(x86_64)
 url='https://krita.org'
@@ -73,11 +73,13 @@ optdepends=('kimageformats5: PSD support'
             'python-pyqt5: for the Python plugins')
 source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
         xsimd-12.patch
-        sip-6.8.patch)
+        sip-6.8.patch
+        https://invent.kde.org/graphics/krita/-/commit/ace7edcc.patch)
 sha256sums=('c1d2e4a36d7d8aa296d021e52be493cc679d3fe5e8aa4fc13c434d33e8154ce2'
             'SKIP'
             'bdf2fd09b65dfae8fd7817b302486d6b82df8c0d56fd980afac019a82d3cd716'
-            'bb3b503993030bb98a99c6a0376c65ee74d0c32c1e8932110698682eed1e3d3c')
+            'bb3b503993030bb98a99c6a0376c65ee74d0c32c1e8932110698682eed1e3d3c'
+            'da53f913276982ada75cc4dac2e714ab90588b1d0b5bd94905eebe231e6072d6')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
@@ -85,6 +87,7 @@ validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <fou
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < sip-6.8.patch
   patch -d $pkgname-$_pkgver -p1 < xsimd-12.patch
+  patch -d $pkgname-$_pkgver -p1 < ace7edcc.patch # Fix build with libjxl 0.9
 }
 
 build() {