diff --git a/common/shlibs b/common/shlibs index 9d2689471e7..ed5b41394ea 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1846,7 +1846,7 @@ librevenge-generators-0.0.so.0 librevenge-0.0.1_1 librevenge-stream-0.0.so.0 librevenge-0.0.1_1 libepubgen-0.1.so.1 libepubgen-0.1.0_1 libqxp-0.0.so.0 libqxp-0.0.1_1 -libetonyek-0.1.so.1 libetonyek-0.1.1_1 +libetonyek-0.1.so.1 libetonyek-0.1.12_1 libodfgen-0.1.so.1 libodfgen-0.1.1_1 libKF5SonnetUi.so.5 sonnet-5.26.0_1 libKF5SonnetCore.so.5 sonnet-5.26.0_1 diff --git a/srcpkgs/libetonyek/patches/mdds-3.0.patch b/srcpkgs/libetonyek/patches/mdds-3.0.patch new file mode 100644 index 00000000000..825c997b5cb --- /dev/null +++ b/srcpkgs/libetonyek/patches/mdds-3.0.patch @@ -0,0 +1,14 @@ +Source: LibreOffice +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; diff --git a/srcpkgs/libetonyek/patches/ubsan.patch b/srcpkgs/libetonyek/patches/ubsan.patch new file mode 100644 index 00000000000..d7aae0487b8 --- /dev/null +++ b/srcpkgs/libetonyek/patches/ubsan.patch @@ -0,0 +1,12 @@ +Source: LibreOffice +--- a/src/lib/libetonyek_xml.cpp ++++ b/src/lib/libetonyek_xml.cpp +@@ -35,7 +35,7 @@ + unsigned long bytesRead = 0; + const unsigned char *const bytes = input->read((unsigned long)len, bytesRead); + +- std::memcpy(buffer, bytes, static_cast(bytesRead)); ++ if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast(bytesRead)); + return static_cast(bytesRead); + } + catch (...) diff --git a/srcpkgs/libetonyek/template b/srcpkgs/libetonyek/template index 96bb9554f80..a1861052d12 100644 --- a/srcpkgs/libetonyek/template +++ b/srcpkgs/libetonyek/template @@ -1,22 +1,23 @@ # Template file for 'libetonyek' pkgname=libetonyek -version=0.1.10 -revision=2 +version=0.1.12 +revision=1 build_style=gnu-configure -configure_args="--with-mdds=2.1" +configure_args="--with-mdds=3.0" make_build_args=V=1 hostmakedepends="pkg-config" -makedepends="libxml2-devel boost-devel libcppunit-devel librevenge-devel +makedepends="libxml2-devel boost-devel-minimal libcppunit-devel librevenge-devel glm mdds liblangtag-devel" short_desc="Library to interpret and import Apple Keynote presentations" maintainer="Enno Boland " license="MPL-2.0" homepage="http://www.freedesktop.org/wiki/Software/libetonyek/" distfiles="http://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz" -checksum=b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a +checksum=b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83 libetonyek-devel_package() { - depends="libetonyek>=${version}_${revision} $makedepends" + depends="libetonyek>=${version}_${revision} + librevenge-devel liblangtag-devel libxml2-devel zlib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include