1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
diff --git a/configure.ac b/configure.ac
index 981056d..cfc2dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ AC_LANG([C++])
# Configure options
# =================
AC_ARG_WITH([mdds],
- AS_HELP_STRING([--with-mdds=2.1|2.0|1.5|1.4|1.2|1.0|0.x], [Specify which version of mdds to use (2.1 is the default)]),
- [], [with_mdds="2.1"])
+ AS_HELP_STRING([--with-mdds=3.0], [Specify which version of mdds to use (3.0 is the default)]),
+ [], [with_mdds="3.0"])
# ===========================
# Find required base packages
@@ -126,26 +126,7 @@ AC_SUBST([GLM_CFLAGS])
# =========
# Find mdds
# =========
-AS_IF([test "$with_mdds" != "0.x"],
- [PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])],
- [
- PKG_CHECK_MODULES([MDDS], [mdds])
- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <mdds/flat_segment_tree.hpp>
- struct Value {};
- mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
- ])], [
- AC_MSG_RESULT([yes])
- ], [
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([please install mdds >= 0.12.1])
- ])
- CPPFLAGS="$old_CPPFLAGS"
- ]
-)
+PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
# =================================
# Libtool/Version Makefile settings
From ba5347a04900db963bb667d2cc86fe571e8930ff Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Fri, 7 Feb 2025 15:23:36 -0600
Subject: [PATCH] Fix build with mdds-3.0
Change-Id: Ib1076d00c23d80c0de6187e2e1e2894cadeee968
---
src/lib/IWORKTable.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/IWORKTable.cpp b/src/lib/IWORKTable.cpp
index bde1011..a68f549 100644
--- a/src/lib/IWORKTable.cpp
+++ b/src/lib/IWORKTable.cpp
@@ -168,7 +168,7 @@ void parseDateTimeFormat(std::string const &format, librevenge::RVNGPropertyList
void writeBorder(librevenge::RVNGPropertyList &props, const char *name, IWORKGridLine_t &line, unsigned index)
{
- if (!line.is_tree_valid())
+ if (!line.valid_tree())
line.build_tree();
IWORKStylePtr_t style;
--
2.47.2
|
