diff --git a/graphics/libetonyek01/Makefile b/graphics/libetonyek01/Makefile index ec330333ec5a..12ba70dafce6 100644 --- a/graphics/libetonyek01/Makefile +++ b/graphics/libetonyek01/Makefile @@ -1,39 +1,39 @@ PORTNAME= libetonyek DISTVERSION= 0.1.12 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= LODEV/${PORTNAME} PKGNAMESUFFIX= 01 MAINTAINER= office@FreeBSD.org COMMENT= Library to interpret and import Apple Keynote presentations WWW= https://wiki.documentfoundation.org/DLP/Libraries/libetonyek LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/mdds-${MDDS_VERSION}/mdds/global.hpp:devel/mdds \ ${LOCALBASE}/include/boost/any.hpp:devel/boost-libs \ ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= librevenge-0.0.so:textproc/librevenge \ liblangtag.so:devel/liblangtag USES= compiler:c++17-lang gnome libtool localbase pathfix pkgconfig \ tar:xz USE_CXXSTD= c++17 USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes -MDDS_VERSION= 2.1 +MDDS_VERSION= 3.1 INSTALL_TARGET= install-strip PLIST_SUB= LIBVERSION=1.0.${PORTVERSION:E} CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs \ --with-mdds=${MDDS_VERSION} .include 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 +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 +Reviewed-by: Ilmari Lauhakangas +--- 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;