svn commit: r416753 - in head: . editors editors/pdfedit editors/pdfedit/files
Hiroki Sato
hrs at FreeBSD.org
Sat Jun 11 20:53:28 UTC 2016
Author: hrs
Date: Sat Jun 11 20:53:25 2016
New Revision: 416753
URL: https://svnweb.freebsd.org/changeset/ports/416753
Log:
- Resurrect editors/pdfedit. Fix to compile the library part only
because of QT3 deprecation long time ago.
- Take maintainership.
Added:
head/editors/pdfedit/
- copied from r323728, head/editors/pdfedit/
head/editors/pdfedit/files/patch-Makefile (contents, props changed)
head/editors/pdfedit/files/patch-Makefile.flags.in (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cannotation.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-carray.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cdict.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cdict.h (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cobject.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cpage.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cpageannots.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cpageattributes.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cpagechanges.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cpdf.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-cstream.c (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-pdfoperators.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-pdfoperatorsbase.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-pdfwriter.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-stateupdater.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-kernel-textoutputengines.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-Makfile (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-add_image.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-add_text.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-displaycs.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-pagemetrics.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-pdf_images.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-tools-replace_text.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-utils-algorithms.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiEncodings.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiTrueType.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-fofi-FoFiType1C.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-goo-GString.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-goo-GString.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.cc (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-xpdf-BuiltinFont.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-xpdf-NameToUnicodeTable.h (contents, props changed)
head/editors/pdfedit/files/patch-src-xpdf-xpdf-Object.h (contents, props changed)
Modified:
head/MOVED
head/editors/Makefile
head/editors/pdfedit/Makefile
head/editors/pdfedit/files/patch-src__kernel__cpagecontents.cc
head/editors/pdfedit/files/patch-src__tools__pdf_to_text.cc
head/editors/pdfedit/pkg-descr
head/editors/pdfedit/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Sat Jun 11 20:43:37 2016 (r416752)
+++ head/MOVED Sat Jun 11 20:53:25 2016 (r416753)
@@ -4507,7 +4507,6 @@ editors/kate-plugins||2013-07-26|Has exp
editors/kile||2013-07-26|Has expired: Depends on Qt 3.x
editors/klat||2013-07-26|Has expired: Depends on Qt 3.x
editors/kxmleditor||2013-07-26|Has expired: Depends on Qt 3.x
-editors/pdfedit||2013-07-26|Has expired: Depends on Qt 3.x
editors/rospell||2013-07-26|Has expired: Depends on Qt 3.x
finance/eqonomize-kde3||2013-07-26|Has expired: Depends on Qt 3.x
finance/kexchange||2013-07-26|Has expired: Depends on Qt 3.x
Modified: head/editors/Makefile
==============================================================================
--- head/editors/Makefile Sat Jun 11 20:43:37 2016 (r416752)
+++ head/editors/Makefile Sat Jun 11 20:53:25 2016 (r416753)
@@ -215,6 +215,7 @@
SUBDIR += p5-Proc-InvokeEditor
SUBDIR += p5-Vimana
SUBDIR += paredit-mode.el
+ SUBDIR += pdfedit
SUBDIR += pico-alpine
SUBDIR += pluma
SUBDIR += plume-creator-devel
Modified: head/editors/pdfedit/Makefile
==============================================================================
--- head/editors/pdfedit/Makefile Fri Jul 26 14:51:06 2013 (r323728)
+++ head/editors/pdfedit/Makefile Sat Jun 11 20:53:25 2016 (r416753)
@@ -3,54 +3,54 @@
PORTNAME= pdfedit
PORTVERSION= 0.4.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= SF
-MAINTAINER= ports at FreeBSD.org
-COMMENT= Free editor for manipulating PDF documents (QT3 GUI and CLI)
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs \
- t1.5:${PORTSDIR}/devel/t1lib
-
-DEPRECATED= Depends on QT3; unmaintained
-EXPIRATION_DATE= 2013-07-01
+MAINTAINER= hrs at FreeBSD.org
+COMMENT= PDF document manipulating library
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/doc/LICENSE.GPL
-USE_BZIP2= yes
-USE_QT_VER= 3
-USE_PERL5_BUILD=yes
-USE_GMAKE= yes
+LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \
+ libfreetype.so:print/freetype2 \
+ libpng16.so:graphics/png \
+ libt1.so:devel/t1lib
+
+USES= gmake perl5 tar:bzip2
+USE_PERL5= build
GNU_CONFIGURE= yes
-CONFIGURE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"
-CONFIGURE_ARGS= --with-t1-library=${LOCALBASE}/lib \
+CONFIGURE_ARGS= --with-root-dir=${STAGEDIR} \
+ --with-ft-library=${LOCALBASE}/lib \
+ --with-ft-includes=${LOCALBASE}/include \
+ --with-t1-library=${LOCALBASE}/lib \
--with-t1-includes=${LOCALBASE}/include \
- --with-parallel-make=off
-MAKE_ENV= ${CONFIGURE_ENV}
-MAKE_JOBS_SAFE= yes
+ --with-parallel-make=off \
+ --disable-gui \
+ --enable-pdfedit-core-dev \
+ --enable-tools
+INSTALL_TARGET= install install-tools
+PORTDOCS= Changelog README AUTHORS
+
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
-MAN1= pdfedit.1
+post-extract:
+ ${INSTALL_DATA} ${WRKSRC}/doc/AUTHORS ${WRKSRC}
post-patch:
- @${REINPLACE_CMD} -e \
- 's|-pedantic||g ; \
- s| $$(OPTIM)||g ; \
- s| $$(ARCH)||g ; \
- s| -pipe.*$$||g ; \
- s|^CFLAGS =|CFLAGS +=|g ; \
- s|^CXXFLAGS =|CXXFLAGS +=|g' ${WRKSRC}/Makefile.flags.in
- @${REINPLACE_CMD} -e \
- '/QMAKE/s| make| $$MAKE|g' ${WRKSRC}/src/qsa/configure
-
-post-install:
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in Changelog README doc/AUTHORS
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+ ${REINPLACE_CMD} -e \
+ 's|-pedantic||g ; \
+ s| $$(OPTIM)||g ; \
+ s| $$(ARCH)||g ; \
+ s| -pipe.*$$||g ; \
+ s|^CFLAGS =|CFLAGS +=|g ; \
+ s|^CXXFLAGS =|CXXFLAGS +=|g' ${WRKSRC}/Makefile.flags.in
+ ${REINPLACE_CMD} -e \
+ '/QMAKE/s| make| $$MAKE|g' ${WRKSRC}/src/qsa/configure
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Added: head/editors/pdfedit/files/patch-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-Makefile Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,12 @@
+--- Makefile.orig 2008-11-13 23:11:39.000000000 +0900
++++ Makefile 2016-06-12 05:32:04.209014000 +0900
+@@ -44,6 +44,9 @@
+ cd $(KERNELROOT) && $(MAKE) install-dev
+ cd $(OSROOT) && $(MAKE) install-dev
+
++install-tools:
++ cd $(TOOLSROOT) && $(MAKE) install
++
+
+ # Common uninstall target. It depends on configuration which specific
+ # uninstallation target will be used
Added: head/editors/pdfedit/files/patch-Makefile.flags.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-Makefile.flags.in Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,30 @@
+--- Makefile.flags.in.bak 2010-02-24 03:28:09.000000000 +0900
++++ Makefile.flags.in 2016-06-12 05:13:20.961050000 +0900
+@@ -131,20 +131,20 @@
+ # from autoconf --enable-observer-debug
+ OBSERVER_CXXFLAGS = @OBSERVER_CXXFLAGS@
+
+-EXTRA_UTILS_CXXFLAGS = @EXTRA_UTILS_CXXFLAGS@ -pedantic
+-EXTRA_KERNEL_CXXFLAGS = @EXTRA_KERNEL_CXXFLAGS@ -pedantic
++EXTRA_UTILS_CXXFLAGS = @EXTRA_UTILS_CXXFLAGS@
++EXTRA_KERNEL_CXXFLAGS = @EXTRA_KERNEL_CXXFLAGS@
+ EXTRA_TESTS_CXXFLAGS = @EXTRA_TESTS_CXXFLAGS@
+ EXTRA_GUI_CXXFLAGS = @EXTRA_GUI_CXXFLAGS@ -D CONFIG_DATA_PATH="$(DATA_PATH)"
+-EXTRA_XPDF_CXXFLAGS = @EXTRA_XPDF_CXXFLAGS@ -pedantic
++EXTRA_XPDF_CXXFLAGS = @EXTRA_XPDF_CXXFLAGS@
+
+ # same like for compiler stuff we also define 2 levels
+ # CONFIG_{NAME} can be used for qmake direct {NAME} can be used
+ # for compilation
+-CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) @STACK_PROTECTOR_FLAGS@ -pipe -posix -ansi -std=c99 -pedantic
+-CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) @STACK_PROTECTOR_FLAGS@ -pipe -posix -ansi -std=c++98
++CONFIG_CFLAGS = $(DEBUG) $(WARN) $(C_EXTRA) @STACK_PROTECTOR_FLAGS@
++CONFIG_CXXFLAGS = $(DEBUG) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) @STACK_PROTECTOR_FLAGS@
+
+-CFLAGS = $(CONFIG_CFLAGS)
+-CXXFLAGS = $(CONFIG_CXXFLAGS)
++CFLAGS += $(CONFIG_CFLAGS)
++CXXFLAGS += $(CONFIG_CXXFLAGS)
+
+ #######################################
+ # Absolute paths for all components
Added: head/editors/pdfedit/files/patch-src-kernel-cannotation.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cannotation.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,96 @@
+--- src/kernel/cannotation.cc.orig 2009-07-27 17:18:10.000000000 +0900
++++ src/kernel/cannotation.cc 2016-06-11 05:49:08.538858000 +0900
+@@ -114,13 +114,13 @@
+ AnnotList::const_iterator implElem;
+ if((implElem=implList.find(annotType))==implList.end())
+ return false;
+- shared_ptr<IAnnotInitializator> impl=implElem->second;
++ boost::shared_ptr<IAnnotInitializator> impl=implElem->second;
+
+ // use registerd implementator
+ return (*impl)(annotDict, annotType);
+ }
+
+-bool UniversalAnnotInitializer::registerInitializer(std::string annotType, shared_ptr<IAnnotInitializator> impl, bool forceNew)
++bool UniversalAnnotInitializer::registerInitializer(std::string annotType, boost::shared_ptr<IAnnotInitializator> impl, bool forceNew)
+ {
+ AnnotList::iterator elem=implList.find(annotType);
+ if(elem!=implList.end())
+@@ -229,10 +229,10 @@
+ } // namespace utils
+
+ // initialization of static
+-shared_ptr<utils::IAnnotInitializator>
+-CAnnotation::annotInit=shared_ptr<utils::IAnnotInitializator>(new utils::UniversalAnnotInitializer());
++boost::shared_ptr<utils::IAnnotInitializator>
++CAnnotation::annotInit=boost::shared_ptr<utils::IAnnotInitializator>(new utils::UniversalAnnotInitializer());
+
+-shared_ptr<CAnnotation> CAnnotation::createAnnotation(libs::Rectangle rect, string annotType)
++boost::shared_ptr<CAnnotation> CAnnotation::createAnnotation(libs::Rectangle rect, string annotType)
+ {
+ using namespace debug;
+ using namespace utils;
+@@ -240,7 +240,7 @@
+ kernelPrintDbg(DBG_DBG, "");
+
+ // creates new empty dictionary for annotation
+- shared_ptr<CDict> annotDictionary(CDictFactory::getInstance());
++ boost::shared_ptr<CDict> annotDictionary(CDictFactory::getInstance());
+
+ // initializes annotation dictionary maintaining information:
+ // Type of annotation dictionary has to be Annot (this is not strongly
+@@ -249,7 +249,7 @@
+ checkAndReplace(annotDictionary, "Type", *typeField);
+
+ // Rectangle of annotation is constructed from given parameter
+- shared_ptr<IProperty> rectField(getIPropertyFromRectangle(rect));
++ boost::shared_ptr<IProperty> rectField(getIPropertyFromRectangle(rect));
+ checkAndReplace(annotDictionary, "Rect", *rectField);
+
+ // last modified date field (M) is initialized to current local time
+@@ -257,7 +257,7 @@
+ time(&currTime);
+ struct tm currLocalTime;
+ localtime_r(&currTime, &currLocalTime);
+- shared_ptr<IProperty> mField=getIPropertyFromDate(&currLocalTime);
++ boost::shared_ptr<IProperty> mField=getIPropertyFromDate(&currLocalTime);
+ checkAndReplace(annotDictionary, "M", *mField);
+
+ // initializes annotation dictionary according desired type - at least Type
+@@ -270,7 +270,7 @@
+ if(!initialized)
+ kernelPrintDbg(DBG_WARN, "Unable to initialize annotation dictionary with type="<<annotType);
+
+- return shared_ptr<CAnnotation>(new CAnnotation(annotDictionary));
++ return boost::shared_ptr<CAnnotation>(new CAnnotation(annotDictionary));
+ }
+
+ void CAnnotation::invalidate()
+@@ -285,8 +285,8 @@
+ // Uses this instance as newValue, but uses EmptyDeallocator to keep
+ // instance alive when shared_ptr tries to destroy its content.
+ // context is empty
+- shared_ptr<CAnnotation> current(this, EmptyDeallocator<CAnnotation>());
+- notifyObservers(current, shared_ptr<ChangeContext>());
++ boost::shared_ptr<CAnnotation> current(this, EmptyDeallocator<CAnnotation>());
++ notifyObservers(current, boost::shared_ptr<ChangeContext>());
+ }
+
+ CAnnotation::AnnotType CAnnotation::getType()const
+@@ -295,14 +295,14 @@
+
+ try
+ {
+- shared_ptr<IProperty> subTypeProp=annotDictionary->getProperty("Subtype");
++ boost::shared_ptr<IProperty> subTypeProp=annotDictionary->getProperty("Subtype");
+ if(!isName(subTypeProp))
+ {
+ // TODO may be problem if value is indirect (what is not very usual)
+ kernelPrintDbg(DBG_WARN, "Subtype is not Name. Type="<<subTypeProp->getType());
+ return Unknown;
+ }
+- shared_ptr<CName> subTypeName=IProperty::getSmartCObjectPtr<CName>(subTypeProp);
++ boost::shared_ptr<CName> subTypeName=IProperty::getSmartCObjectPtr<CName>(subTypeProp);
+ string typeName;
+ subTypeName->getValue(typeName);
+ return utils::annotTypeMapping(typeName);
Added: head/editors/pdfedit/files/patch-src-kernel-carray.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-carray.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,118 @@
+--- src/kernel/carray.cc.orig 2009-09-11 21:02:56.000000000 +0900
++++ src/kernel/carray.cc 2016-06-11 05:52:59.028080000 +0900
+@@ -80,7 +80,7 @@
+ //
+ //
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CArray::getProperty (PropertyId id) const
+ {
+ //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id);
+@@ -88,7 +88,7 @@
+ if (id >= value.size())
+ throw OutOfRange ();
+
+- shared_ptr<IProperty> ip = value[id];
++ boost::shared_ptr<IProperty> ip = value[id];
+ // Set mode only if pdf is valid
+ _setMode (ip,id);
+
+@@ -146,7 +146,7 @@
+ // Check whether we can make the change
+ this->canChange();
+
+- shared_ptr<IProperty> oldip = value[id];
++ boost::shared_ptr<IProperty> oldip = value[id];
+
+ // Delete that item
+ value.erase (remove (value.begin(), value.end(), oldip));
+@@ -156,11 +156,11 @@
+ assert (hasValidRef (this));
+
+ // Create contest
+- shared_ptr<ObserverContext> context (_createContext (oldip,id));
++ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
+
+ try {
+ // notify observers and dispatch the change
+- _objectChanged (shared_ptr<IProperty> (new CNull), context);
++ _objectChanged (boost::shared_ptr<IProperty> (new CNull), context);
+
+ }catch (PdfException&)
+ {
+@@ -181,7 +181,7 @@
+ //
+ // Correctly to add an object (without name) can be done only to Array object
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CArray::addProperty (const IProperty& newIp)
+ {
+ //kernelPrintDbg (debug::DBG_DBG,"addProperty(...)");
+@@ -193,7 +193,7 @@
+ //
+ // REMARK: because of the compiler, we can't put PropertyId here
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CArray::addProperty (PropertyId position, const IProperty& newIp)
+ {
+ //kernelPrintDbg (debug::DBG_DBG,"addProperty(" << position << ")");
+@@ -208,7 +208,7 @@
+ this->canChange();
+
+ // Clone the added property
+- shared_ptr<IProperty> newIpClone = newIp.clone ();
++ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
+ assert (newIpClone);
+
+ // Inherit id, gen number and pdf
+@@ -230,7 +230,7 @@
+ assert (hasValidRef (this));
+
+ // Create contest
+- shared_ptr<ObserverContext> context (_createContext(shared_ptr<IProperty>(new CNull ()), position));
++ boost::shared_ptr<ObserverContext> context (_createContext(boost::shared_ptr<IProperty>(new CNull ()), position));
+
+ try {
+ // notify observers and dispatch the change
+@@ -256,7 +256,7 @@
+ //
+ //
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CArray::setProperty (PropertyId id, IProperty& newIp)
+ {
+ //kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")");
+@@ -269,9 +269,9 @@
+ this->canChange();
+
+ // Save the old one
+- shared_ptr<IProperty> oldip = value[id];
++ boost::shared_ptr<IProperty> oldip = value[id];
+ // Clone the added property
+- shared_ptr<IProperty> newIpClone = newIp.clone ();
++ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
+ assert (newIpClone);
+
+ // Inherit id, gen number and pdf
+@@ -289,7 +289,7 @@
+ assert (hasValidRef (this));
+
+ // Create contest
+- shared_ptr<ObserverContext> context (_createContext (oldip,id));
++ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
+
+ try {
+ // notify observers and dispatch the change
+@@ -437,7 +437,7 @@
+ //
+ //
+ IProperty::ObserverContext*
+-CArray::_createContext (shared_ptr<IProperty> changedIp, PropertyId id)
++CArray::_createContext (boost::shared_ptr<IProperty> changedIp, PropertyId id)
+ {
+ //kernelPrintDbg (debug::DBG_DBG, "");
+
Added: head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-ccontentstream.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,152 @@
+--- src/kernel/ccontentstream.cc.orig 2010-04-28 03:42:09.000000000 +0900
++++ src/kernel/ccontentstream.cc 2016-06-11 06:33:26.838638000 +0900
+@@ -68,7 +68,7 @@
+ * @param observer Operand observer.
+ */
+ void
+- opsSetPdfRefCs (shared_ptr<PdfOperator> first,
++ opsSetPdfRefCs (boost::shared_ptr<PdfOperator> first,
+ boost::weak_ptr<CPdf> pdf,
+ IndiRef rf,
+ CContentStream& cs,
+@@ -204,7 +204,7 @@
+ }else
+ {// We have an OPERAND
+
+- shared_ptr<IProperty> pIp (createObjFromXpdfObj (*o));
++ boost::shared_ptr<IProperty> pIp (createObjFromXpdfObj (*o));
+ operands.push_back (pIp);
+ }
+
+@@ -223,14 +223,14 @@
+ * @param streamreader CStreams parser from which we get an xpdf object.
+ * @param operands Operands of operator. They are shared through subcalls.
+ */
+- shared_ptr<PdfOperator>
++ boost::shared_ptr<PdfOperator>
+ createOperatorFromStream (CStreamsXpdfReader<CContentStream::CStreams>& streamreader,
+ PdfOperator::Operands& operands)
+ {
+ // Get operands
+ boost::shared_ptr< ::Object> o(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
+ if (!createOperandsFromStream (streamreader, operands, o))
+- return shared_ptr<PdfOperator> ();
++ return boost::shared_ptr<PdfOperator> ();
+
+ //
+ // SPECIAL CASE for inline image (stream within a text stream)
+@@ -246,8 +246,8 @@
+ throw ElementBadTypeException ("Content stream operator has incorrect operand type.");
+ }
+
+- shared_ptr<CInlineImage> inimg (getInlineImage (streamreader));
+- return shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (inimg, chcktp->name, chcktp->endTag));
++ boost::shared_ptr<CInlineImage> inimg (getInlineImage (streamreader));
++ return boost::shared_ptr<PdfOperator> (new InlineImageCompositePdfOperator (inimg, chcktp->name, chcktp->endTag));
+ }
+
+ // factory function for all other operators
+@@ -269,11 +269,11 @@
+ *
+ * @return New pdf operator.
+ */
+- shared_ptr<PdfOperator>
++ boost::shared_ptr<PdfOperator>
+ parseOp (CStreamsXpdfReader<CContentStream::CStreams>& streamreader, PdfOperator::Operands& operands)
+ {
+ // Create operator with its operands
+- shared_ptr<PdfOperator> result = createOperatorFromStream (streamreader, operands);
++ boost::shared_ptr<PdfOperator> result = createOperatorFromStream (streamreader, operands);
+
+ if (result && isCompositeOp (result) && !isInlineImageOp (result))
+ {
+@@ -283,7 +283,7 @@
+ bool foundEndTag = false;
+
+ // The same as in (re)parse
+- shared_ptr<PdfOperator> newop, previousLast = result;
++ boost::shared_ptr<PdfOperator> newop, previousLast = result;
+
+ //
+ // Use recursion to get all operators
+@@ -348,7 +348,7 @@
+ if (!hasValidPdf (*it) || !hasValidRef (*it))
+ throw CObjInvalidObject ();
+ }
+- weak_ptr<CPdf> pdf = streams.front()->getPdf ();
++ boost::weak_ptr<CPdf> pdf = streams.front()->getPdf ();
+ assert (pdf.lock());
+ IndiRef rf = streams.front()->getIndiRef ();
+
+@@ -357,8 +357,8 @@
+ streamreader.open ();
+
+ PdfOperator::Operands operands;
+- shared_ptr<PdfOperator> topoperator (new UnknownCompositePdfOperator ("",""));
+- shared_ptr<PdfOperator> newop, previousLast = topoperator;
++ boost::shared_ptr<PdfOperator> topoperator (new UnknownCompositePdfOperator ("",""));
++ boost::shared_ptr<PdfOperator> newop, previousLast = topoperator;
+
+ //
+ // Parsing can throw, if so the stream is invalid
+@@ -469,10 +469,10 @@
+ typedef PdfOperator::BBox BBox;
+
+ // Init resources
+- void operator() (shared_ptr<GfxResources>) const {}
++ void operator() (boost::shared_ptr<GfxResources>) const {}
+
+ // Loop through operators
+- void operator() (shared_ptr<PdfOperator> op, BBox rc, const GfxState&) const
++ void operator() (boost::shared_ptr<PdfOperator> op, BBox rc, const GfxState&) const
+ {
+ // If not initialized, means an error occured (missing font etc..)
+ if (!BBox::isInitialized (rc))
+@@ -736,7 +736,7 @@
+
+ // Notify observers
+ boost::shared_ptr<CContentStream> current (this, EmptyDeallocator<CContentStream> ());
+- this->notifyObservers (current, shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
++ this->notifyObservers (current, boost::shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
+ }
+
+
+@@ -856,7 +856,7 @@
+ // Set correct IndiRef, CPdf and cs to inserted operator
+ assert (hasValidRef (cstreams.front()));
+ assert (hasValidPdf (cstreams.front()));
+- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
++ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
+ assert (pdf.lock());
+ IndiRef rf = cstreams.front()->getIndiRef ();
+ opsSetPdfRefCs (newOper, pdf, rf, *this, operandobserver);
+@@ -937,7 +937,7 @@
+ // Check whether we can make the change
+ cstreams.front()->canChange();
+ IndiRef rf = cstreams.front()->getIndiRef ();
+- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
++ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
+ assert (pdf.lock());
+ // set accordingly
+ opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver);
+@@ -949,9 +949,9 @@
+ { // Insert into
+ opsSetPdfRefCs (newoper, pdf, rf, *this, operandobserver);
+
+- shared_ptr<PdfOperator> secondoper = operators.front();
++ boost::shared_ptr<PdfOperator> secondoper = operators.front();
+ operators.push_front (newoper);
+- shared_ptr<PdfOperator> lastofnew = getLastOperator (newoper);
++ boost::shared_ptr<PdfOperator> lastofnew = getLastOperator (newoper);
+ secondoper->setPrev (lastofnew);
+ lastofnew->setNext (secondoper);
+ }
+@@ -992,7 +992,7 @@
+ // Set correct IndiRef, CPdf and cs to inserted operator
+ assert (hasValidRef (cstreams.front()));
+ assert (hasValidPdf (cstreams.front()));
+- weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
++ boost::weak_ptr<CPdf> pdf = cstreams.front()->getPdf();
+ assert (pdf.lock());
+ IndiRef rf = cstreams.front()->getIndiRef ();
+ opsSetPdfRefCs (newOper, pdf, rf, *this, operandobserver);
Added: head/editors/pdfedit/files/patch-src-kernel-cdict.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cdict.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,149 @@
+--- src/kernel/cdict.cc.orig 2010-04-28 03:42:09.000000000 +0900
++++ src/kernel/cdict.cc 2016-06-11 06:01:28.994503000 +0900
+@@ -95,7 +95,7 @@
+ //
+ //
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CDict::getProperty (PropertyId id) const
+ {
+ //kernelPrintDbg (debug::DBG_DBG,"getProperty() " << id);
+@@ -111,7 +111,7 @@
+ if (it == value.end())
+ throw ElementNotFoundException ("", "");
+
+- shared_ptr<IProperty> ip = cmp.getIProperty ();
++ boost::shared_ptr<IProperty> ip = cmp.getIProperty ();
+
+ // Set mode only if pdf is valid
+ _setMode (ip,id);
+@@ -188,7 +188,7 @@
+ if (oldit == value.end())
+ throw ElementNotFoundException ("CDict", "item not found");
+
+- shared_ptr<IProperty> oldip = cmp.getIProperty ();
++ boost::shared_ptr<IProperty> oldip = cmp.getIProperty ();
+
+ // Delete that item
+ value.erase (oldit);
+@@ -198,11 +198,11 @@
+ assert (hasValidRef (this));
+
+ // Indicate that this object has changed
+- shared_ptr<ObserverContext> context (_createContext (oldip,id));
++ boost::shared_ptr<ObserverContext> context (_createContext (oldip,id));
+
+ try {
+ // notify observers and dispatch the change
+- _objectChanged (shared_ptr<IProperty> (new CNull), context);
++ _objectChanged (boost::shared_ptr<IProperty> (new CNull), context);
+
+ }catch (PdfException&)
+ {
+@@ -224,7 +224,7 @@
+ //
+ // Correctly add an object (with name) can be done only to Dict and Stream object
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CDict::addProperty (const string& propertyName, const IProperty& newIp)
+ {
+ kernelPrintDbg (debug::DBG_DBG,"addProperty( " << propertyName << ",...)");
+@@ -239,7 +239,7 @@
+ throw CObjInvalidObject ();
+
+ // Clone the added property
+- shared_ptr<IProperty> newIpClone = newIp.clone ();
++ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
+ if (newIpClone)
+ {
+ // Inherit id, gen number and pdf
+@@ -260,7 +260,7 @@
+ assert (hasValidRef (this));
+
+ // notify observers and dispatch change
+- shared_ptr<ObserverContext> context (_createContext(shared_ptr<IProperty>(new CNull ()), propertyName));
++ boost::shared_ptr<ObserverContext> context (_createContext(boost::shared_ptr<IProperty>(new CNull ()), propertyName));
+
+ try {
+ // notify observers and dispatch the change
+@@ -285,7 +285,7 @@
+ //
+ //
+ //
+-shared_ptr<IProperty>
++boost::shared_ptr<IProperty>
+ CDict::setProperty (PropertyId id, IProperty& newIp)
+ {
+ kernelPrintDbg (debug::DBG_DBG, "setProperty(" << id << ")");
+@@ -308,9 +308,9 @@
+ return addProperty (id, newIp);
+
+ // Save the old one
+- shared_ptr<IProperty> oldIp = cmp.getIProperty ();
++ boost::shared_ptr<IProperty> oldIp = cmp.getIProperty ();
+ // Clone the added property
+- shared_ptr<IProperty> newIpClone = newIp.clone ();
++ boost::shared_ptr<IProperty> newIpClone = newIp.clone ();
+ assert (newIpClone);
+
+ // Inherit id, gen number and pdf
+@@ -328,7 +328,7 @@
+ assert (hasValidRef (this));
+
+ // Notify observers and dispatch change
+- shared_ptr<ObserverContext> context (_createContext (oldIp,id));
++ boost::shared_ptr<ObserverContext> context (_createContext (oldIp,id));
+
+ try {
+ // notify observers and dispatch the change
+@@ -382,7 +382,7 @@
+ Value::const_iterator it = value.begin();
+ for (; it != value.end(); ++it)
+ {
+- shared_ptr<IProperty> prop = it->second;
++ boost::shared_ptr<IProperty> prop = it->second;
+ Object * propObj = prop->_makeXpdfObject();
+ dictObj->dictAdd(copyString((it->first).c_str()), propObj);
+ gfree(propObj);
+@@ -398,7 +398,7 @@
+ //
+ void
+ CDict::_objectChanged
+- (shared_ptr<IProperty> newValue, shared_ptr<const ObserverContext> context)
++ (boost::shared_ptr<IProperty> newValue, boost::shared_ptr<const ObserverContext> context)
+ {
+ // Do not notify anything if we are not in a valid pdf
+ if (!hasValidPdf (this))
+@@ -424,10 +424,10 @@
+ // Set mode
+ //
+ void
+-CDict::_setMode (shared_ptr<IProperty> ip, PropertyId id) const
++CDict::_setMode (boost::shared_ptr<IProperty> ip, PropertyId id) const
+ {
+ configuration::ModeController* modecontroller = NULL;
+- shared_ptr<CPdf> p = this->getPdf().lock();
++ boost::shared_ptr<CPdf> p = this->getPdf().lock();
+ if ( p && (NULL != (modecontroller=p->getModeController())))
+ {
+ assert (modecontroller);
+@@ -451,7 +451,7 @@
+ }else
+ { // We have found a type
+ string tmp;
+- shared_ptr<IProperty> type = cmp.getIProperty ();
++ boost::shared_ptr<IProperty> type = cmp.getIProperty ();
+ if (isName (type))
+ IProperty::getSmartCObjectPtr<CName>(type)->getValue(tmp);
+ mode = modecontroller->getMode (tmp, id);
+@@ -498,7 +498,7 @@
+ //
+ //
+ IProperty::ObserverContext*
+-CDict::_createContext (shared_ptr<IProperty> changedIp, PropertyId id)
++CDict::_createContext (boost::shared_ptr<IProperty> changedIp, PropertyId id)
+ {
+ // Create the context
+ return new CDictComplexObserverContext (changedIp, id);
Added: head/editors/pdfedit/files/patch-src-kernel-cdict.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cdict.h Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,20 @@
+--- src/kernel/cdict.h.orig 2016-06-11 05:41:31.261535000 +0900
++++ src/kernel/cdict.h 2016-06-11 05:44:42.503741000 +0900
+@@ -799,7 +799,7 @@
+ }
+
+ // Cast it to dict
+- CDict* dict = dynamic_cast<const CDict*> (&ip);
++ const CDict* dict = dynamic_cast<const CDict*> (&ip);
+ setSimpleValueInDict<Value, ItemType, ItemPType> (*dict, name, val);
+ }
+
+@@ -812,7 +812,7 @@
+ throw ElementBadTypeException ("");
+
+ // Cast it to dict
+- CDict* dict = dynamic_cast<const CDict*> (&ip);
++ const CDict* dict = dynamic_cast<const CDict*> (&ip);
+
+ setSimpleValueInDict<ItemType> (*dict, name, val);
+ }
Added: head/editors/pdfedit/files/patch-src-kernel-cobject.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cobject.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,11 @@
+--- src/kernel/cobject.cc.orig 2016-06-11 06:02:30.123217000 +0900
++++ src/kernel/cobject.cc 2016-06-11 06:02:50.095614000 +0900
+@@ -60,7 +60,7 @@
+ if (!hasValidPdf (ip))
+ throw CObjInvalidOperation ();
+
+- shared_ptr<CPdf> pdf = ip.getPdf ().lock ();
++ boost::shared_ptr<CPdf> pdf = ip.getPdf ().lock ();
+ IndiRef ref = ip.getIndiRef();
+ if ( &ip == (indiObj=pdf->getIndirectProperty(ref)).get() )
+ return false;
Added: head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cobject2string.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,11 @@
+--- src/kernel/cobject2string.cc.orig 2016-06-11 06:20:13.726775000 +0900
++++ src/kernel/cobject2string.cc 2016-06-11 06:20:28.472463000 +0900
+@@ -81,7 +81,7 @@
+ void
+ simpleValueFromString (const std::string& str, double& val)
+ {
+- shared_ptr<Object> ptrObj (xpdfObjFromString(str), xpdf::object_deleter());
++ boost::shared_ptr<Object> ptrObj (xpdfObjFromString(str), xpdf::object_deleter());
+
+ assert (objReal == ptrObj->getType ());
+ if (objReal != ptrObj->getType() && objInt != ptrObj->getType())
Added: head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cobject2xpdf.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,47 @@
+--- src/kernel/cobject2xpdf.cc.orig 2016-06-11 06:17:18.518993000 +0900
++++ src/kernel/cobject2xpdf.cc 2016-06-11 06:18:14.021576000 +0900
+@@ -453,16 +453,16 @@
+ // Get Object at i-th position
+ array.arrayGetNF (i, obj.get());
+
+- shared_ptr<IProperty> cobj;
++ boost::shared_ptr<IProperty> cobj;
+ // Create CObject from it
+ if (isPdfValid(pdf))
+ {
+ hasValidRef (ip);
+- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
++ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
+
+ }else
+ {
+- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
++ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
+ }
+
+ if (cobj)
+@@ -504,12 +504,12 @@
+ obj->free ();
+ dict.dictGetValNF (i,obj.get());
+
+- shared_ptr<IProperty> cobj;
++ boost::shared_ptr<IProperty> cobj;
+ // Create CObject from it
+ if (isPdfValid (pdf))
+- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
++ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (pdf, *obj, ip.getIndiRef()));
+ else
+- cobj = shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
++ cobj = boost::shared_ptr<IProperty> (createObjFromXpdfObj (*obj));
+
+ if (cobj)
+ {
+@@ -1021,7 +1021,7 @@
+ // for Dict -> String conversion
+ // initDict increases streamDict's reference thus we need to
+ // decrease it back by free
+- shared_ptr< ::Object> streamDictObj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
++ boost::shared_ptr< ::Object> streamDictObj(XPdfObjectFactory::getInstance(), xpdf::object_deleter());
+ streamDictObj->initDict((Dict *)streamObject.streamGetDict());
+ std::string dict;
+ xpdfObjToString(*streamDictObj, dict);
Added: head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cobjecthelpers.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,142 @@
+--- src/kernel/cobjecthelpers.cc.orig 2016-06-11 06:22:02.988983000 +0900
++++ src/kernel/cobjecthelpers.cc 2016-06-11 06:23:38.529873000 +0900
+@@ -42,14 +42,14 @@
+ {
+ using namespace boost;
+
+- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
++ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
+ if(prop_ptr->getType() != pInt)
+ {
+ // malformed dictionary
+ throw ElementBadTypeException(name/*, prop_ptr->getType()*/);
+ }
+
+- shared_ptr<CInt> int_ptr=IProperty::getSmartCObjectPtr<CInt>(prop_ptr);
++ boost::shared_ptr<CInt> int_ptr=IProperty::getSmartCObjectPtr<CInt>(prop_ptr);
+ return int_ptr->getValue();
+ }
+
+@@ -57,14 +57,14 @@
+ {
+ using namespace boost;
+
+- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
++ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
+ if(prop_ptr->getType() != pRef)
+ {
+ // malformed dictionary
+ throw ElementBadTypeException(name/*, prop_ptr->getType()*/);
+ }
+
+- shared_ptr<CRef> int_ptr=IProperty::getSmartCObjectPtr<CRef>(prop_ptr);
++ boost::shared_ptr<CRef> int_ptr=IProperty::getSmartCObjectPtr<CRef>(prop_ptr);
+ return int_ptr->getValue();
+ }
+
+@@ -72,14 +72,14 @@
+ {
+ using namespace boost;
+
+- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
++ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
+ if(prop_ptr->getType() != pString)
+ {
+ // malformed dictionary
+ throw ElementBadTypeException(name);
+ }
+
+- shared_ptr<CString> str_ptr=IProperty::getSmartCObjectPtr<CString>(prop_ptr);
++ boost::shared_ptr<CString> str_ptr=IProperty::getSmartCObjectPtr<CString>(prop_ptr);
+ return str_ptr->getValue();
+ }
+
+@@ -87,14 +87,14 @@
+ {
+ using namespace boost;
+
+- shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
++ boost::shared_ptr<IProperty> prop_ptr=dict->getProperty(name);
+ if(prop_ptr->getType() != pName)
+ {
+ // malformed dictionary
+ throw ElementBadTypeException(name);
+ }
+
+- shared_ptr<CName> name_ptr=IProperty::getSmartCObjectPtr<CName>(prop_ptr);
++ boost::shared_ptr<CName> name_ptr=IProperty::getSmartCObjectPtr<CName>(prop_ptr);
+ std::string value;
+ name_ptr->getValue(value);
+
+@@ -125,7 +125,7 @@
+ // gets reference value and dereferences indirect object
+ IndiRef ref;
+ IProperty::getSmartCObjectPtr<CRef>(refProp)->getValue(ref);
+- shared_ptr<CPdf> pdf = refProp->getPdf().lock();
++ boost::shared_ptr<CPdf> pdf = refProp->getPdf().lock();
+ assert(pdf);
+ boost::shared_ptr<IProperty> indirect_ptr=pdf->getIndirectProperty(ref);
+ if(indirect_ptr->getType() != pDict)
+@@ -237,7 +237,7 @@
+
+ IndiRef ref;
+ IProperty::getSmartCObjectPtr<CRef>(ip)->getValue(ref);
+- shared_ptr<CPdf> pdf = ip->getPdf().lock();
++ boost::shared_ptr<CPdf> pdf = ip->getPdf().lock();
+ assert(pdf);
+ return pdf->getIndirectProperty (ref);
+
+@@ -254,7 +254,7 @@
+
+ // pdf specification says that two diagonal corners should be used and
+ // readers has to be prepared to normalize it
+- shared_ptr<CArray> array(CArrayFactory::getInstance());
++ boost::shared_ptr<CArray> array(CArrayFactory::getInstance());
+ scoped_ptr<IProperty> llx(CRealFactory::getInstance(rect.xleft));
+ scoped_ptr<IProperty> lly(CRealFactory::getInstance(rect.yleft));
+ scoped_ptr<IProperty> urx(CRealFactory::getInstance(rect.xright));
+@@ -267,12 +267,12 @@
+ return array;
+ }
+
+-void getRectangleFromProperty(const shared_ptr<IProperty> prop, libs::Rectangle & rect)
++void getRectangleFromProperty(const boost::shared_ptr<IProperty> prop, libs::Rectangle & rect)
+ {
+ if(!isArray(prop))
+ throw CObjBadValue();
+
+- shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(prop);
++ boost::shared_ptr<CArray> array = IProperty::getSmartCObjectPtr<CArray>(prop);
+ if(array->getPropertyCount() != 4)
+ throw CObjBadValue();
+
+@@ -286,7 +286,7 @@
+ {
+ using namespace boost;
+
+- shared_ptr<CString> dateString(CStringFactory::getInstance());
++ boost::shared_ptr<CString> dateString(CStringFactory::getInstance());
+ char buffer[30];
+ memset(buffer, '\0', sizeof(buffer));
+
+@@ -304,7 +304,7 @@
+ {
+ using namespace boost;
+
+- shared_ptr<IProperty> value;
++ boost::shared_ptr<IProperty> value;
+ try
+ {
+ value=annotDict->getProperty(fieldName);
+@@ -323,9 +323,9 @@
+ //
+ //
+ ::XRef*
+-getXRef (shared_ptr<IProperty> ip)
++getXRef (boost::shared_ptr<IProperty> ip)
+ {
+- shared_ptr<CPdf> pdf = ip->getPdf().lock();
++ boost::shared_ptr<CPdf> pdf = ip->getPdf().lock();
+ if(!pdf)
+ return NULL;
+ return pdf->getCXref();
Added: head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-contentschangetag.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,25 @@
+--- src/kernel/contentschangetag.cc.orig 2016-06-12 02:53:06.107246000 +0900
++++ src/kernel/contentschangetag.cc 2016-06-12 02:53:37.952146000 +0900
+@@ -51,11 +51,11 @@
+ PdfOperator::Operands opers;
+
+ // Name or our application
+- shared_ptr<CName> name (new CName (CHANGE_TAG_ID));
++ boost::shared_ptr<CName> name (new CName (CHANGE_TAG_ID));
+ opers.push_back (name);
+
+ // Dict with our informatio
+- shared_ptr<CDict> dict (new CDict ());
++ boost::shared_ptr<CDict> dict (new CDict ());
+ time_t t = time (NULL);
+ ostringstream oss;
+ oss << t;
+@@ -72,7 +72,7 @@
+ //
+ //
+ time_t
+-ContentsChangeTag::getTime (shared_ptr<PdfOperator> op)
++ContentsChangeTag::getTime (boost::shared_ptr<PdfOperator> op)
+ {
+ assert (op);
+
Added: head/editors/pdfedit/files/patch-src-kernel-cpage.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/pdfedit/files/patch-src-kernel-cpage.cc Sat Jun 11 20:53:25 2016 (r416753)
@@ -0,0 +1,35 @@
+--- src/kernel/cpage.cc.orig 2016-06-11 10:20:24.977833000 +0900
++++ src/kernel/cpage.cc 2016-06-11 10:21:15.509192000 +0900
+@@ -88,9 +88,9 @@
+ //
+ // Init modules
+ //
+- _contents = shared_ptr<CPageContents> (new CPageContents(this));
++ _contents = boost::shared_ptr<CPageContents> (new CPageContents(this));
+ _modules.push_back (_contents);
+- _display = shared_ptr<CPageDisplay> (new CPageDisplay(this));
++ _display = boost::shared_ptr<CPageDisplay> (new CPageDisplay(this));
+ _modules.push_back (_display);
+ _fonts = boost::shared_ptr<CPageFonts> (new CPageFonts(this));
+ _modules.push_back (_fonts);
+@@ -252,7 +252,7 @@
+ CPage::getPagePosition () const
+ {
+ if (hasValidPdf (_dict))
+- return _dict->getPdf().lock()->getPagePosition (shared_ptr<CPage>(const_cast<CPage*>(this),EmptyDeallocator<CPage> ()));
++ return _dict->getPdf().lock()->getPagePosition (boost::shared_ptr<CPage>(const_cast<CPage*>(this),EmptyDeallocator<CPage> ()));
+
+ throw CObjInvalidOperation ();
+ }
+@@ -284,9 +284,9 @@
+
+ // Notify observers
+ if (invalid)
+- this->notifyObservers (current, shared_ptr<const ObserverContext> ());
++ this->notifyObservers (current, boost::shared_ptr<const ObserverContext> ());
+ else
+- this->notifyObservers (current, shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
++ this->notifyObservers (current, boost::shared_ptr<const ObserverContext> (new BasicObserverContext (current)));
+ }
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list