Download raw body.
switch editors/calligra to C++20
Hi,
this switches editors/calligra to be built with C++20 (requirement of
poppler-2024.05.0). It needs the update of math/eigen3 I just sent.
ok?
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/calligra/Makefile,v
diff -u -p -r1.59 Makefile
--- Makefile 1 Jan 2024 19:43:03 -0000 1.59
+++ Makefile 10 May 2024 17:53:55 -0000
@@ -3,7 +3,7 @@ HOMEPAGE = https://www.calligra.org
VERSION = 3.2.1
DISTNAME = calligra-${VERSION}
CATEGORIES = editors
-REVISION = 11
+REVISION = 12
SHARED_LIBS = RtfReader 51.0 # 0.0
SHARED_LIBS += basicflakes 50.0 # 0.0
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/editors/calligra/patches/patch-CMakeLists_txt,v
diff -u -p -r1.8 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 28 Mar 2022 20:06:46 -0000 1.8
+++ patches/patch-CMakeLists_txt 10 May 2024 17:53:55 -0000
@@ -1,5 +1,5 @@
- Fix build with OpenEXR>=3
-- Switch to C++17
+- Switch to C++20
- Update Cmake and deps, Fix Freetype and FontConfig Linkage,
from upstream
- disable GSL support for now. devel/gsl needs an update
@@ -21,7 +21,7 @@ Index: CMakeLists.txt
+#else ()
+# set (CMAKE_CXX_STANDARD 11)
+#endif ()
-+set (CMAKE_CXX_STANDARD 17)
++set (CMAKE_CXX_STANDARD 20)
############
#############
Index: patches/patch-sheets_functions_reference_cpp
===================================================================
RCS file: patches/patch-sheets_functions_reference_cpp
diff -N patches/patch-sheets_functions_reference_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sheets_functions_reference_cpp 10 May 2024 17:53:55 -0000
@@ -0,0 +1,15 @@
+Index: sheets/functions/reference.cpp
+--- sheets/functions/reference.cpp.orig
++++ sheets/functions/reference.cpp
+@@ -415,11 +415,6 @@ Value func_indirect(valVector args, ValueCalc *calc, F
+ if (ref.isEmpty())
+ return Value::errorVALUE();
+
+- if (r1c1) {
+- // TODO: translate the r1c1 style to a1 style
+- ref = ref;
+- }
+-
+ const Calligra::Sheets::Region region(ref, e->sheet->map(), e->sheet);
+ if (!region.isValid() || !region.isSingular())
+ return Value::errorVALUE();
Index: patches/patch-sheets_functions_statistical_cpp
===================================================================
RCS file: patches/patch-sheets_functions_statistical_cpp
diff -N patches/patch-sheets_functions_statistical_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sheets_functions_statistical_cpp 10 May 2024 17:53:55 -0000
@@ -0,0 +1,19 @@
+Index: sheets/functions/statistical.cpp
+--- sheets/functions/statistical.cpp.orig
++++ sheets/functions/statistical.cpp
+@@ -1633,7 +1633,6 @@ Value func_growth(valVector args, ValueCalc *calc, Fun
+ double sumX = 0.0;
+ double sumSqrX = 0.0;
+ double sumY = 0.0;
+- double sumSqrY = 0.0;
+ double sumXY = 0.0;
+ double valX, valY;
+
+@@ -1647,7 +1646,6 @@ Value func_growth(valVector args, ValueCalc *calc, Fun
+ sumX += valX;
+ sumSqrX += valX * valX;
+ sumY += valY;
+- sumSqrY += valY * valY;
+ sumXY += valX * valY;
+ ++count;
+ }
switch editors/calligra to C++20