diff --git a/office/misc/libetonyek/actions.py b/office/misc/libetonyek/actions.py index 68ce4911b4..13aed59b03 100644 --- a/office/misc/libetonyek/actions.py +++ b/office/misc/libetonyek/actions.py @@ -1,33 +1,33 @@ #!/usr/bin/python # -*- coding: utf-8 -*- - +# # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/copyleft/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import autotools from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools from pisi.actionsapi import get +i = ''.join([ + ' --prefix=/usr', + ' --disable-werror', + ' --disable-static', + ' --without-docs', + ' --with-mdds=2.1 ' + ]) + def setup(): - # pisitools.cxxflags.add("-std=gnu++11") - shelltools.system("./autogen.sh") - autotools.autoreconf("-fi") - autotools.configure("--prefix=/usr \ - --disable-werror \ - --without-docs \ - --enable-static=no \ - --with-mdds=2.1") + autotools.configure(i) pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") def build(): autotools.make() -#def check(): - #autotools.make("check") +def check(): + autotools.make("check") def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README", "FEATURES") + pisitools.dodoc("AUTHORS", "COPYING") diff --git a/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch deleted file mode 100644 index 7a3f22e94c..0000000000 --- a/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libetonyek-0.1.6/configure.ac -+++ libetonyek-0.1.6/configure.ac -@@ -24,8 +24,8 @@ AC_LANG([C++]) - # Configure options - # ================= - AC_ARG_WITH([mdds], -- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), -- [], [with_mdds="1.0"]) -+ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]), -+ [], [with_mdds="1.2"]) - - # =========================== - # Find required base packages -@@ -47,7 +47,7 @@ AC_PROG_SED - - AM_MISSING_PROG([GPERF], [gperf]) - --AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) -+AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])]) - - # =============== - # Find librevenge -@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS]) - # ========= - # Find mdds - # ========= --AS_IF([test "$with_mdds" = "1.0"], [ -- PKG_CHECK_MODULES([MDDS], [mdds-1.0]) -+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]) diff --git a/office/misc/libetonyek/files/libetonyek-build-fix.patch b/office/misc/libetonyek/files/libetonyek-build-fix.patch deleted file mode 100644 index ac56d173db..0000000000 --- a/office/misc/libetonyek/files/libetonyek-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru libetonyek-0.1.9.orig/src/lib/NUM3Parser.cpp libetonyek-0.1.9/src/lib/NUM3Parser.cpp ---- libetonyek-0.1.9.orig/src/lib/NUM3Parser.cpp 2018-12-28 20:45:35.000000000 +0300 -+++ libetonyek-0.1.9/src/lib/NUM3Parser.cpp 2021-03-10 19:02:13.203978181 +0300 -@@ -8,6 +8,7 @@ - */ - - #include -+#include - - #include "NUM3Parser.h" - diff --git a/office/misc/libetonyek/pspec.xml b/office/misc/libetonyek/pspec.xml index 9e630bc6ef..5cc03fb0b7 100644 --- a/office/misc/libetonyek/pspec.xml +++ b/office/misc/libetonyek/pspec.xml @@ -1,33 +1,33 @@ - + libetonyek - http://www.freedesktop.org/wiki/Software/libetonyek/ + https://wiki.documentfoundation.org/DLP/Libraries/libetonyek PisiLinux Community admins@pisilinux.org - MPL-1.0 + MPL-2 app:console - A library for import of Apple Keynote presentations - Libetonyek is library providing ability to interpret and import Apple Keynote presentations into various applications. You can find it being used in libreoffice. + The Apple iWork documents toolchain. + libetonyek library and a set of tools for reading and converting Apple iWork documents (Keynote, Numbers and Pages). + https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.12.tar.xz - doxygen - zlib-devel - libxml2-devel - boost-devel - cppunit-devel - librevenge-devel glm gperf + doxygen + zlib-devel + mdds-devel + boost-devel + libxml2-devel + cppunit-devel + librevenge-devel liblangtag-devel - mdds-devel - https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.10.tar.xz - + + + @@ -57,13 +57,19 @@ libetonyek - /usr/share/doc /usr/include - /usr/lib/pkgconfig + /usr/lib/pkgconfig + + 2025-02-09 + 0.1.12 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2023-10-29 0.1.10