Index: head/graphics/libetonyek01/Makefile =================================================================== --- head/graphics/libetonyek01/Makefile (revision 452891) +++ head/graphics/libetonyek01/Makefile (revision 452892) @@ -1,46 +1,39 @@ # $FreeBSD$ PORTNAME= libetonyek -PORTVERSION= 0.1.6 -PORTREVISION= 8 +PORTVERSION= 0.1.7 PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/ +MASTER_SITES= LODEV +MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMESUFFIX= 01 MAINTAINER= office@FreeBSD.org COMMENT= Library to interpret and import Apple Keynote presentations -LICENSE= LGPL21 MPL -LICENSE_COMB= dual +LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/mdds-1.2/mdds/global.hpp:devel/mdds \ ${LOCALBASE}/include/glm/glm.hpp:math/glm LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ librevenge-0.0.so:textproc/librevenge \ liblangtag.so:devel/liblangtag \ libxml2.so:textproc/libxml2 -OPTIONS_DEFINE= TEST - -CONFIGURE_ARGS= --disable-werror --without-docs +CONFIGURE_ARGS= --disable-tests --disable-werror --without-docs CPPFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ - -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 GNU_CONFIGURE= yes -USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig tar:xz +USES= autoreconf compiler:c++11-lib gmake libtool pathfix \ + pkgconfig tar:xz USE_LDCONFIG= yes INSTALL_TARGET= install-strip -TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit -TEST_CONFIGURE_OFF= --disable-tests +.include -.include - -.if ${PORT_OPTIONS:MTEST} -post-build: - @cd ${WRKSRC}/src/test && ${MAKE_CMD} check +.if ${OSREL:R} < 11 +EXTRA_PATCHES= ${PATCHDIR}/extrapatch-libc++-memory .endif -.include +.include Index: head/graphics/libetonyek01/distinfo =================================================================== --- head/graphics/libetonyek01/distinfo (revision 452891) +++ head/graphics/libetonyek01/distinfo (revision 452892) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478385570 -SHA256 (libetonyek-0.1.6.tar.xz) = df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 -SIZE (libetonyek-0.1.6.tar.xz) = 1243364 +TIMESTAMP = 1508950047 +SHA256 (libetonyek-0.1.7.tar.xz) = 69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac +SIZE (libetonyek-0.1.7.tar.xz) = 1256232 Index: head/graphics/libetonyek01/files/patch-configure.ac =================================================================== --- head/graphics/libetonyek01/files/patch-configure.ac (revision 452891) +++ head/graphics/libetonyek01/files/patch-configure.ac (nonexistent) @@ -1,33 +0,0 @@ ---- configure.ac.orig 2016-01-12 18:21:19 UTC -+++ 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" = "1.2"], [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" = "1.2"], [ -+ PKG_CHECK_MODULES([MDDS], [mdds-1.2]) - ], [ - PKG_CHECK_MODULES([MDDS], [mdds]) - AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type]) Property changes on: head/graphics/libetonyek01/files/patch-configure.ac ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/libetonyek01/files/extrapatch-libc++-memory =================================================================== --- head/graphics/libetonyek01/files/extrapatch-libc++-memory (nonexistent) +++ head/graphics/libetonyek01/files/extrapatch-libc++-memory (revision 452892) @@ -0,0 +1,1787 @@ +--- configure.ac.orig 2017-10-23 08:03:31 UTC ++++ configure.ac +@@ -109,9 +109,11 @@ AC_CHECK_HEADERS( + boost/fusion/adapted/std_pair.hpp \ + boost/fusion/include/adapt_struct.hpp \ + boost/lexical_cast.hpp \ ++ boost/make_shared.hpp \ + boost/none.hpp \ + boost/numeric/conversion/cast.hpp \ + boost/optional.hpp \ ++ boost/shared_ptr.hpp \ + boost/spirit/include/phoenix.hpp \ + boost/spirit/include/qi.hpp \ + boost/variant/recursive_variant.hpp \ +--- src/conv/csv/numbers2csv.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/csv/numbers2csv.cpp +@@ -11,8 +11,9 @@ + #include "config.h" + #endif + ++#include ++ + #include +-#include + #include + #include + #include +@@ -73,7 +74,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/html/pages2html.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/html/pages2html.cpp +@@ -7,10 +7,11 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -74,7 +75,7 @@ int main(int argc, char *argv[]) + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr input; + if (librevenge::RVNGDirectoryStream::isDirectory(file)) +--- src/conv/raw/key2raw.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/raw/key2raw.cpp +@@ -11,10 +11,11 @@ + #include "config.h" + #endif + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -78,7 +79,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/raw/numbers2raw.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/raw/numbers2raw.cpp +@@ -11,10 +11,11 @@ + #include "config.h" + #endif + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -78,7 +79,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/raw/pages2raw.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/raw/pages2raw.cpp +@@ -7,10 +7,11 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -81,7 +82,7 @@ int main(int argc, char *argv[]) + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr input; + if (librevenge::RVNGDirectoryStream::isDirectory(file)) +--- src/conv/svg/key2xhtml.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/svg/key2xhtml.cpp +@@ -11,8 +11,9 @@ + #include "config.h" + #endif + ++#include ++ + #include +-#include + #include + #include + #include +@@ -73,7 +74,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/text/key2text.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/text/key2text.cpp +@@ -11,10 +11,11 @@ + #include "config.h" + #endif + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -71,7 +72,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/text/numbers2text.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/text/numbers2text.cpp +@@ -11,10 +11,11 @@ + #include "config.h" + #endif + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -71,7 +72,7 @@ int main(int argc, char *argv[]) try + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + using libetonyek::EtonyekDocument; + + shared_ptr input; +--- src/conv/text/pages2text.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/conv/text/pages2text.cpp +@@ -7,10 +7,11 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +-#include + #include + #include + ++#include ++ + #include + #include + #include +@@ -77,7 +78,7 @@ int main(int argc, char *argv[]) + if (!szInputFile) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr input; + if (librevenge::RVNGDirectoryStream::isDirectory(szInputFile)) +--- src/lib/EtonyekDocument.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/EtonyekDocument.cpp +@@ -10,9 +10,9 @@ + #include + + #include +-#include + + #include ++#include + + #include + +@@ -43,7 +43,7 @@ + #include "PAG5Parser.h" + + +-using std::shared_ptr; ++using boost::shared_ptr; + using std::string; + + using librevenge::RVNG_SEEK_SET; +--- src/lib/IWAField.h.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWAField.h +@@ -11,11 +11,11 @@ + #define IWAFIELD_H_INCLUDED + + #include +-#include + #include + + #include + #include ++#include + + #include "IWAReader.h" + #include "libetonyek_utils.h" +@@ -64,7 +64,7 @@ class IWAField (public) + virtual void parse(const RVNGInputStreamPtr_t &input, unsigned long length, bool allowEmpty) = 0; + }; + +-typedef std::shared_ptr IWAFieldPtr_t; ++typedef boost::shared_ptr IWAFieldPtr_t; + + namespace detail + { +--- src/lib/IWAMessage.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWAMessage.cpp +@@ -10,8 +10,9 @@ + #include "IWAMessage.h" + + #include +-#include + ++#include ++ + namespace libetonyek + { + +@@ -202,7 +203,7 @@ const FieldT &IWAMessage::getField(const std::size_t f + } + else + { +- fieldIt->second.m_realField = std::make_shared(); ++ fieldIt->second.m_realField = boost::make_shared(); + for (std::deque::const_iterator it = fieldIt->second.m_pieces.begin(); it != fieldIt->second.m_pieces.end(); ++it) + { + assert(bool(m_input)); +--- src/lib/IWAParser.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWAParser.cpp +@@ -13,9 +13,9 @@ + #include + #include + #include +-#include + #include + ++#include + #include + + #include "IWAObjectType.h" +@@ -33,17 +33,17 @@ + namespace libetonyek + { + ++using boost::make_shared; + using boost::none; + using boost::optional; ++using boost::shared_ptr; + + using namespace std::placeholders; + + using std::bind; + using std::deque; + using std::make_pair; +-using std::make_shared; + using std::map; +-using std::shared_ptr; + using std::string; + + namespace +--- src/lib/IWAParser.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWAParser.h +@@ -13,11 +13,11 @@ + #include + #include + #include +-#include + #include + #include + + #include ++#include + #include + + #include +@@ -119,7 +119,7 @@ class IWAParser (protected) + + protected: + IWORKLanguageManager m_langManager; +- std::shared_ptr m_currentText; ++ boost::shared_ptr m_currentText; + + private: + typedef std::map > DataList_t; +@@ -134,9 +134,9 @@ class IWAParser (protected) + + struct TableInfo + { +- TableInfo(const std::shared_ptr &table, unsigned columns, unsigned rows); ++ TableInfo(const boost::shared_ptr &table, unsigned columns, unsigned rows); + +- std::shared_ptr m_table; ++ boost::shared_ptr m_table; + + const unsigned m_columns; + const unsigned m_rows; +@@ -204,7 +204,7 @@ class IWAParser (protected) + mutable StyleMap_t m_listStyles; + + IWORKTableNameMapPtr_t m_tableNameMap; +- std::shared_ptr m_currentTable; ++ boost::shared_ptr m_currentTable; + }; + + } +--- src/lib/IWAReader.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWAReader.cpp +@@ -10,8 +10,9 @@ + #include "IWAReader.h" + + #include +-#include + ++#include ++ + #include "IWAMessage.h" + #include "IWORKMemoryStream.h" + +@@ -82,7 +83,7 @@ const RVNGInputStreamPtr_t Bytes::read(const RVNGInput + const unsigned char *const bytes = input->read(length, readBytes); + if (readBytes < length) + throw ParseError(); +- return std::make_shared(bytes, std::size_t(length)); ++ return boost::make_shared(bytes, std::size_t(length)); + } + + IWAMessage Message::read(const RVNGInputStreamPtr_t &input, const unsigned long length) +--- src/lib/IWASnappyStream.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWASnappyStream.cpp +@@ -11,10 +11,11 @@ + + #include + #include +-#include + #include + #include + ++#include ++ + #include "IWORKMemoryStream.h" + + using std::vector; +@@ -155,7 +156,7 @@ RVNGInputStreamPtr_t uncompress(const RVNGInputStreamP + throw CompressionException(); + } + +- return std::make_shared(data); ++ return boost::make_shared(data); + } + + } +@@ -177,7 +178,7 @@ RVNGInputStreamPtr_t IWASnappyStream::uncompressBlock( + { + vector data; + libetonyek::uncompressBlock(block, getLength(block), data); +- return std::make_shared(data); ++ return boost::make_shared(data); + } + + bool IWASnappyStream::isStructured() +--- src/lib/IWAText.cpp.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWAText.cpp +@@ -9,7 +9,7 @@ + + #include "IWAText.h" + +-#include ++#include + + #include "IWORKLanguageManager.h" + #include "IWORKProperties.h" +@@ -18,9 +18,9 @@ + namespace libetonyek + { + ++using boost::make_shared; + using boost::none; + +-using std::make_shared; + using std::map; + using std::string; + +--- src/lib/IWORKCollector.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKCollector.cpp +@@ -14,8 +14,9 @@ + #include + #include + #include +-#include + ++#include ++ + #include "IWORKDocumentInterface.h" + #include "IWORKOutputElements.h" + #include "IWORKPath.h" +@@ -29,6 +30,8 @@ + namespace libetonyek + { + ++using boost::make_shared; ++using boost::shared_ptr; + + using librevenge::RVNGPropertyList; + using librevenge::RVNG_PERCENT; +@@ -36,9 +39,7 @@ using librevenge::RVNG_POINT; + + using namespace std::placeholders; + +-using std::make_shared; + using std::memcmp; +-using std::shared_ptr; + using std::string; + + namespace +@@ -376,7 +377,7 @@ IWORKCollector::~IWORKCollector() + assert(!m_currentText); + } + +-void IWORKCollector::setRecorder(const std::shared_ptr &recorder) ++void IWORKCollector::setRecorder(const boost::shared_ptr &recorder) + { + m_recorder = recorder; + } +@@ -611,7 +612,7 @@ void IWORKCollector::collectFooter(const std::string & + collectHeaderFooter(name, m_footers); + } + +-void IWORKCollector::collectTable(const std::shared_ptr &table) ++void IWORKCollector::collectTable(const boost::shared_ptr &table) + { + if (bool(m_recorder)) + { +@@ -625,7 +626,7 @@ void IWORKCollector::collectTable(const std::shared_pt + m_currentTable.reset(); + } + +-void IWORKCollector::collectText(const std::shared_ptr &text) ++void IWORKCollector::collectText(const boost::shared_ptr &text) + { + if (bool(m_recorder)) + { +@@ -677,12 +678,12 @@ void IWORKCollector::endGroup() + --m_groupLevel; + } + +-std::shared_ptr IWORKCollector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const ++boost::shared_ptr IWORKCollector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const + { + return shared_ptr(new IWORKTable(tableNameMap, langManager)); + } + +-std::shared_ptr IWORKCollector::createText(const IWORKLanguageManager &langManager, bool discardEmptyContent) const ++boost::shared_ptr IWORKCollector::createText(const IWORKLanguageManager &langManager, bool discardEmptyContent) const + { + return make_shared(langManager, discardEmptyContent); + } +--- src/lib/IWORKCollector.h.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWORKCollector.h +@@ -11,11 +11,11 @@ + #define IWORKCOLLECTOR_H_INCLUDED + + #include +-#include + #include + #include + + #include ++#include + + #include "libetonyek_utils.h" + #include "IWORKPath_fwd.h" +@@ -54,7 +54,7 @@ class IWORKCollector (public) + explicit IWORKCollector(IWORKDocumentInterface *document); + ~IWORKCollector(); + +- void setRecorder(const std::shared_ptr &recorder); ++ void setRecorder(const boost::shared_ptr &recorder); + + // collector functions + +@@ -86,8 +86,8 @@ class IWORKCollector (public) + void collectHeader(const std::string &name); + void collectFooter(const std::string &name); + +- void collectTable(const std::shared_ptr &table); +- void collectText(const std::shared_ptr &text); ++ void collectTable(const boost::shared_ptr &table); ++ void collectText(const boost::shared_ptr &text); + + void startDocument(); + void endDocument(); +@@ -112,8 +112,8 @@ class IWORKCollector (public) + IWORKOutputManager &getOutputManager(); + + public: +- virtual std::shared_ptr createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const; +- virtual std::shared_ptr createText(const IWORKLanguageManager &langManager, bool discardEmptyContent = false) const; ++ virtual boost::shared_ptr createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const; ++ virtual boost::shared_ptr createText(const IWORKLanguageManager &langManager, bool discardEmptyContent = false) const; + + protected: + void fillMetadata(librevenge::RVNGPropertyList &props); +@@ -136,7 +136,7 @@ class IWORKCollector (public) + + protected: + IWORKDocumentInterface *m_document; +- std::shared_ptr m_recorder; ++ boost::shared_ptr m_recorder; + + std::stack m_levelStack; + IWORKStyleStack m_styleStack; +@@ -145,8 +145,8 @@ class IWORKCollector (public) + + std::deque m_newStyles; + +- std::shared_ptr m_currentTable; +- std::shared_ptr m_currentText; ++ boost::shared_ptr m_currentTable; ++ boost::shared_ptr m_currentText; + + IWORKHeaderFooterMap_t m_headers; + IWORKHeaderFooterMap_t m_footers; +--- src/lib/IWORKDiscardContext.h.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKDiscardContext.h +@@ -10,7 +10,8 @@ + #ifndef IWORKDISCARDCONTEXT_H_INCLUDED + #define IWORKDISCARDCONTEXT_H_INCLUDED + +-#include ++#include ++#include + + #include "IWORKXMLContext.h" + +@@ -19,7 +20,7 @@ namespace libetonyek + + class IWORKXMLParserState; + +-class IWORKDiscardContext : public IWORKXMLContext, public std::enable_shared_from_this ++class IWORKDiscardContext : public IWORKXMLContext, public boost::enable_shared_from_this + { + struct Data; + +@@ -37,7 +38,7 @@ class IWORKDiscardContext : public IWORKXMLContext, pu + IWORKXMLParserState &m_state; + unsigned m_level; + bool m_enableCollector; +- std::shared_ptr m_data; ++ boost::shared_ptr m_data; + }; + + } +--- src/lib/IWORKFormula.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKFormula.h +@@ -10,9 +10,10 @@ + #ifndef IWORKFORMULA_H_INCLUDED + #define IWORKFORMULA_H_INCLUDED + +-#include + #include + ++#include ++ + #include "IWORKTypes_fwd.h" + #include "libetonyek_utils.h" + +@@ -33,7 +34,7 @@ class IWORKFormula (public) + void write(librevenge::RVNGPropertyListVector &formula, const IWORKTableNameMapPtr_t &tableNameMap) const; + + private: +- std::shared_ptr m_impl; ++ boost::shared_ptr m_impl; + }; + + } // namespace libetonyek +--- src/lib/IWORKLanguageManager.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKLanguageManager.cpp +@@ -25,9 +25,10 @@ + namespace libetonyek + { + ++using boost::shared_ptr; ++ + using librevenge::RVNGPropertyList; + +-using std::shared_ptr; + using std::string; + using std::unordered_map; + using std::unordered_set; +--- src/lib/IWORKLanguageManager.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKLanguageManager.h +@@ -10,11 +10,12 @@ + #ifndef IWORKLANGUAGEMANAGER_H_INCLUDED + #define IWORKLANGUAGEMANAGER_H_INCLUDED + +-#include + #include + #include + #include + ++#include ++ + #include + + namespace libetonyek +@@ -48,7 +49,7 @@ class IWORKLanguageManager (private) + std::unordered_map m_localeMap; + std::unordered_set m_invalidLocales; + std::unordered_map m_propsMap; +- mutable std::shared_ptr m_langDB; ++ mutable boost::shared_ptr m_langDB; + }; + + } +--- src/lib/IWORKMemoryStream.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKMemoryStream.cpp +@@ -18,7 +18,7 @@ namespace libetonyek + { + + IWORKMemoryStream::IWORKMemoryStream(const RVNGInputStreamPtr_t &input) +- : m_data() ++ : m_data(0) + , m_length(0) + , m_pos(0) + { +@@ -35,7 +35,7 @@ IWORKMemoryStream::IWORKMemoryStream(const RVNGInputSt + } + + IWORKMemoryStream::IWORKMemoryStream(const RVNGInputStreamPtr_t &input, const unsigned length) +- : m_data() ++ : m_data(0) + , m_length(0) + , m_pos(0) + { +@@ -43,7 +43,7 @@ IWORKMemoryStream::IWORKMemoryStream(const RVNGInputSt + } + + IWORKMemoryStream::IWORKMemoryStream(const std::vector &data) +- : m_data() ++ : m_data(0) + , m_length(data.size()) + , m_pos(0) + { +@@ -66,6 +66,7 @@ IWORKMemoryStream::IWORKMemoryStream(const unsigned ch + + IWORKMemoryStream::~IWORKMemoryStream() + { ++ delete[] m_data; + } + + bool IWORKMemoryStream::isStructured() +@@ -107,7 +108,7 @@ const unsigned char *IWORKMemoryStream::read(unsigned + m_pos += numBytes; + + numBytesRead = numBytes; +- return m_data.get() + oldPos; ++ return m_data + oldPos; + } + catch (...) + { +@@ -157,8 +158,9 @@ void IWORKMemoryStream::assign(const unsigned char *co + { + assert(0 != length); + +- m_data.reset(new unsigned char[length]); +- std::copy(data, data + length, m_data.get()); ++ unsigned char *buffer = new unsigned char[length]; ++ std::copy(data, data + length, buffer); ++ m_data = buffer; + } + + void IWORKMemoryStream::read(const RVNGInputStreamPtr_t &input, const unsigned length) +--- src/lib/IWORKMemoryStream.h.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKMemoryStream.h +@@ -10,7 +10,6 @@ + #ifndef IWORKMEMORYSTREAM_H_INCLUDED + #define IWORKMEMORYSTREAM_H_INCLUDED + +-#include + #include + + #include "libetonyek_utils.h" +@@ -51,7 +50,7 @@ class IWORKMemoryStream : public librevenge::RVNGInput + void read(const RVNGInputStreamPtr_t &input, unsigned length); + + private: +- std::unique_ptr m_data; ++ const unsigned char *m_data; + long m_length; + long m_pos; + }; +--- src/lib/IWORKOutputElements.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKOutputElements.cpp +@@ -9,7 +9,7 @@ + + #include "IWORKOutputElements.h" + +-#include ++#include + + #include "IWORKDocumentInterface.h" + #include "IWORKFormula.h" +@@ -17,7 +17,7 @@ + namespace libetonyek + { + +-using std::make_shared; ++using boost::make_shared; + + class IWORKOutputElement + { +@@ -992,7 +992,7 @@ void IWORKOutputElements::addOpenEndnote(const libreve + + void IWORKOutputElements::addOpenFormulaCell(const librevenge::RVNGPropertyList &propList, const IWORKFormula &formula, const IWORKTableNameMapPtr_t &tableNameMap) + { +- m_elements.push_back(std::shared_ptr(new OpenFormulaCellElement(propList, formula, tableNameMap))); ++ m_elements.push_back(boost::shared_ptr(new OpenFormulaCellElement(propList, formula, tableNameMap))); + } + + void IWORKOutputElements::addOpenFooter(const librevenge::RVNGPropertyList &propList) +--- src/lib/IWORKOutputElements.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKOutputElements.h +@@ -11,9 +11,10 @@ + #define IWORKOUTPUTELEMENTS_H_INCLUDED + + #include +-#include + #include + ++#include ++ + #include + + #include "IWORKTypes_fwd.h" +@@ -28,7 +29,7 @@ class IWORKOutputElement; + + class IWORKOutputElements + { +- typedef std::deque > ElementList_t; ++ typedef std::deque > ElementList_t; + + public: + IWORKOutputElements(); +--- src/lib/IWORKParser.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKParser.cpp +@@ -10,8 +10,9 @@ + #include "IWORKParser.h" + + #include +-#include + ++#include ++ + #include + + #include +@@ -21,7 +22,7 @@ + #include "IWORKXMLContextBase.h" + #include "IWORKXMLParserState.h" + +-using std::shared_ptr; ++using boost::shared_ptr; + using std::stack; + + namespace libetonyek +--- src/lib/IWORKPath.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKPath.h +@@ -63,7 +63,7 @@ class IWORKPath (public) + void write(librevenge::RVNGPropertyListVector &vec) const; + + private: +- std::shared_ptr m_impl; ++ boost::shared_ptr m_impl; + }; + + bool approxEqual(const IWORKPath &left, const IWORKPath &right, double eps = ETONYEK_EPSILON); +--- src/lib/IWORKPath_fwd.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKPath_fwd.h +@@ -9,9 +9,10 @@ + #ifndef IWORKPATH_FWD_H_INCLUDED + #define IWORKPATH_FWD_H_INCLUDED + +-#include + #include + ++#include ++ + #include "IWORKTypes_fwd.h" + + namespace libetonyek +@@ -19,7 +20,7 @@ namespace libetonyek + + class IWORKPath; + +-typedef std::shared_ptr IWORKPathPtr_t; ++typedef boost::shared_ptr IWORKPathPtr_t; + typedef std::unordered_map IWORKPathMap_t; + + } +--- src/lib/IWORKRecorder.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKRecorder.cpp +@@ -21,7 +21,7 @@ + namespace libetonyek + { + +-using std::shared_ptr; ++using boost::shared_ptr; + + namespace + { +@@ -112,22 +112,22 @@ struct CollectStylesheet + + struct CollectTable + { +- CollectTable(const std::shared_ptr &table) ++ CollectTable(const boost::shared_ptr &table) + : m_table(table) + { + } + +- const std::shared_ptr m_table; ++ const boost::shared_ptr m_table; + }; + + struct CollectText + { +- CollectText(const std::shared_ptr &text) ++ CollectText(const boost::shared_ptr &text) + : m_text(text) + { + } + +- const std::shared_ptr m_text; ++ const boost::shared_ptr m_text; + }; + + struct StartGroup +@@ -361,12 +361,12 @@ void IWORKRecorder::collectStylesheet(const IWORKStyle + m_impl->m_elements.push_back(CollectStylesheet(stylesheet)); + } + +-void IWORKRecorder::collectTable(const std::shared_ptr &table) ++void IWORKRecorder::collectTable(const boost::shared_ptr &table) + { + m_impl->m_elements.push_back(CollectTable(table)); + } + +-void IWORKRecorder::collectText(const std::shared_ptr &text) ++void IWORKRecorder::collectText(const boost::shared_ptr &text) + { + m_impl->m_elements.push_back(CollectText(text)); + } +--- src/lib/IWORKRecorder.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKRecorder.h +@@ -10,10 +10,10 @@ + #ifndef IWORKRECORDER_H_INCLUDED + #define IWORKRECORDER_H_INCLUDED + +-#include + #include + + #include ++#include + + #include "IWORKPath_fwd.h" + #include "IWORKStyle.h" +@@ -52,8 +52,8 @@ class IWORKRecorder (public) + + void collectStylesheet(const IWORKStylesheetPtr_t &stylesheet); + +- void collectTable(const std::shared_ptr &table); +- void collectText(const std::shared_ptr &text); ++ void collectTable(const boost::shared_ptr &table); ++ void collectText(const boost::shared_ptr &text); + + void startGroup(); + void endGroup(); +@@ -68,7 +68,7 @@ class IWORKRecorder (public) + struct Impl; + + private: +- std::shared_ptr m_impl; ++ boost::shared_ptr m_impl; + }; + + } // namespace libetonyek +--- src/lib/IWORKShape.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKShape.h +@@ -10,7 +10,7 @@ + #ifndef IWORKSHAPE_H_INCLUDED + #define IWORKSHAPE_H_INCLUDED + +-#include ++#include + + #include "IWORKPath_fwd.h" + #include "IWORKStyle.h" +@@ -33,7 +33,7 @@ struct IWORKShape + IWORKShape(); + }; + +-typedef std::shared_ptr IWORKShapePtr_t; ++typedef boost::shared_ptr IWORKShapePtr_t; + + /** Path creator functions for stock shapes. + */ +--- src/lib/IWORKStyle_fwd.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKStyle_fwd.h +@@ -10,9 +10,10 @@ + #ifndef IWORKSTYLE_FWD_H_INCLUDED + #define IWORKSTYLE_FWD_H_INCLUDED + +-#include + #include + ++#include ++ + #include "IWORKTypes_fwd.h" + + namespace libetonyek +@@ -20,7 +21,7 @@ namespace libetonyek + + class IWORKStyle; + +-typedef std::shared_ptr IWORKStylePtr_t; ++typedef boost::shared_ptr IWORKStylePtr_t; + typedef std::unordered_map IWORKStyleMap_t; + + } +--- src/lib/IWORKStylesheet.h.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWORKStylesheet.h +@@ -17,7 +17,7 @@ namespace libetonyek + { + + struct IWORKStylesheet; +-typedef std::shared_ptr IWORKStylesheetPtr_t; ++typedef boost::shared_ptr IWORKStylesheetPtr_t; + typedef std::unordered_map IWORKStylesheetMap_t; + + /** Representation of a stylesheet. +--- src/lib/IWORKTable.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKTable.cpp +@@ -295,12 +295,12 @@ IWORKTable::IWORKTable(const IWORKTableNameMapPtr_t &t + { + } + +-void IWORKTable::setRecorder(const std::shared_ptr &recorder) ++void IWORKTable::setRecorder(const boost::shared_ptr &recorder) + { + m_recorder = recorder; + } + +-const std::shared_ptr &IWORKTable::getRecorder() const ++const boost::shared_ptr &IWORKTable::getRecorder() const + { + return m_recorder; + } +@@ -391,7 +391,7 @@ void IWORKTable::setBorders(const IWORKGridLineMap_t & + m_horizontalLines = horizontalLines; + } + +-void IWORKTable::insertCell(const unsigned column, const unsigned row, const boost::optional &value, const std::shared_ptr &text, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, const IWORKCellType type) ++void IWORKTable::insertCell(const unsigned column, const unsigned row, const boost::optional &value, const boost::shared_ptr &text, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, const IWORKCellType type) + { + if (bool(m_recorder)) + { +--- src/lib/IWORKTable.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKTable.h +@@ -10,11 +10,11 @@ + #ifndef IWORKTABLE_H_INCLUDED + #define IWORKTABLE_H_INCLUDED + +-#include +-#include +- + #include ++#include + ++#include ++ + #include "IWORKStyle_fwd.h" + #include "IWORKTypes.h" + #include "IWORKOutputElements.h" +@@ -58,8 +58,8 @@ class IWORKTable (public) + public: + explicit IWORKTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager); + +- void setRecorder(const std::shared_ptr &recorder); +- const std::shared_ptr &getRecorder() const; ++ void setRecorder(const boost::shared_ptr &recorder); ++ const boost::shared_ptr &getRecorder() const; + + void setSize(unsigned columns, unsigned rows); + void setHeaders(unsigned headerColumns, unsigned headerRows, unsigned footerRows); +@@ -71,7 +71,7 @@ class IWORKTable (public) + void setBorders(const IWORKGridLineMap_t &verticalLines, const IWORKGridLineMap_t &horizontalLines); + void insertCell(unsigned column, unsigned row, + const boost::optional &value = boost::none, +- const std::shared_ptr &text = std::shared_ptr(), ++ const boost::shared_ptr &text = boost::shared_ptr(), + unsigned columnSpan = 1, unsigned rowSpan = 1, + const boost::optional &formula = boost::none, + const IWORKStylePtr_t &style = IWORKStylePtr_t(), +@@ -115,7 +115,7 @@ class IWORKTable (public) + IWORKStylePtr_t m_defaultLayoutStyles[5]; + IWORKStylePtr_t m_defaultParaStyles[5]; + +- std::shared_ptr m_recorder; ++ boost::shared_ptr m_recorder; + }; + + } +--- src/lib/IWORKTableRecorder.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKTableRecorder.cpp +@@ -19,7 +19,7 @@ + namespace libetonyek + { + +-using std::shared_ptr; ++using boost::shared_ptr; + + namespace + { +@@ -108,7 +108,7 @@ struct SetBorders + + struct InsertCell + { +- InsertCell(const unsigned column, const unsigned row, const boost::optional &value, const std::shared_ptr &content, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, IWORKCellType type) ++ InsertCell(const unsigned column, const unsigned row, const boost::optional &value, const boost::shared_ptr &content, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, IWORKCellType type) + : m_column(column) + , m_row(row) + , m_value(value) +@@ -124,7 +124,7 @@ struct InsertCell + const unsigned m_column; + const unsigned m_row; + const boost::optional m_value; +- const std::shared_ptr m_content; ++ const boost::shared_ptr m_content; + const unsigned m_columnSpan; + const unsigned m_rowSpan; + const boost::optional m_formula; +@@ -337,7 +337,7 @@ void IWORKTableRecorder::setBorders(const IWORKGridLin + m_impl->m_elements.push_back(SetBorders(verticalLines, horizontalLines)); + } + +-void IWORKTableRecorder::insertCell(const unsigned column, const unsigned row, const boost::optional &value, const std::shared_ptr &content, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, const IWORKCellType type) ++void IWORKTableRecorder::insertCell(const unsigned column, const unsigned row, const boost::optional &value, const boost::shared_ptr &content, const unsigned columnSpan, const unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, const IWORKCellType type) + { + m_impl->m_elements.push_back(InsertCell(column, row, value, content, columnSpan, rowSpan, formula, style, type)); + } +--- src/lib/IWORKTableRecorder.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKTableRecorder.h +@@ -10,9 +10,8 @@ + #ifndef IWORKTABLERECORDER_H_INCLUDED + #define IWORKTABLERECORDER_H_INCLUDED + +-#include +- + #include ++#include + + #include "IWORKStyle_fwd.h" + #include "IWORKTable.h" +@@ -38,7 +37,7 @@ class IWORKTableRecorder (public) + void setStyle(const IWORKStylePtr_t &style); + void setSizes(const IWORKColumnSizes_t &columnSizes, const IWORKRowSizes_t &rowSizes); + void setBorders(const IWORKGridLineMap_t &verticalLines, const IWORKGridLineMap_t &horizontalLines); +- void insertCell(unsigned column, unsigned row, const boost::optional &value, const std::shared_ptr &content, unsigned columnSpan, unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, IWORKCellType type); ++ void insertCell(unsigned column, unsigned row, const boost::optional &value, const boost::shared_ptr &content, unsigned columnSpan, unsigned rowSpan, const boost::optional &formula, const IWORKStylePtr_t &style, IWORKCellType type); + void insertCoveredCell(unsigned column, unsigned row); + + void setDefaultCellStyle(IWORKTable::CellType type, const IWORKStylePtr_t &style); +@@ -49,7 +48,7 @@ class IWORKTableRecorder (public) + struct Impl; + + private: +- std::shared_ptr m_impl; ++ boost::shared_ptr m_impl; + }; + + } +--- src/lib/IWORKText.cpp.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWORKText.cpp +@@ -10,10 +10,10 @@ + #include "IWORKText.h" + + #include +-#include + #include + #include + ++#include + #include + #include + +@@ -474,12 +474,12 @@ IWORKText::~IWORKText() + assert(m_isOrderedStack.empty()); + } + +-void IWORKText::setRecorder(const std::shared_ptr &recorder) ++void IWORKText::setRecorder(const boost::shared_ptr &recorder) + { + m_recorder = recorder; + } + +-const std::shared_ptr &IWORKText::getRecorder() const ++const boost::shared_ptr &IWORKText::getRecorder() const + { + return m_recorder; + } +--- src/lib/IWORKText.h.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWORKText.h +@@ -35,8 +35,8 @@ class IWORKText (public) + IWORKText(const IWORKLanguageManager &langManager, bool discardEmptyContent); + ~IWORKText(); + +- void setRecorder(const std::shared_ptr &recorder); +- const std::shared_ptr &getRecorder() const; ++ void setRecorder(const boost::shared_ptr &recorder); ++ const boost::shared_ptr &getRecorder() const; + + /// Set style used as base for all layout styles in this text. + void pushBaseLayoutStyle(const IWORKStylePtr_t &style); +@@ -131,7 +131,7 @@ class IWORKText (public) + + IWORKStylePtr_t m_oldSpanStyle; + +- std::shared_ptr m_recorder; ++ boost::shared_ptr m_recorder; + }; + + } +--- src/lib/IWORKTextRecorder.h.orig 2017-10-23 07:42:01 UTC ++++ src/lib/IWORKTextRecorder.h +@@ -10,9 +10,10 @@ + #ifndef IWORKTEXTRECORDER_H_INCLUDED + #define IWORKTEXTRECORDER_H_INCLUDED + +-#include + #include + ++#include ++ + #include "IWORKStyle_fwd.h" + + namespace libetonyek +@@ -57,7 +58,7 @@ class IWORKTextRecorder (private) + struct Impl; + + private: +- std::shared_ptr m_impl; ++ boost::shared_ptr m_impl; + }; + + } +--- src/lib/IWORKText_fwd.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKText_fwd.h +@@ -10,14 +10,14 @@ + #ifndef IWORKTEXT_FWD_H_INCLUDED + #define IWORKTEXT_FWD_H_INCLUDED + +-#include ++#include + + namespace libetonyek + { + + class IWORKText; + +-typedef std::shared_ptr IWORKTextPtr_t; ++typedef boost::shared_ptr IWORKTextPtr_t; + + } + +--- src/lib/IWORKToken.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/IWORKToken.cpp +@@ -11,7 +11,8 @@ + + #include + #include +-#include ++ ++#include + + #include "IWORKTokenizerBase.h" + +--- src/lib/IWORKTypes_fwd.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKTypes_fwd.h +@@ -10,10 +10,11 @@ + #define IWORKTYPES_FWD_H_INCLUDED + + #include +-#include + #include + #include + ++#include ++ + namespace libetonyek + { + +@@ -29,7 +30,7 @@ typedef std::unordered_map IWOR + + typedef std::unordered_map IWORKTableNameMap_t; + +-typedef std::shared_ptr IWORKTableNameMapPtr_t; ++typedef boost::shared_ptr IWORKTableNameMapPtr_t; + + typedef std::unordered_map IWORKContentMap_t; + +@@ -38,42 +39,42 @@ struct IWORKPosition; + + struct IWORKGeometry; + +-typedef std::shared_ptr IWORKGeometryPtr_t; ++typedef boost::shared_ptr IWORKGeometryPtr_t; + + struct IWORKLine; + +-typedef std::shared_ptr IWORKLinePtr_t; ++typedef boost::shared_ptr IWORKLinePtr_t; + + struct IWORKData; + +-typedef std::shared_ptr IWORKDataPtr_t; ++typedef boost::shared_ptr IWORKDataPtr_t; + typedef std::unordered_map IWORKDataMap_t; + + struct IWORKMediaContent; + +-typedef std::shared_ptr IWORKMediaContentPtr_t; ++typedef boost::shared_ptr IWORKMediaContentPtr_t; + typedef std::unordered_map IWORKMediaContentMap_t; + + struct IWORKImage; + +-typedef std::shared_ptr IWORKImagePtr_t; ++typedef boost::shared_ptr IWORKImagePtr_t; + typedef std::unordered_map IWORKImageMap_t; + + struct IWORKMedia; + +-typedef std::shared_ptr IWORKMediaPtr_t; ++typedef boost::shared_ptr IWORKMediaPtr_t; + + struct IWORKWrap; + +-typedef std::shared_ptr IWORKWrapPtr_t; ++typedef boost::shared_ptr IWORKWrapPtr_t; + + struct IWORKGroup; + +-typedef std::shared_ptr IWORKGroupPtr_t; ++typedef boost::shared_ptr IWORKGroupPtr_t; + + struct IWORKTableData; + +-typedef std::shared_ptr IWORKTableDataPtr_t; ++typedef boost::shared_ptr IWORKTableDataPtr_t; + + } + +--- src/lib/IWORKXMLContext.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKXMLContext.h +@@ -10,14 +10,14 @@ + #ifndef IWORKXMLCONTEXT_H_INCLUDED + #define IWORKXMLCONTEXT_H_INCLUDED + +-#include ++#include + + namespace libetonyek + { + + class IWORKXMLContext; + +-typedef std::shared_ptr IWORKXMLContextPtr_t; ++typedef boost::shared_ptr IWORKXMLContextPtr_t; + + class IWORKXMLContext + { +--- src/lib/IWORKXMLParserState.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKXMLParserState.cpp +@@ -9,7 +9,7 @@ + + #include "IWORKXMLParserState.h" + +-#include ++#include + + #include "IWORKCollector.h" + #include "IWORKDictionary.h" +@@ -25,7 +25,7 @@ IWORKXMLParserState::IWORKXMLParserState(IWORKParser & + : m_tableData() + , m_stylesheet() + , m_enableCollector(true) +- , m_tableNameMap(std::make_shared()) ++ , m_tableNameMap(boost::make_shared()) + , m_currentTable() + , m_currentText() + , m_parser(parser) +--- src/lib/IWORKXMLParserState.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/IWORKXMLParserState.h +@@ -10,7 +10,7 @@ + #ifndef IWORKXMLPARSERSTATE_H_INCLUDED + #define IWORKXMLPARSERSTATE_H_INCLUDED + +-#include ++#include + + #include "IWORKStylesheet.h" + #include "IWORKLanguageManager.h" +@@ -49,8 +49,8 @@ class IWORKXMLParserState (public) + bool m_enableCollector; + IWORKTableNameMapPtr_t m_tableNameMap; + IWORKLanguageManager m_langManager; +- std::shared_ptr m_currentTable; +- std::shared_ptr m_currentText; ++ boost::shared_ptr m_currentTable; ++ boost::shared_ptr m_currentText; + + private: + IWORKParser &m_parser; +--- src/lib/KEY1Token.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/KEY1Token.cpp +@@ -11,7 +11,8 @@ + + #include + #include +-#include ++ ++#include + + #include "IWORKTokenizerBase.h" + +--- src/lib/KEY2Collector.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/KEY2Collector.cpp +@@ -9,7 +9,7 @@ + + #include "KEY2Collector.h" + +-#include ++#include + + #include "IWORKRecorder.h" + #include "IWORKTable.h" +@@ -25,19 +25,19 @@ KEY2Collector::KEY2Collector(IWORKDocumentInterface *c + { + } + +-std::shared_ptr KEY2Collector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const ++boost::shared_ptr KEY2Collector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const + { +- const std::shared_ptr table(IWORKCollector::createTable(tableNameMap, langManager)); ++ const boost::shared_ptr table(IWORKCollector::createTable(tableNameMap, langManager)); + if (m_paint) +- table->setRecorder(std::make_shared()); ++ table->setRecorder(boost::make_shared()); + return table; + } + +-std::shared_ptr KEY2Collector::createText(const IWORKLanguageManager &langManager, const bool discardEmptyContent) const ++boost::shared_ptr KEY2Collector::createText(const IWORKLanguageManager &langManager, const bool discardEmptyContent) const + { +- const std::shared_ptr text(IWORKCollector::createText(langManager, discardEmptyContent)); ++ const boost::shared_ptr text(IWORKCollector::createText(langManager, discardEmptyContent)); + if (m_paint) +- text->setRecorder(std::make_shared()); ++ text->setRecorder(boost::make_shared()); + return text; + } + +--- src/lib/KEY2Collector.h.orig 2017-10-04 07:49:01 UTC ++++ src/lib/KEY2Collector.h +@@ -22,8 +22,8 @@ class KEY2Collector : public KEYCollector (public) + explicit KEY2Collector(IWORKDocumentInterface *document); + + public: +- std::shared_ptr createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const override; +- std::shared_ptr createText(const IWORKLanguageManager &langManager, bool discardEmptyContent = false) const override; ++ boost::shared_ptr createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const override; ++ boost::shared_ptr createText(const IWORKLanguageManager &langManager, bool discardEmptyContent = false) const override; + }; + + } // namespace libetonyek +--- src/lib/KEY2Token.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/KEY2Token.cpp +@@ -11,7 +11,8 @@ + + #include + #include +-#include ++ ++#include + + #include "IWORKTokenizerBase.h" + +--- src/lib/KEY6Parser.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/KEY6Parser.cpp +@@ -10,8 +10,9 @@ + + #include + #include +-#include + ++#include ++ + #include "IWAMessage.h" + #include "IWAObjectType.h" + #include "IWORKProperties.h" +@@ -22,6 +23,7 @@ + namespace libetonyek + { + ++using boost::make_shared; + using boost::none; + using boost::optional; + +@@ -30,7 +32,6 @@ using namespace std::placeholders; + using std::bind; + using std::deque; + using std::for_each; +-using std::make_shared; + using std::string; + + KEY6Parser::KEY6Parser(const RVNGInputStreamPtr_t &fragments, const RVNGInputStreamPtr_t &package, KEYCollector &collector) +--- src/lib/KEYCollector.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/KEYCollector.cpp +@@ -243,7 +243,7 @@ void KEYCollector::endPage() + { + assert(m_pageOpened); + +- const std::shared_ptr recorder(m_recorder); ++ const boost::shared_ptr recorder(m_recorder); + m_recorder.reset(); + if (recorder) + recorder->replay(*this); +--- src/lib/KEYTypes_fwd.h.orig 2017-05-16 07:53:14 UTC ++++ src/lib/KEYTypes_fwd.h +@@ -9,10 +9,11 @@ + #ifndef KEYTYPES_FWD_H_INCLUDED + #define KEYTYPES_FWD_H_INCLUDED + +-#include + #include + #include + ++#include ++ + #include "IWORKTypes_fwd.h" + + namespace libetonyek +@@ -20,12 +21,12 @@ namespace libetonyek + + struct KEYLayer; + +-typedef std::shared_ptr KEYLayerPtr_t; ++typedef boost::shared_ptr KEYLayerPtr_t; + typedef std::unordered_map KEYLayerMap_t; + + struct KEYPlaceholder; + +-typedef std::shared_ptr KEYPlaceholderPtr_t; ++typedef boost::shared_ptr KEYPlaceholderPtr_t; + typedef std::unordered_map KEYPlaceholderMap_t; + + } +--- src/lib/NUM1Token.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/NUM1Token.cpp +@@ -11,7 +11,8 @@ + + #include + #include +-#include ++ ++#include + + #include "IWORKTokenizerBase.h" + +--- src/lib/PAG1Token.cpp.orig 2017-10-04 07:49:01 UTC ++++ src/lib/PAG1Token.cpp +@@ -11,7 +11,8 @@ + + #include + #include +-#include ++ ++#include + + #include "IWORKTokenizerBase.h" + +--- src/lib/PAGCollector.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/PAGCollector.cpp +@@ -10,7 +10,8 @@ + #include "PAGCollector.h" + + #include +-#include ++ ++#include + + #include "IWORKDocumentInterface.h" + #include "IWORKOutputElements.h" +--- src/lib/contexts/IWORKListstyleElement.cpp.orig 2017-10-23 07:42:01 UTC ++++ src/lib/contexts/IWORKListstyleElement.cpp +@@ -9,9 +9,10 @@ + + #include "IWORKListstyleElement.h" + +-#include + #include + ++#include ++ + #include "IWORKDictionary.h" + #include "IWORKListLabelGeometriesProperty.h" + #include "IWORKListLabelIndentsProperty.h" +@@ -68,7 +69,7 @@ void IWORKListstyleElement::endOfElement() + levelProps[i].put(m_textIndents[i]); + } + for (std::size_t i = 0; i != levels; ++i) +- m_style[i] = std::make_shared(levelProps[i], boost::none, boost::none); ++ m_style[i] = boost::make_shared(levelProps[i], boost::none, boost::none); + + if (getId()) + getState().getDictionary().m_listStyles[get(getId())] = m_style; +--- src/lib/contexts/IWORKPropertyMapElement.cpp.orig 2017-10-23 07:42:01 UTC ++++ src/lib/contexts/IWORKPropertyMapElement.cpp +@@ -9,7 +9,7 @@ + + #include "IWORKPropertyMapElement.h" + +-#include ++#include + + #include "libetonyek_xml.h" + #include "IWORKCollector.h" +@@ -39,11 +39,11 @@ + namespace libetonyek + { + ++using boost::make_shared; + using boost::none; + using boost::optional; + + using std::deque; +-using std::make_shared; + using std::string; + + namespace +--- src/lib/contexts/IWORKTabularInfoElement.cpp.orig 2017-10-23 07:42:01 UTC ++++ src/lib/contexts/IWORKTabularInfoElement.cpp +@@ -11,9 +11,9 @@ + + #include + #include +-#include + + #include ++#include + + #include "libetonyek_xml.h" + #include "IWORKCollector.h" +@@ -36,8 +36,7 @@ namespace libetonyek + + using boost::lexical_cast; + using boost::optional; +- +-using std::shared_ptr; ++using boost::shared_ptr; + using std::string; + + namespace +--- src/lib/libetonyek_utils.h.orig 2017-08-11 08:01:41 UTC ++++ src/lib/libetonyek_utils.h +@@ -15,11 +15,12 @@ + #endif + + #include +-#include + #include + + #include + ++#include ++ + #include + #include + +@@ -79,7 +80,7 @@ struct EtonyekDummyDeleter + void operator()(void *) {} + }; + +-typedef std::shared_ptr RVNGInputStreamPtr_t; ++typedef boost::shared_ptr RVNGInputStreamPtr_t; + + uint8_t readU8(const RVNGInputStreamPtr_t &input, bool = false); + uint16_t readU16(const RVNGInputStreamPtr_t &input, bool bigEndian=false); +--- src/lib/libetonyek_xml.cpp.orig 2017-05-16 07:53:14 UTC ++++ src/lib/libetonyek_xml.cpp +@@ -12,6 +12,7 @@ + #include + + #include ++#include + #include + #include + +--- src/test/IWAFieldTest.cpp.orig 2017-04-06 18:20:50 UTC ++++ src/test/IWAFieldTest.cpp +@@ -11,7 +11,7 @@ + #include + #include + +-#include ++#include + + #include + #include +@@ -29,7 +29,7 @@ namespace + + RVNGInputStreamPtr_t makeStream(const unsigned char *const bytes, const unsigned long length) + { +- return std::make_shared(bytes, length); ++ return boost::make_shared(bytes, length); + } + + } +--- src/test/IWAMessageTest.cpp.orig 2017-04-06 18:20:50 UTC ++++ src/test/IWAMessageTest.cpp +@@ -7,7 +7,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +-#include ++#include + + #include + #include +@@ -28,7 +28,7 @@ namespace + + RVNGInputStreamPtr_t makeStream(const unsigned char *const bytes, const unsigned long length) + { +- return std::make_shared(bytes, length); ++ return boost::make_shared(bytes, length); + } + + } +--- src/test/IWAReaderTest.cpp.orig 2017-04-06 18:20:50 UTC ++++ src/test/IWAReaderTest.cpp +@@ -7,7 +7,7 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +-#include ++#include + + #include + #include +@@ -28,7 +28,7 @@ namespace + + RVNGInputStreamPtr_t makeStream(const unsigned char *const bytes, const unsigned long length) + { +- return std::make_shared(bytes, length); ++ return boost::make_shared(bytes, length); + } + + } +--- src/test/IWASnappyStreamTest.cpp.orig 2017-04-06 18:20:50 UTC ++++ src/test/IWASnappyStreamTest.cpp +@@ -11,7 +11,7 @@ + #include + #include + +-#include ++#include + + #include + #include +--- src/test/IWORKStyleTest.cpp.orig 2017-04-06 18:29:51 UTC ++++ src/test/IWORKStyleTest.cpp +@@ -20,6 +20,7 @@ namespace test + { + + using boost::optional; ++using boost::shared_ptr; + + using libetonyek::property::Answer; + using libetonyek::property::Antwort; +@@ -31,7 +32,6 @@ using libetonyek::IWORKStylePtr_t; + using libetonyek::IWORKStylesheet; + using libetonyek::IWORKStylesheetPtr_t; + +-using std::shared_ptr; + using std::string; + using std::unordered_map; + +--- src/test/LibetonyekUtilsTest.cpp.orig 2017-04-06 18:20:50 UTC ++++ src/test/LibetonyekUtilsTest.cpp +@@ -8,9 +8,10 @@ + */ + + #include +-#include + #include + ++#include ++ + #include + #include + +@@ -33,7 +34,7 @@ namespace + + RVNGInputStreamPtr_t makeStream(const char *const bytes, const size_t len) + { +- return std::make_shared(reinterpret_cast(bytes), len); ++ return boost::make_shared(reinterpret_cast(bytes), len); + } + + RVNGInputStreamPtr_t makeEmptyStream() Property changes on: head/graphics/libetonyek01/files/extrapatch-libc++-memory ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libetonyek01/pkg-descr =================================================================== --- head/graphics/libetonyek01/pkg-descr (revision 452891) +++ head/graphics/libetonyek01/pkg-descr (revision 452892) @@ -1,4 +1,4 @@ Libetonyek is library providing ability to interpret and import Apple Keynote presentations into various applications. -WWW: http://www.freedesktop.org/wiki/Software/libetonyek +WWW: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek Index: head/graphics/libetonyek01/pkg-plist =================================================================== --- head/graphics/libetonyek01/pkg-plist (revision 452891) +++ head/graphics/libetonyek01/pkg-plist (revision 452892) @@ -1,15 +1,15 @@ bin/key2raw bin/key2text bin/key2xhtml bin/numbers2csv bin/numbers2raw bin/numbers2text bin/pages2html bin/pages2raw bin/pages2text include/libetonyek-0.1/libetonyek/EtonyekDocument.h include/libetonyek-0.1/libetonyek/libetonyek.h lib/libetonyek-0.1.so lib/libetonyek-0.1.so.1 -lib/libetonyek-0.1.so.1.0.6 +lib/libetonyek-0.1.so.1.0.7 libdata/pkgconfig/libetonyek-0.1.pc