Date: Wed, 25 Oct 2017 19:37:53 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452892 - in head/graphics/libetonyek01: . files Message-ID: <201710251937.v9PJbrTo026071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Oct 25 19:37:52 2017 New Revision: 452892 URL: https://svnweb.freebsd.org/changeset/ports/452892 Log: Update to 0.1.7. Added: head/graphics/libetonyek01/files/extrapatch-libc++-memory (contents, props changed) Deleted: head/graphics/libetonyek01/files/patch-configure.ac Modified: head/graphics/libetonyek01/Makefile head/graphics/libetonyek01/distinfo head/graphics/libetonyek01/pkg-descr head/graphics/libetonyek01/pkg-plist Modified: head/graphics/libetonyek01/Makefile ============================================================================== --- head/graphics/libetonyek01/Makefile Wed Oct 25 18:43:33 2017 (r452891) +++ head/graphics/libetonyek01/Makefile Wed Oct 25 19:37:52 2017 (r452892) @@ -1,18 +1,18 @@ # $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 @@ -21,26 +21,19 @@ LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ 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 <bsd.port.pre.mk> -.include <bsd.port.options.mk> - -.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 <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/graphics/libetonyek01/distinfo ============================================================================== --- head/graphics/libetonyek01/distinfo Wed Oct 25 18:43:33 2017 (r452891) +++ head/graphics/libetonyek01/distinfo Wed Oct 25 19:37:52 2017 (r452892) @@ -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 Added: head/graphics/libetonyek01/files/extrapatch-libc++-memory ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libetonyek01/files/extrapatch-libc++-memory Wed Oct 25 19:37:52 2017 (r452892) @@ -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 <boost/shared_ptr.hpp> ++ + #include <iostream> +-#include <memory> + #include <sstream> + #include <stdio.h> + #include <string.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge/librevenge.h> + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> +@@ -74,7 +75,7 @@ int main(int argc, char *argv[]) + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> + #include <librevenge/librevenge.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> + #include <librevenge/librevenge.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge/librevenge.h> + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> +@@ -81,7 +82,7 @@ int main(int argc, char *argv[]) + if (!file) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr<librevenge::RVNGInputStream> 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 <boost/shared_ptr.hpp> ++ + #include <iostream> +-#include <memory> + #include <sstream> + #include <stdio.h> + #include <string.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> + #include <librevenge/librevenge.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> + #include <librevenge/librevenge.h> +@@ -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<librevenge::RVNGInputStream> 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 <memory> + #include <stdio.h> + #include <string.h> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge/librevenge.h> + #include <librevenge-generators/librevenge-generators.h> + #include <librevenge-stream/librevenge-stream.h> +@@ -77,7 +78,7 @@ int main(int argc, char *argv[]) + if (!szInputFile) + return printUsage(); + +- using std::shared_ptr; ++ using boost::shared_ptr; + + shared_ptr<librevenge::RVNGInputStream> 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 <libetonyek/libetonyek.h> + + #include <cassert> +-#include <memory> + + #include <boost/optional.hpp> ++#include <boost/shared_ptr.hpp> + + #include <libxml/xmlreader.h> + +@@ -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 <deque> +-#include <memory> + #include <stdexcept> + + #include <boost/container/deque.hpp> + #include <boost/optional.hpp> ++#include <boost/shared_ptr.hpp> + + #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<IWAField> IWAFieldPtr_t; ++typedef boost::shared_ptr<IWAField> 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 <cassert> +-#include <memory> + ++#include <boost/make_shared.hpp> ++ + namespace libetonyek + { + +@@ -202,7 +203,7 @@ const FieldT &IWAMessage::getField(const std::size_t f + } + else + { +- fieldIt->second.m_realField = std::make_shared<FieldT>(); ++ fieldIt->second.m_realField = boost::make_shared<FieldT>(); + for (std::deque<InputRange_t>::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 <cassert> + #include <functional> + #include <map> +-#include <memory> + #include <utility> + ++#include <boost/make_shared.hpp> + #include <boost/optional.hpp> + + #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 <deque> + #include <functional> + #include <map> +-#include <memory> + #include <string> + #include <unordered_map> + + #include <boost/optional.hpp> ++#include <boost/shared_ptr.hpp> + #include <boost/variant.hpp> + + #include <mdds/flat_segment_tree.hpp> +@@ -119,7 +119,7 @@ class IWAParser (protected) + + protected: + IWORKLanguageManager m_langManager; +- std::shared_ptr<IWORKText> m_currentText; ++ boost::shared_ptr<IWORKText> m_currentText; + + private: + typedef std::map<unsigned, boost::variant<std::string, unsigned> > DataList_t; +@@ -134,9 +134,9 @@ class IWAParser (protected) + + struct TableInfo + { +- TableInfo(const std::shared_ptr<IWORKTable> &table, unsigned columns, unsigned rows); ++ TableInfo(const boost::shared_ptr<IWORKTable> &table, unsigned columns, unsigned rows); + +- std::shared_ptr<IWORKTable> m_table; ++ boost::shared_ptr<IWORKTable> 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<TableInfo> m_currentTable; ++ boost::shared_ptr<TableInfo> 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 <cassert> +-#include <memory> + ++#include <boost/make_shared.hpp> ++ + #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<IWORKMemoryStream>(bytes, std::size_t(length)); ++ return boost::make_shared<IWORKMemoryStream>(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 <cassert> + #include <limits> +-#include <memory> + #include <utility> + #include <vector> + ++#include <boost/make_shared.hpp> ++ + #include "IWORKMemoryStream.h" + + using std::vector; +@@ -155,7 +156,7 @@ RVNGInputStreamPtr_t uncompress(const RVNGInputStreamP + throw CompressionException(); + } + +- return std::make_shared<IWORKMemoryStream>(data); ++ return boost::make_shared<IWORKMemoryStream>(data); + } + + } +@@ -177,7 +178,7 @@ RVNGInputStreamPtr_t IWASnappyStream::uncompressBlock( + { + vector<unsigned char> data; + libetonyek::uncompressBlock(block, getLength(block), data); +- return std::make_shared<IWORKMemoryStream>(data); ++ return boost::make_shared<IWORKMemoryStream>(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 <memory> ++#include <boost/make_shared.hpp> + + #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 <cmath> + #include <cstring> + #include <functional> +-#include <memory> + ++#include <boost/make_shared.hpp> ++ + #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<IWORKRecorder> &recorder) ++void IWORKCollector::setRecorder(const boost::shared_ptr<IWORKRecorder> &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<IWORKTable> &table) ++void IWORKCollector::collectTable(const boost::shared_ptr<IWORKTable> &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<IWORKText> &text) ++void IWORKCollector::collectText(const boost::shared_ptr<IWORKText> &text) + { + if (bool(m_recorder)) + { +@@ -677,12 +678,12 @@ void IWORKCollector::endGroup() + --m_groupLevel; + } + +-std::shared_ptr<IWORKTable> IWORKCollector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const ++boost::shared_ptr<IWORKTable> IWORKCollector::createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const + { + return shared_ptr<IWORKTable>(new IWORKTable(tableNameMap, langManager)); + } + +-std::shared_ptr<IWORKText> IWORKCollector::createText(const IWORKLanguageManager &langManager, bool discardEmptyContent) const ++boost::shared_ptr<IWORKText> IWORKCollector::createText(const IWORKLanguageManager &langManager, bool discardEmptyContent) const + { + return make_shared<IWORKText>(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 <deque> +-#include <memory> + #include <stack> + #include <string> + + #include <boost/optional.hpp> ++#include <boost/shared_ptr.hpp> + + #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<IWORKRecorder> &recorder); ++ void setRecorder(const boost::shared_ptr<IWORKRecorder> &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<IWORKTable> &table); +- void collectText(const std::shared_ptr<IWORKText> &text); ++ void collectTable(const boost::shared_ptr<IWORKTable> &table); ++ void collectText(const boost::shared_ptr<IWORKText> &text); + + void startDocument(); + void endDocument(); +@@ -112,8 +112,8 @@ class IWORKCollector (public) + IWORKOutputManager &getOutputManager(); + + public: +- virtual std::shared_ptr<IWORKTable> createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const; +- virtual std::shared_ptr<IWORKText> createText(const IWORKLanguageManager &langManager, bool discardEmptyContent = false) const; ++ virtual boost::shared_ptr<IWORKTable> createTable(const IWORKTableNameMapPtr_t &tableNameMap, const IWORKLanguageManager &langManager) const; ++ virtual boost::shared_ptr<IWORKText> 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<IWORKRecorder> m_recorder; ++ boost::shared_ptr<IWORKRecorder> m_recorder; + + std::stack<Level> m_levelStack; + IWORKStyleStack m_styleStack; +@@ -145,8 +145,8 @@ class IWORKCollector (public) + + std::deque<IWORKStylePtr_t> m_newStyles; + +- std::shared_ptr<IWORKTable> m_currentTable; +- std::shared_ptr<IWORKText> m_currentText; ++ boost::shared_ptr<IWORKTable> m_currentTable; ++ boost::shared_ptr<IWORKText> 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 <memory> ++#include <boost/enable_shared_from_this.hpp> ++#include <boost/shared_ptr.hpp> + + #include "IWORKXMLContext.h" + +@@ -19,7 +20,7 @@ namespace libetonyek + + class IWORKXMLParserState; + +-class IWORKDiscardContext : public IWORKXMLContext, public std::enable_shared_from_this<IWORKDiscardContext> ++class IWORKDiscardContext : public IWORKXMLContext, public boost::enable_shared_from_this<IWORKDiscardContext> + { + struct Data; + +@@ -37,7 +38,7 @@ class IWORKDiscardContext : public IWORKXMLContext, pu + IWORKXMLParserState &m_state; + unsigned m_level; + bool m_enableCollector; +- std::shared_ptr<Data> m_data; ++ boost::shared_ptr<Data> 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 <memory> + #include <string> + ++#include <boost/shared_ptr.hpp> ++ + #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<Impl> m_impl; ++ boost::shared_ptr<Impl> 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 <memory> + #include <string> + #include <unordered_map> + #include <unordered_set> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge/librevenge.h> + + namespace libetonyek +@@ -48,7 +49,7 @@ class IWORKLanguageManager (private) + std::unordered_map<std::string, std::string> m_localeMap; + std::unordered_set<std::string> m_invalidLocales; + std::unordered_map<std::string, librevenge::RVNGPropertyList> m_propsMap; +- mutable std::shared_ptr<LangDB> m_langDB; ++ mutable boost::shared_ptr<LangDB> 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<unsigned char> &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 <memory> + #include <vector> + + #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<unsigned char[]> 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 <memory> ++#include <boost/make_shared.hpp> + + #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<OpenFormulaCellElement>(new OpenFormulaCellElement(propList, formula, tableNameMap))); ++ m_elements.push_back(boost::shared_ptr<OpenFormulaCellElement>(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 <deque> +-#include <memory> + #include <unordered_map> + ++#include <boost/shared_ptr.hpp> ++ + #include <librevenge/librevenge.h> + + #include "IWORKTypes_fwd.h" +@@ -28,7 +29,7 @@ class IWORKOutputElement; + + class IWORKOutputElements + { +- typedef std::deque<std::shared_ptr<IWORKOutputElement> > ElementList_t; ++ typedef std::deque<boost::shared_ptr<IWORKOutputElement> > 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 <cassert> +-#include <memory> + ++#include <boost/shared_ptr.hpp> ++ + #include <libxml/xmlreader.h> + + #include <stack> +@@ -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<Impl> m_impl; ++ boost::shared_ptr<Impl> 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 <memory> + #include <unordered_map> + ++#include <boost/shared_ptr.hpp> ++ + #include "IWORKTypes_fwd.h" + + namespace libetonyek +@@ -19,7 +20,7 @@ namespace libetonyek + + class IWORKPath; + +-typedef std::shared_ptr<IWORKPath> IWORKPathPtr_t; ++typedef boost::shared_ptr<IWORKPath> IWORKPathPtr_t; + typedef std::unordered_map<ID_t, IWORKPathPtr_t> 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<IWORKTable> &table) ++ CollectTable(const boost::shared_ptr<IWORKTable> &table) + : m_table(table) + { + } + +- const std::shared_ptr<IWORKTable> m_table; ++ const boost::shared_ptr<IWORKTable> m_table; + }; + + struct CollectText + { +- CollectText(const std::shared_ptr<IWORKText> &text) ++ CollectText(const boost::shared_ptr<IWORKText> &text) + : m_text(text) + { + } + +- const std::shared_ptr<IWORKText> m_text; ++ const boost::shared_ptr<IWORKText> 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<IWORKTable> &table) ++void IWORKRecorder::collectTable(const boost::shared_ptr<IWORKTable> &table) + { + m_impl->m_elements.push_back(CollectTable(table)); + } + +-void IWORKRecorder::collectText(const std::shared_ptr<IWORKText> &text) ++void IWORKRecorder::collectText(const boost::shared_ptr<IWORKText> &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 <memory> + #include <string> + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710251937.v9PJbrTo026071>