3 files changed, 4 insertions(+), 50 deletions(-)

M gnu/local.mk
M gnu/packages/kde-graphics.scm
D gnu/packages/patches/krita-xsimd-13-compat.patch

@@ 1709,7 1709,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch	\
   %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch		\
   %D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch	\
-  %D%/packages/patches/krita-xsimd-13-compat.patch	\
   %D%/packages/patches/kvantum-1.1.5-xdg-dirs-support.patch	\
   %D%/packages/patches/kwayland-5-fix-build.patch		\
   %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\

@@ 190,7 190,7 @@ painting, image manipulating and icon editing.")
 (define-public krita
   (package
     (name "krita")
-    (version "5.2.9")
+    (version "5.2.13")
     (source
      (origin
        (method url-fetch)


@@ 198,30 198,13 @@ painting, image manipulating and icon editing.")
              "mirror://kde/stable/krita/" version "/krita-" version
              ".tar.gz"))
        (sha256
-        (base32 "19nb98rh8j9jdd8hz8m56hrpljqv74p7j1k5plqnkwpbdmaszj88"))
-       (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch"
-                                "krita-xsimd-13-compat.patch"))))
+        (base32 "0camc7wk3285sxaam6idaxifx4b6hxv3vhgihh3g2awyr4q9946b"))
+       (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch"))))
     (build-system qt-build-system)
     (arguments
      `(#:tests? #f
        #:configure-flags (list "-DCMAKE_CXX_FLAGS=-fPIC")
        #:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'patch-raqm
-                    (lambda _
-                      ;; Uncomment the substitute block underneath this once the
-                      ;; libraqm variable is patched upstream. This will force it to
-                      ;; use the Guix provided library.
-                      ;; (substitute* "CMakeLists.txt"
-                      ;; (("add_subdirectory\\(3rdparty_vendor\\)")
-                      ;; "find_package(Raqm 0.10.1 REQUIRED)"))
-                      ;; (delete-file-recursively "3rdparty_vendor"))
-                      ;;
-                      ;; Patch the supplied vendor Raqm library (v0.10.1) to use fPIC
-                      (substitute* "3rdparty_vendor/raqm/CMakeLists.txt"
-                        (("set\\(CMAKE_AUTOMOC OFF\\)")
-                         "set(CMAKE_AUTOMOC OFF)
-set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -fPIC\" )
-set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))
                   (add-after 'install 'wrap-bin
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let* ((out (assoc-ref outputs "out"))


@@ 299,6 282,7 @@ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))
            qtdeclarative-5
            qtmultimedia-5
            qtsvg-5
+           qtwayland-5
            qtx11extras
            quazip-5
            sdl2

@@ 1,29 0,0 @@
-Adjust from https://invent.kde.org/graphics/krita/-/merge_requests/2302.patch
-
-From de9233722280cd11bcbd0f0cfb9544e476690fc0 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Sat, 28 Dec 2024 20:05:46 +0200
-Subject: [PATCH] Remove reference to unknown member best of the
- xsimd::available_architectures()
-
-- Neither xsimd version 13.0 nor 13.1 has a best member
----
- benchmarks/kis_composition_benchmark.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/benchmarks/kis_composition_benchmark.cpp b/benchmarks/kis_composition_benchmark.cpp
-index 1ae398fa74d..12baa7be5b2 100644
---- a/benchmarks/kis_composition_benchmark.cpp
-+++ b/benchmarks/kis_composition_benchmark.cpp
-@@ -640,7 +640,7 @@ void KisCompositionBenchmark::detectBuildArchitecture()
-     qDebug() << ppVar(supported_architectures().contains<avx512bw>());
-     qDebug() << ppVar(supported_architectures().contains<avx512dq>());
-     qDebug() << ppVar(supported_architectures().contains<avx512cd>());
--    qDebug().nospace() << "running on " << hex << "0x" << xsimd::available_architectures().best;
-+    //    qDebug().nospace() << "running on " << hex << "0x" << xsimd::available_architectures().best;
- #endif
- }
- 
--- 
-GitLab
-