[bug#52755] [PATCH 0/5] Update Krita.

[bug#52755] [PATCH 0/5] Update Krita.

[Vinicius Monego]

Vinicius Monego (5):
  gnu: Add kseexpr.
  gnu: krita: Add optional dependencies.
  gnu: krita: Update to 5.0.0.
  gnu: krita: Add optional dependencies.
  gnu: krita: Switch to qt-build-system.

 gnu/packages/kde.scm | 84 +++++++++++++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 32 deletions(-)


base-commit: a296b5fff9f182da7c7b67cc7bdba0957623e650
-- 
2.30.2

[bug#52755] [PATCH 1/5] gnu: Add kseexpr.

[Vinicius Monego]

* gnu/packages/kde.scm (kseexpr): New variable.
---
 gnu/packages/kde.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 851a3495b7..3f14841d11 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -47,6 +47,7 @@
   #:use-module (gnu packages audio)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages code)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages compression)
@@ -442,6 +443,32 @@ a module for implementing ODF Gantt charts, which are bar charts that
 illustrate project schedules.")
     (license license:gpl2+)))
 
+(define-public kseexpr
+  (package
+    (name "kseexpr")
+    (version "4.0.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://invent.kde.org/graphics/kseexpr")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "088q3kkv2wq426w000iq14wy3a45rrnn0bmsdks6caz4vq04ccay"))))
+    (build-system qt-build-system)
+    (arguments
+     `(#:configure-flags (list "-DBUILD_TESTS=ON"))) ; disabled by default
+    (native-inputs
+     (list bison doxygen extra-cmake-modules flex googletest))
+    (inputs
+     (list ki18n libpng qtbase-5))
+    (home-page "https://invent.kde.org/graphics/kseexpr")
+    (synopsis "Embeddable expression evaluation engine")
+    (description "This package contains the fork of Disney Animation's SeExpr
+expression library, that is used in Krita.")
+    (license license:gpl3+)))
+
 (define-public krita
   (package
     (name "krita")
-- 
2.30.2

[bug#52755] [PATCH 2/5] gnu: krita: Add optional dependencies.

[Vinicius Monego]

* gnu/packages/kde.scm (krita)[inputs]: Add giflib, kseexpr, libheif,
opencolorio, openjpeg, python, python-pyqt, python-sip.
---
 gnu/packages/kde.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 3f14841d11..a1afad48a8 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -66,6 +66,7 @@
   #:use-module (gnu packages gps)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages image-processing)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-pim)
   #:use-module (gnu packages kde-plasma)
@@ -517,6 +518,7 @@ expression library, that is used in Krita.")
      (list boost
            exiv2
            fftw
+           giflib
            gsl
            ilmbase
            karchive
@@ -529,20 +531,27 @@ expression library, that is used in Krita.")
            kiconthemes
            kio
            kitemviews
+           kseexpr
            kwidgetsaddons
            kwindowsystem
            kxmlgui
            lcms
            libjpeg-turbo
+           libheif
            libpng
            libraw-0.18
            libtiff
            libx11
            libxcb
            libxi
+           opencolorio
            openexr-2
+           openjpeg
            perl
            poppler-qt5
+           python
+           python-pyqt
+           python-sip
            qtbase-5
            qtdeclarative
            qtmultimedia
-- 
2.30.2

[bug#52755] [PATCH 3/5] gnu: krita: Update to 5.0.0.

[Vinicius Monego]

* gnu/packages/kde.scm (krita): Update to 5.0.0.
[source]: Make some cosmetic changes.
---
 gnu/packages/kde.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index a1afad48a8..60795bc304 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -473,15 +473,15 @@ expression library, that is used in Krita.")
 (define-public krita
   (package
     (name "krita")
-    (version "4.4.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://kde/stable/krita/" version
-                    "/krita-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"))))
+    (version "5.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://kde/stable/krita/" version "/krita-" version
+             ".tar.gz"))
+       (sha256
+        (base32 "0mycxrqp944kp5bhlv8c1x1ikn9av1q7dhzl32jd6gxbphyq7mc4"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f
-- 
2.30.2

[bug#52755] [PATCH 4/5] gnu: krita: Add optional dependencies.

[Vinicius Monego]

* gnu/packages/kde.scm (krita)[arguments]<#:configure-flags>: Don't set
-DCMAKE_CXX_FLAGS as it's not required for OpenEXR 3.
[inputs]: Remove ilmbase, openexr-2. Add imath, libmypaint, libwebp, openexr.
---
 gnu/packages/kde.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 60795bc304..5634119369 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -61,6 +61,7 @@
   #:use-module (gnu packages geo)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gimp)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gps)
@@ -485,11 +486,7 @@ expression library, that is used in Krita.")
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f
-       #:configure-flags
-       (list "-DBUILD_TESTING=OFF"
-             (string-append "-DCMAKE_CXX_FLAGS=-I"
-                            (assoc-ref %build-inputs "openexr")
-                            "/include/OpenEXR"))
+       #:configure-flags (list "-DBUILD_TESTING=OFF")
        #:phases
        (modify-phases %standard-phases
          ;; Ensure that icons are found at runtime.
@@ -520,7 +517,7 @@ expression library, that is used in Krita.")
            fftw
            giflib
            gsl
-           ilmbase
+           imath
            karchive
            kcompletion
            kconfig
@@ -538,14 +535,16 @@ expression library, that is used in Krita.")
            lcms
            libjpeg-turbo
            libheif
+           libmypaint
            libpng
            libraw-0.18
            libtiff
+           libwebp
            libx11
            libxcb
            libxi
            opencolorio
-           openexr-2
+           openexr
            openjpeg
            perl
            poppler-qt5
-- 
2.30.2

[bug#52755] [PATCH 5/5] gnu: krita: Switch to qt-build-system.

[Vinicius Monego]

* gnu/packages/kde.scm (krita)[build-system]: Switch to qt-build-system.
[arguments]<#:phases>: Remove 'wrap-executable phase that is performed by the
new build system.
---
 gnu/packages/kde.scm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 5634119369..8531e8683e 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -483,25 +483,10 @@ expression library, that is used in Krita.")
              ".tar.gz"))
        (sha256
         (base32 "0mycxrqp944kp5bhlv8c1x1ikn9av1q7dhzl32jd6gxbphyq7mc4"))))
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
     (arguments
      `(#:tests? #f
-       #:configure-flags (list "-DBUILD_TESTING=OFF")
-       #:phases
-       (modify-phases %standard-phases
-         ;; Ensure that icons are found at runtime.
-         ;; This works around <https://bugs.gnu.org/22138>.
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (qt '("qtbase" "qtsvg")))
-               (wrap-program (string-append out "/bin/krita")
-                 `("QT_PLUGIN_PATH" ":" prefix
-                   ,(map (lambda (label)
-                           (string-append (assoc-ref inputs label)
-                                          "/lib/qt5/plugins/"))
-                         qt)))
-               #t))))))
+       #:configure-flags (list "-DBUILD_TESTING=OFF")))
     (native-inputs
      (list curl
            eigen
-- 
2.30.2

bug#52755: [PATCH 0/5] Update Krita.

[Nicolas Goaziou]

Hello,

Vinicius Monego <monego@posteo.net> writes:

> Vinicius Monego (5):
>   gnu: Add kseexpr.
>   gnu: krita: Add optional dependencies.
>   gnu: krita: Update to 5.0.0.
>   gnu: krita: Add optional dependencies.
>   gnu: krita: Switch to qt-build-system.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou