Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / krita


Commits:
e532fa2b by Antonio Rojas at 2025-12-03T09:14:36+01:00
Fix build with xsimd 14

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + xsimd-14.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -70,6 +70,7 @@ pkgbase = krita
        source = 
https://download.kde.org/stable/krita/5.2.13/krita-5.2.13.tar.gz.sig
        source = sip-6.8.patch
        source = eigen-5.patch
+       source = xsimd-14.patch
        source = https://invent.kde.org/graphics/krita/-/commit/64487521.patch
        validpgpkeys = 05D00A8B73A686789E0A156858B9596C722EA3BD
        validpgpkeys = E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F
@@ -78,6 +79,7 @@ pkgbase = krita
        sha256sums = SKIP
        sha256sums = 
bb3b503993030bb98a99c6a0376c65ee74d0c32c1e8932110698682eed1e3d3c
        sha256sums = 
2c021e18347d6f895dd9a14d7cebc76b9e5349cb5554743a78650b26a12a0833
+       sha256sums = 
7de679527eed501242ac8bd661606cb1868058261b67165f053427ee357db7ae
        sha256sums = 
fef36702776ba599f66a75539d5e61ce6fbc3a2d26f66df9aea237361721cf55
 
 pkgname = krita


=====================================
PKGBUILD
=====================================
@@ -72,11 +72,13 @@ optdepends=('kimageformats5: PSD support'
 
source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
         sip-6.8.patch
         eigen-5.patch
+        xsimd-14.patch
         https://invent.kde.org/graphics/krita/-/commit/64487521.patch)
 sha256sums=('cb909430c99e2bf10684f1c13d76876691ee62572d9aaa54d7058931f9615531'
             'SKIP'
             'bb3b503993030bb98a99c6a0376c65ee74d0c32c1e8932110698682eed1e3d3c'
             '2c021e18347d6f895dd9a14d7cebc76b9e5349cb5554743a78650b26a12a0833'
+            'd52a6d31e98c1de730c3a5ead5239a786d1b6f3a1aec731f449e9f429a5b8a94'
             'fef36702776ba599f66a75539d5e61ce6fbc3a2d26f66df9aea237361721cf55')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt 
<[email protected]>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F'  # Dmitry Kazakov 
(main key) <[email protected]>
@@ -85,6 +87,7 @@ validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # 
Boudewijn Rempt <fou
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < sip-6.8.patch
   patch -d $pkgname-$_pkgver -p1 < eigen-5.patch
+  patch -d $pkgname-$_pkgver -p1 < xsimd-14.patch
   patch -d $pkgname-$_pkgver -p1 < 64487521.patch # Fix build with boost 1.89
 }
 


=====================================
xsimd-14.patch
=====================================
@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd8f9158a9..36f823a94f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1090,7 +1090,7 @@ endif()
+ ## write a version range in the find_package call. Instead we
+ ## should try all the supported versions manually
+ ##
+-foreach(xsimd_version 8.1.0 9 10 11 12 13)
++foreach(xsimd_version 8.1.0 9 10 11 12 13 14)
+     if(NOT xsimd_FOUND)
+         find_package(xsimd ${xsimd_version})
+     endif()
+diff --git a/libs/multiarch/xsimd_extensions/config/xsimd_arch.hpp 
b/libs/multiarch/xsimd_extensions/config/xsimd_arch.hpp
+index 840874936d..791e8ad32a 100644
+--- a/libs/multiarch/xsimd_extensions/config/xsimd_arch.hpp
++++ b/libs/multiarch/xsimd_extensions/config/xsimd_arch.hpp
+@@ -41,6 +41,9 @@
+ 
+ namespace xsimd
+ {
++# if XSIMD_VERSION_MAJOR >= 14
++using generic = common;
++# endif
+ #if !defined(HAVE_XSIMD) || defined(XSIMD_IMPL) && (XSIMD_IMPL & IMPL_MASK) 
== Scalar
+ using current_arch = generic;
+ #elif !defined(XSIMD_IMPL)



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/commit/e532fa2b2c345c7a829c849d7e69b032c95427c4

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/commit/e532fa2b2c345c7a829c849d7e69b032c95427c4
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to