amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: krita: Fix build with xsimd 13.

Browse source 
* 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
This commit is contained in:
Zheng Junjie 2025-04-15 22:10:03 +08:00
parent 8febfa472c
commit ff8f95cdb3
No known key found for this signature in database
GPG key ID: 3B5AA993E1A2DFF0
3 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -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 \

3
gnu/packages/kde.scm
View file

@ -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

29
gnu/packages/patches/krita-xsimd-13-compat.patch Normal file
View file

@ -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