git: c4c871be0fd4 - main - graphics/libetonyek01: update to MDDS-3.1

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Thu, 21 Aug 2025 11:58:10 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c4c871be0fd49fb688652a1aa8602a5d5721a4fe

commit c4c871be0fd49fb688652a1aa8602a5d5721a4fe
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-08-21 11:10:54 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-08-21 11:10:54 +0000

    graphics/libetonyek01: update to MDDS-3.1
---
 graphics/libetonyek01/Makefile                     |  4 +--
 graphics/libetonyek01/files/patch-configure        | 22 ++++++++++++++++
 .../libetonyek01/files/patch-src_lib_IWAParser.cpp | 29 ++++++++++++++++++++++
 .../files/patch-src_lib_IWORKTable.cpp             | 13 ++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile
index ec330333ec5a..12ba70dafce6 100644
--- a/graphics/libetonyek01/Makefile
+++ b/graphics/libetonyek01/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libetonyek
 DISTVERSION=	0.1.12
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	LODEV/${PORTNAME}
@@ -27,7 +27,7 @@ USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
-MDDS_VERSION=	2.1
+MDDS_VERSION=	3.1
 
 INSTALL_TARGET=	install-strip
 
diff --git a/graphics/libetonyek01/files/patch-configure b/graphics/libetonyek01/files/patch-configure
new file mode 100644
index 000000000000..9bf4bd1ac3a4
--- /dev/null
+++ b/graphics/libetonyek01/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	2024-11-26 10:12:06 UTC
++++ configure
+@@ -1552,8 +1552,8 @@ Optional Packages:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --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
++  --with-mdds=3.1|3.0|2.1|2.0|1.5|1.4|1.2|1.0|0.x
++                          Specify which version of mdds to use (3.1 is the
+                           default)
+   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                           both]
+@@ -3741,7 +3741,7 @@ else $as_nop
+ then :
+   withval=$with_mdds;
+ else $as_nop
+-  with_mdds="2.1"
++  with_mdds="3.1"
+ fi
+ 
+ 
diff --git a/graphics/libetonyek01/files/patch-src_lib_IWAParser.cpp b/graphics/libetonyek01/files/patch-src_lib_IWAParser.cpp
new file mode 100644
index 000000000000..e15898be04ef
--- /dev/null
+++ b/graphics/libetonyek01/files/patch-src_lib_IWAParser.cpp
@@ -0,0 +1,29 @@
+From 7cfb47c7614b01ee4b4ccb881f0ab37e9e2e497d Mon Sep 17 00:00:00 2001
+From: jlorber <jlorber@linagora.com>
+Date: Tue, 04 Mar 2025 12:12:41 +0100
+Subject: [PATCH] tdf#151166 add missing Numbers function names
+
+Change-Id: I5f01e4f1412cf2d4a679fbf5d511475cf04c77ee
+Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/182473
+Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
+Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
+--- src/lib/IWAParser.cpp.orig	2024-11-05 21:56:01 UTC
++++ src/lib/IWAParser.cpp
+@@ -3593,7 +3593,16 @@ bool IWAParser::parseFormula(const IWAMessage &msg, IW
+           {285, "Union.Ranges"},
+           {286, "SeriesSum"}, {287, "Polynomial"}, {288, "WeiBull"},
+           {297, "PlainText"}, {298, "Stock"}, {299, "StockH"}, {300, "Currency"},
+-          {301, "CurrencyH"}, {302, "CurrencyConvert"}, {303, "CurrencyCode"}
++          {301, "CurrencyH"}, {302, "CurrencyConvert"}, {303, "CurrencyCode"},
++	  {304, "IsNumber"}, {305, "IsText"}, {306, "IsDate"},
++	  {309, "MaxIfs"}, {310, "MinIfs"}, {311, "XIRR"}, {312, "XNPV"}, {313, "Ifs"},
++	  {314, "XLookup"}, {315, "XMatch"}, {316, "Subtotal"}, {317, "CountMatches"},
++	  {318, "TextBefore"}, {319, "TextBetween"}, {320, "TextAfter"},
++	  {321, "Regex"}, {322, "Reference.Name"}, {323, "FormulaText"}, {324, "Regex.Extract"},
++	  {325, "GetPivotData"}, {328, "TextJoin"}, {329, "Concat"},
++	  {330, "BitAnd"}, {331, "BitOr"}, {332, "BitXor"}, {333, "BitLShift"}, {334, "BitRShift"},
++	  {335, "ISOWeekNum"}, {336, "Switch"}
++
+         };
+         Formula child;
+         std::ostringstream s;
diff --git a/graphics/libetonyek01/files/patch-src_lib_IWORKTable.cpp b/graphics/libetonyek01/files/patch-src_lib_IWORKTable.cpp
new file mode 100644
index 000000000000..897139d22224
--- /dev/null
+++ b/graphics/libetonyek01/files/patch-src_lib_IWORKTable.cpp
@@ -0,0 +1,13 @@
+* ``is_tree_valid()`` method has been renamed to ``valid_tree()``in mdds-3.0
+
+--- src/lib/IWORKTable.cpp.orig	2024-11-05 21:56:01 UTC
++++ src/lib/IWORKTable.cpp
+@@ -168,7 +168,7 @@ void writeBorder(librevenge::RVNGPropertyList &props, 
+ 
+ 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;