[neon/snap-packaging/kf6-core-sdk] /: iPatch to fix isnan error for kcalendarcore.

Scarlett Moore null at kde.org
Mon Jun 10 18:30:21 BST 2024


Git commit d9e14d6835a9131ea899a4a67256b3b3da39fcc8 by Scarlett Moore.
Committed on 10/06/2024 at 17:29.
Pushed by scarlettmoore into branch 'master'.

iPatch to fix isnan error for kcalendarcore.

A  +12   -0    patches/kcalendarcore/fix_isnan_error.patch
A  +1    -0    patches/kcalendarcore/series
M  +5    -0    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kf6-core-sdk/-/commit/d9e14d6835a9131ea899a4a67256b3b3da39fcc8

diff --git a/patches/kcalendarcore/fix_isnan_error.patch b/patches/kcalendarcore/fix_isnan_error.patch
new file mode 100644
index 0000000..db82051
--- /dev/null
+++ b/patches/kcalendarcore/fix_isnan_error.patch
@@ -0,0 +1,12 @@
+diff --git a/src/incidence.cpp b/src/incidence.cpp
+index 81cad1611..40a026262 100644
+--- a/src/incidence.cpp
++++ b/src/incidence.cpp
+@@ -26,6 +26,7 @@
+ #include "utils_p.h"
+ 
+ #include <math.h>
++#include <cmath>
+ 
+ #include <QStringList>
+ #include <QTextDocument> // for .toHtmlEscaped() and Qt::mightBeRichText()
diff --git a/patches/kcalendarcore/series b/patches/kcalendarcore/series
new file mode 100644
index 0000000..31138b5
--- /dev/null
+++ b/patches/kcalendarcore/series
@@ -0,0 +1 @@
+fix_isnan_error.patch
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2b0575a..620aa51 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1522,6 +1522,11 @@ parts:
         cmake-generator: Ninja
         cmake-parameters: *cmakeparameters-ffmpeg
         build-environment: *buildenvironment
+        override-pull: |
+            craftctl default
+            while read -r PATCHFILE ; do
+                patch -p1 < "$CRAFT_PROJECT_DIR/patches/kcalendarcore/$PATCHFILE"
+            done < $CRAFT_PROJECT_DIR/patches/kcalendarcore/series
     kholidays:
         after:
         - extra-cmake-modules


More information about the Neon-commits mailing list