diff options
| author | Zheng Junjie <z572@z572.online> | 2025-04-15 22:10:03 +0800 |
|---|---|---|
| committer | Zheng Junjie <z572@z572.online> | 2025-04-16 13:25:24 +0800 |
| commit | ff8f95cdb3603295909ab9824c235ac7b65a6c54 (patch) | |
| tree | 9a485a6aee93a752a48baf57caae2df407bdbf52 | |
| parent | 8febfa472c13a2e60ec834184304c949949ab23c (diff) | |
| download | guix-ff8f95cdb3603295909ab9824c235ac7b65a6c54.tar.gz guix-ff8f95cdb3603295909ab9824c235ac7b65a6c54.zip | |
gnu: krita: Fix build with xsimd 13.
* gnu/packages/patches/krita-xsimd-13-compat.patch: New file.
* gnu/packages/kde.scm (krita): Use it.
* gnu/local.mk (dist_patch_DATA): Register it.
Change-Id: I446389755337deafceae8c0c3b2b5e5177a3b19f
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/kde.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/krita-xsimd-13-compat.patch | 29 |
3 files changed, 32 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 64ac95e8d1..d3b2d0e2ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1702,6 +1702,7 @@ 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/kvmfr-linux-module-fix-build.patch \ %D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\ %D%/packages/patches/laby-make-install.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index cb982e6b75..86f83ceced 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -955,7 +955,8 @@ painting, image manipulating and icon editing.") ".tar.gz")) (sha256 (base32 "19nb98rh8j9jdd8hz8m56hrpljqv74p7j1k5plqnkwpbdmaszj88")) - (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch")))) + (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch" + "krita-xsimd-13-compat.patch")))) (build-system qt-build-system) (arguments `(#:tests? #f diff --git a/gnu/packages/patches/krita-xsimd-13-compat.patch b/gnu/packages/patches/krita-xsimd-13-compat.patch new file mode 100644 index 0000000000..5487253b9b --- /dev/null +++ b/gnu/packages/patches/krita-xsimd-13-compat.patch @@ -0,0 +1,29 @@ +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 + |