extra/krita to 4.4.8-3

extra/krita/PKGBUILD

@@ -6,13 +6,13 @@
 pkgname=krita
 _pkgver=4.4.8
 pkgver=${_pkgver/-/}
-pkgrel=2
+pkgrel=3
 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 giflib openjpeg2 opencolorio1 hicolor-icon-theme)
+         gsl libraw exiv2 openexr fftw giflib openjpeg2 opencolorio hicolor-icon-theme)
 makedepends=(extra-cmake-modules kdoctools boost eigen poppler-qt5 python-pyqt5 libheif
              qt5-tools sip kseexpr)
 optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
@@ -20,21 +20,18 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             'kseexpr: SeExpr generator layer' 'kimageformats: PSD support')
 source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
         krita-openexr3.patch
-        https://invent.kde.org/graphics/krita/-/commit/86dc361a.patch
+        krita-opencolorio2.patch)
-        krita-opencolorio1.patch)
 sha256sums=('bcc68a5711d92515d6553611a0bddd53f3259843fd3534b9b3e535d7ed430df8'
             'SKIP'
             '3825dac0317f4501c8dd8b0844540bbd0841702cd15903ce3a659755eaa226f5'
-            '00c4e519bbef9575f8d4ae2183aff1da3ad9f44d324c1c1d45a7803368a1a008'
+            'ca24ada0e2bd620e8abe74eff7adda3526925a9b61a968849d3885084bc13816')
-            '2f892449e20abc370fe3dc8b5dd12f9964d1d402a909e775641e28685b1719b3')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation@krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov (main key) <dimula73@gmail.com>
               '064182440C674D9F8D0F6F8B4DA79EDA231C852B') # Stichting Krita Foundation <foundation@krita.org>
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < krita-openexr3.patch # Fix build with OpenEXR 3
-  patch -d $pkgname-$_pkgver -p1 < 86dc361a.patch # Fix OCIO include dir detection
+  patch -d $pkgname-$_pkgver -p1 < krita-opencolorio2.patch # Fix build with OCIO 2
-  patch -d $pkgname-$_pkgver -p1 < krita-opencolorio1.patch # Fix build with renamed OCIO library
 }
 
 build() {

extra/krita/krita-opencolorio1.patch

@@ -1,18 +0,0 @@
-diff --git a/cmake/modules/FindOCIO.cmake b/cmake/modules/FindOCIO.cmake
-index 89b404088c..02a8753221 100644
---- a/cmake/modules/FindOCIO.cmake
-+++ b/cmake/modules/FindOCIO.cmake
-@@ -34,11 +34,11 @@ find_path(OCIO_INCLUDE_DIR OpenColorIO.h
-         /usr/local/include
-         /sw/include
-         /opt/local/include
--        PATH_SUFFIXES OpenColorIO
-+        PATH_SUFFIXES OpenColorIO1
-         DOC "The directory where OpenColorIO/OpenColorIO.h resides"
- )
- 
--find_library(OCIO_LIBRARIES OpenColorIO
-+find_library(OCIO_LIBRARIES OpenColorIO1
-         PATHS
-         ${OCIO_LIBRARY_PATH}
-         ${OCIO_PATH}/lib/