[notify] libetonyek: pulled patches from libreoffice, new dependency boost-1.80
This commit is contained in:
parent
3ef2e2b4c8
commit
5f8ce065be
GPG Key ID:
42F8B4E30B673606
|
|
@ -1,5 +1,10 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF34R3euPY7LlJA+RWm8k45GCdY6adGa7j1oSBYWHyewqpOf+umTjgXbXphvLdMvO95I0by88r/qoCVK1otkX5ZAo=
|
||||
SHA256 (Pkgfile) = 37ae1e802585de2af098a9f6aeb18332cfb284f2f8ce87844bbdcfd195a07743
|
||||
RWSagIOpLGJF36EaeuK0D2C9vEcHnK/QN71F+y3mZvefLSTKFnYfZvfRl9MunxGbKZDeG9uxTY5sEHUcfxYmjoYV1FQ15AZABQQ=
|
||||
SHA256 (Pkgfile) = 317c4bbe5270ce99d4d23778be1865ff5a7a401569355d42ebf475c9b4a7ffd6
|
||||
SHA256 (.footprint) = 57ee578ffca9a5b5be3eedf3917c93dddd88357e5a4e5859a8e7b32d0634f111
|
||||
SHA256 (libetonyek-0.1.10.tar.xz) = b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a
|
||||
SHA256 (0001-allow-0-size-message.patch.1) = 805673f9d4dec4f6533c9811cd88ddf8b379ca281f417ebe5bbea4f93ce67fb5
|
||||
SHA256 (libetonyek-bundled-soname.patch.0) = 48d1167d8cd3f16d355d253ee6c4f4b25e0c581b77d6cafcd62f013d3431d584
|
||||
SHA256 (rpath.patch) = 4d3f2c888edb1f693c34456f674bafe38b158f735ce96e6b16cbdde66feddb1a
|
||||
SHA256 (ubsan.patch) = d5dd14bef090b35074b1393e6921cacbc5be0a1677f6c6a4620a3e3f7cf3fa51
|
||||
SHA256 (warnings.patch) = 5c02ff9e82e91d51239e0efed9274b6abe83b57908d6ef6ed055cb65768a691e
|
||||
|
|
|
|||
30
libetonyek/0001-allow-0-size-message.patch.1
Normal file
30
libetonyek/0001-allow-0-size-message.patch.1
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Wed, 26 May 2021 20:39:41 +0200
|
||||
Subject: [PATCH] allow 0-size message
|
||||
|
||||
It likely means the input is broken, but there is no need to reject it.
|
||||
Let's just produce a dummy, empty message.
|
||||
|
||||
Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f
|
||||
---
|
||||
src/lib/IWAMessage.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp
|
||||
index c01b1b6..9456444 100644
|
||||
--- a/src/lib/IWAMessage.cpp
|
||||
+++ b/src/lib/IWAMessage.cpp
|
||||
@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t &input, unsigned long length)
|
||||
: m_input(input)
|
||||
, m_fields()
|
||||
{
|
||||
- assert(length > 0);
|
||||
+ if (length == 0)
|
||||
+ return;
|
||||
|
||||
parse(length);
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,17 +1,38 @@
|
|||
# Description: Library and a set of tools for reading and converting Apple Keynote presentations
|
||||
# URL: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
|
||||
# Maintainer: Tim Biermann, tbier at posteo dot de
|
||||
# Depends on: glm liblangtag librevenge mdds
|
||||
# Depends on: boost-1.80 glm liblangtag librevenge mdds
|
||||
|
||||
name=libetonyek
|
||||
version=0.1.10
|
||||
release=2
|
||||
source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz)
|
||||
release=3
|
||||
source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz
|
||||
0001-allow-0-size-message.patch.1
|
||||
libetonyek-bundled-soname.patch.0
|
||||
rpath.patch
|
||||
ubsan.patch
|
||||
warnings.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
patch -Np1 -i $SRC/0001-allow-0-size-message.patch.1
|
||||
patch -Np0 -i $SRC/libetonyek-bundled-soname.patch.0
|
||||
patch -Np0 -i $SRC/rpath.patch
|
||||
patch -Np0 -i $SRC/ubsan.patch
|
||||
patch -Np0 -i $SRC/warnings.patch
|
||||
|
||||
# boost 1.81.0 breaks libetonyek
|
||||
CXXFLAGS="-I/usr/opt/boost-1.80/include $CFLAGS"
|
||||
CPPFLAGS="-I/usr/opt/boost-1.80/include $CFLAGS"
|
||||
|
||||
autoreconf -fvi
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--with-mdds=2.0 \
|
||||
--with-pic \
|
||||
--with-mdds=2.1 \
|
||||
--disable-static \
|
||||
--disable-werror \
|
||||
--without-docs
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
|
|
|||
36
libetonyek/boost.patch
Normal file
36
libetonyek/boost.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
diff -Naur libetonyek-0.1.10.orig/configure.ac libetonyek-0.1.10/configure.ac
|
||||
--- libetonyek-0.1.10.orig/configure.ac 2023-01-28 15:58:44.501436820 +0100
|
||||
+++ libetonyek-0.1.10/configure.ac 2023-01-28 16:39:38.681363319 +0100
|
||||
@@ -102,7 +102,7 @@
|
||||
boost/none.hpp \
|
||||
boost/numeric/conversion/cast.hpp \
|
||||
boost/optional.hpp \
|
||||
- boost/spirit/include/phoenix.hpp \
|
||||
+ boost/phoenix.hpp \
|
||||
boost/spirit/include/qi.hpp \
|
||||
boost/variant/recursive_variant.hpp \
|
||||
boost/variant/variant.hpp \
|
||||
diff -Naur libetonyek-0.1.10.orig/src/lib/contexts/KEY1DivElement.cpp libetonyek-0.1.10/src/lib/contexts/KEY1DivElement.cpp
|
||||
--- libetonyek-0.1.10.orig/src/lib/contexts/KEY1DivElement.cpp 2023-01-28 15:58:44.474769901 +0100
|
||||
+++ libetonyek-0.1.10/src/lib/contexts/KEY1DivElement.cpp 2023-01-28 16:39:07.884404770 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
-#include <boost/spirit/include/phoenix.hpp>
|
||||
+#include <boost/phoenix.hpp>
|
||||
#include <memory>
|
||||
|
||||
#include "KEY1DivElement.h"
|
||||
diff -Naur libetonyek-0.1.10.orig/src/lib/contexts/KEY1StringConverter.cpp libetonyek-0.1.10/src/lib/contexts/KEY1StringConverter.cpp
|
||||
--- libetonyek-0.1.10.orig/src/lib/contexts/KEY1StringConverter.cpp 2023-01-28 15:58:44.478103266 +0100
|
||||
+++ libetonyek-0.1.10/src/lib/contexts/KEY1StringConverter.cpp 2023-01-28 16:39:23.404551864 +0100
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <boost/fusion/include/std_pair.hpp>
|
||||
#include <boost/spirit/include/qi.hpp>
|
||||
-#include <boost/spirit/include/phoenix.hpp>
|
||||
+#include <boost/phoenix.hpp>
|
||||
|
||||
#include "KEY1StringConverter.h"
|
||||
|
||||
11
libetonyek/libetonyek-bundled-soname.patch.0
Normal file
11
libetonyek/libetonyek-bundled-soname.patch.0
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- src/lib/Makefile.in.orig 2016-01-12 19:21:24.000000000 +0100
|
||||
+++ src/lib/Makefile.in 2016-03-02 18:19:52.214551270 +0100
|
||||
@@ -538,7 +538,7 @@
|
||||
$(XML_CFLAGS) $(ZLIB_CFLAGS) $(DEBUG_CXXFLAGS) $(am__append_1)
|
||||
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LIBADD = libetonyek_internal.la $(REVENGE_LIBS) $(LANGTAG_LIBS) $(XML_LIBS) $(ZLIB_LIBS) @LIBETONYEK_WIN32_RESOURCE@
|
||||
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_DEPENDENCIES = libetonyek_internal.la @LIBETONYEK_WIN32_RESOURCE@
|
||||
-libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
|
||||
+libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
|
||||
libetonyek_@ETONYEK_MAJOR_VERSION@_@ETONYEK_MINOR_VERSION@_la_SOURCES = \
|
||||
EtonyekDocument.cpp
|
||||
|
||||
10
libetonyek/rpath.patch
Normal file
10
libetonyek/rpath.patch
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
--- configure
|
||||
+++ configure
|
||||
@@ -14451,6 +14451,7 @@
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
+hardcode_libdir_flag_spec_CXX=
|
||||
;;
|
||||
|
||||
lynxos*)
|
||||
11
libetonyek/ubsan.patch
Normal file
11
libetonyek/ubsan.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- src/lib/libetonyek_xml.cpp
|
||||
+++ 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<size_t>(bytesRead));
|
||||
+ if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<size_t>(bytesRead));
|
||||
return static_cast<int>(bytesRead);
|
||||
}
|
||||
catch (...)
|
||||
11
libetonyek/warnings.patch
Normal file
11
libetonyek/warnings.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- src/lib/IWORKXMLContext.cpp
|
||||
+++ src/lib/IWORKXMLContext.cpp
|
||||
@@ -18,7 +18,7 @@
|
||||
{
|
||||
}
|
||||
|
||||
-void IWORKXMLContext::CDATA(const char */*value*/)
|
||||
+void IWORKXMLContext::CDATA(const char * /*value*/)
|
||||
{
|
||||
ETONYEK_DEBUG_MSG(("IWORKXMLContext::cData: find unexpected CDATA block\n"));
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user