Changes 0.9.3:

OSX build fixes
Fixed AES decryption
Improved load of (broken) PDF files
Sign PDF file as an incremental update
Added partial support for Type3 font encoding and metrics
Drawing API improvements
Unicode file names for attachments
Font subset embedding

11 files changed, 50 insertions, 138 deletions

diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index f7507d79f10..7625ff078fb 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2014/10/19 22:27:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.24 2015/11/05 19:46:53 adam Exp $
 
-DISTNAME=	podofo-0.9.2
-PKGREVISION=	5
+DISTNAME=	podofo-0.9.3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
@@ -13,7 +12,8 @@ LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
-CMAKE_ARGS+=	-DPODOFO_BUILD_SHARED:BOOL=TRUE -DPODOFO_BUILD_STATIC:BOOL=TRUE
+CMAKE_ARGS+=	-DPODOFO_BUILD_SHARED:BOOL=TRUE
+CMAKE_ARGS+=	-DPODOFO_BUILD_STATIC:BOOL=TRUE
 CMAKE_ARGS+=	-DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2
 CMAKE_ARGS+=	-DFREETYPE_INCLUDE_DIR_FTHEADER:PATH=${BUILDLINK_PREFIX.freetype2}/include/freetype2/config
 CMAKE_ARGS+=	-DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib
@@ -25,8 +25,8 @@ CMAKE_ARGS+=	-DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/podofo/PLIST b/print/podofo/PLIST
index 8647bcb9aa1..7da7c57c155 100644
--- a/print/podofo/PLIST
+++ b/print/podofo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/07/05 21:12:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/11/05 19:46:53 adam Exp $
 bin/podofobox
 bin/podofocolor
 bin/podofocountpages
@@ -33,6 +33,7 @@ include/podofo/base/PdfEncoding.h
 include/podofo/base/PdfEncodingFactory.h
 include/podofo/base/PdfEncrypt.h
 include/podofo/base/PdfError.h
+include/podofo/base/PdfExtension.h
 include/podofo/base/PdfFileStream.h
 include/podofo/base/PdfFilter.h
 include/podofo/base/PdfFiltersPrivate.h
@@ -53,6 +54,7 @@ include/podofo/base/PdfRect.h
 include/podofo/base/PdfRefCountedBuffer.h
 include/podofo/base/PdfRefCountedInputDevice.h
 include/podofo/base/PdfReference.h
+include/podofo/base/PdfSigIncWriter.h
 include/podofo/base/PdfStream.h
 include/podofo/base/PdfString.h
 include/podofo/base/PdfTokenizer.h
@@ -98,6 +100,7 @@ include/podofo/doc/PdfFontTTFSubset.h
 include/podofo/doc/PdfFontTrueType.h
 include/podofo/doc/PdfFontType1.h
 include/podofo/doc/PdfFontType1Base14.h
+include/podofo/doc/PdfFontType3.h
 include/podofo/doc/PdfFunction.h
 include/podofo/doc/PdfHintStream.h
 include/podofo/doc/PdfIdentityEncoding.h
@@ -112,20 +115,26 @@ include/podofo/doc/PdfPagesTreeCache.h
 include/podofo/doc/PdfPainter.h
 include/podofo/doc/PdfPainterMM.h
 include/podofo/doc/PdfShadingPattern.h
+include/podofo/doc/PdfSigIncMemDocument.h
+include/podofo/doc/PdfSigIncPainter.h
+include/podofo/doc/PdfSigIncSignatureField.h
 include/podofo/doc/PdfSignOutputDevice.h
 include/podofo/doc/PdfSignatureField.h
 include/podofo/doc/PdfStreamedDocument.h
 include/podofo/doc/PdfTable.h
+include/podofo/doc/PdfTilingPattern.h
 include/podofo/doc/PdfXObject.h
 include/podofo/podofo-base.h
 include/podofo/podofo.h
 lib/libpodofo.a
 lib/libpodofo.so
-lib/libpodofo.so.0.9.1
+lib/libpodofo.so.${PKGVERSION}
 man/man1/podofobox.1
+man/man1/podofocolor.1
 man/man1/podofocountpages.1
 man/man1/podofocrop.1
 man/man1/podofoencrypt.1
+man/man1/podofogc.1
 man/man1/podofoimg2pdf.1
 man/man1/podofoimgextract.1
 man/man1/podofoimpose.1
diff --git a/print/podofo/distinfo b/print/podofo/distinfo
index 606a30d7ac3..e450bd8df8f 100644
--- a/print/podofo/distinfo
+++ b/print/podofo/distinfo
@@ -1,15 +1,10 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 01:01:37 agc Exp $
+$NetBSD: distinfo,v 1.12 2015/11/05 19:46:53 adam Exp $
 
-SHA1 (podofo-0.9.2.tar.gz) = 8a6e27e17e0ed9f12e1a999cff66eae8eb97a4bc
-RMD160 (podofo-0.9.2.tar.gz) = 69bf1035f2466ba95208830038c6f8e303580a5b
-SHA512 (podofo-0.9.2.tar.gz) = e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21
-Size (podofo-0.9.2.tar.gz) = 1092131 bytes
-SHA1 (patch-aa) = 83740cf59f1c86b07e7ce498e19efe627c0b249e
-SHA1 (patch-ab) = 61ae284aecee35aab179d5922b651f26945bab41
-SHA1 (patch-ac) = b184fa648407141a373451334790aada66cc2ae2
-SHA1 (patch-src_base_PdfCompilerCompat.h) = add7dfa217993e7c981f13dc8d0e43ab6bf2184a
-SHA1 (patch-src_base_PdfLocale.h) = ba209173509f1109d305765ae7dd56d8266a97d8
-SHA1 (patch-src_base_PdfVariant.cpp) = 849374c8111175cc8875bce0f0b7656bfd1ba5b3
-SHA1 (patch-src_doc_PdfFontType1Base14.cpp) = e54f803cabf66d67763047bfa9163bd1ebc89e53
-SHA1 (patch-src_doc_PdfFontType1Base14.h) = 6467317f8b3818ec4da86e938f44b1d7eb4fd6af
+SHA1 (podofo-0.9.3.tar.gz) = e3b08af1266eb480032456e3bde030c75452d380
+RMD160 (podofo-0.9.3.tar.gz) = 7db7f92d84913621dfa53fbecd3f394aa8105bf4
+SHA512 (podofo-0.9.3.tar.gz) = c9a8076821502225d3ecf5a7e79ef2ebd7b9cc3e7d0902eabff33325b124109a1f5038f57b83e3fad0d82cff9cd557a9ed177adc7c176064085070aebcd7602d
+Size (podofo-0.9.3.tar.gz) = 1135095 bytes
+SHA1 (patch-CMakeLists.txt) = 50eb8fbcb50435ff52fb42ca1d2b8a5edeb8e1d5
+SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
+SHA1 (patch-src_base_PdfCompilerCompat.h) = 5472e3fdda57f48ac5d6f24e916e94c51fd18af4
 SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f
diff --git a/print/podofo/patches/patch-ab b/print/podofo/patches/patch-CMakeLists.txt
index c74cfe19bad..e4561ac9124 100644
--- a/print/podofo/patches/patch-ab
+++ b/print/podofo/patches/patch-CMakeLists.txt
@@ -1,24 +1,24 @@
-$NetBSD: patch-ab,v 1.3 2014/02/01 04:12:04 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/11/05 19:46:53 adam Exp $
 
 Make LUA optional (PR/43054). Make sure man pages are installed
 at the right place.
 Dont look for CppUnit as we dont want to build tests.
 
---- CMakeLists.txt.orig	2011-04-26 18:02:47.000000000 +0000
+--- CMakeLists.txt.orig	2014-06-15 16:53:10.000000000 +0000
 +++ CMakeLists.txt
-@@ -340,7 +340,7 @@ ELSE(PNG_FOUND)
- ENDIF(PNG_FOUND)
+@@ -372,7 +372,7 @@ ENDIF(PNG_FOUND)
  
+ IF(NOT PODOFO_BUILD_LIB_ONLY)
  
 -FIND_PACKAGE(CppUnit)
 +# FIND_PACKAGE(CppUnit)
  
  IF(CppUnit_FOUND)
    MESSAGE("Found cppunit. Unit tests will be built.")
-@@ -407,7 +407,9 @@ ELSE(DEFINED JPEG_RUNTIME_COMPATIBLE)
- 	ENDIF(NOT WIN32)
+@@ -443,7 +443,9 @@ ELSE(DEFINED JPEG_RUNTIME_COMPATIBLE)
  ENDIF(DEFINED JPEG_RUNTIME_COMPATIBLE)
  
+ IF(NOT PODOFO_BUILD_LIB_ONLY)
 -FIND_PACKAGE(LUA)
 +IF(DEFINED LUA_ENABLED)
 +	FIND_PACKAGE(LUA)
@@ -26,7 +26,20 @@ Dont look for CppUnit as we dont want to build tests.
  IF(LUA_FOUND)
  	# If we have lua, we can build podofoimpose.
  	MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
-@@ -485,7 +487,7 @@ SET(PODOFO_LIB
+@@ -516,15 +518,16 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+   INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
+ ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+ 
+-SET(PODOFO_LIB
+-    podofo
+-    ${PODOFO_LIB_DEPENDS}
+-    )
++IF(DEFINED PODOFO_BUILD_SHARED)
++	SET(PODOFO_LIB podofo_shared ${PODOFO_LIB_DEPENDS})
++ELSE(DEFINED PODOFO_BUILD_SHARED)
++	SET(PODOFO_LIB podofo_static ${PODOFO_LIB_DEPENDS})
++ENDIF(DEFINED PODOFO_BUILD_SHARED)
+ 
  #
  # Setup directories we will need
  #
diff --git a/print/podofo/patches/patch-ac b/print/podofo/patches/patch-ac
deleted file mode 100644
index b9a6449f12a..00000000000
--- a/print/podofo/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2011/10/27 17:00:28 drochner Exp $
-
---- tools/podofotxt2pdf/podofotxt2pdf.cpp.orig	2010-10-21 17:09:00.000000000 +0000
-+++ tools/podofotxt2pdf/podofotxt2pdf.cpp
-@@ -166,7 +166,7 @@ int main( int argc, char* argv[] )
-   const char*   pszFontName = DEFAULT_FONT;
-   bool          bUtf8 = false;
- 
--  if( argc <= 3 ) 
-+  if( argc < 3 ) 
-   {
-     print_help();
-     exit( -1 );
diff --git a/print/podofo/patches/patch-aa b/print/podofo/patches/patch-cmake_modules_FindFREETYPE.cmake
index e908934dd1b..e494c47e550 100644
--- a/print/podofo/patches/patch-aa
+++ b/print/podofo/patches/patch-cmake_modules_FindFREETYPE.cmake
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2013/07/05 21:12:45 joerg Exp $
+$NetBSD: patch-cmake_modules_FindFREETYPE.cmake,v 1.1 2015/11/05 19:46:53 adam Exp $
 
---- cmake/modules/FindFREETYPE.cmake.orig	2012-12-12 22:55:14.000000000 +0000
+--- cmake/modules/FindFREETYPE.cmake.orig	2014-03-18 09:05:12.000000000 +0000
 +++ cmake/modules/FindFREETYPE.cmake
-@@ -43,8 +43,6 @@ ENDIF(NOT FREETYPE_FIND_QUIETLY)

+@@ -71,7 +71,6 @@ ENDIF(NOT FREETYPE_FIND_QUIETLY)
  SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped libfreetyped)

  SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype libfreetype)

  

 -SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib /usr/X11/lib)

--

+ 

  FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE

    ${FREETYPE_LIBRARY_NAMES_RELEASE}

-   ${FREETYPE_LIBRARY_NAMES}

diff --git a/print/podofo/patches/patch-src_base_PdfCompilerCompat.h b/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
index 91f3ddff04d..040ae4fb320 100644
--- a/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
+++ b/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
@@ -1,3 +1,5 @@
+$NetBSD: patch-src_base_PdfCompilerCompat.h,v 1.2 2015/11/05 19:46:53 adam Exp $
+
 --- src/base/PdfCompilerCompat.h.orig	2011-09-30 13:20:59.000000000 +0200
 +++ src/base/PdfCompilerCompat.h	2014-08-26 14:58:16.000000000 +0200
 @@ -72,6 +72,9 @@
diff --git a/print/podofo/patches/patch-src_base_PdfLocale.h b/print/podofo/patches/patch-src_base_PdfLocale.h
deleted file mode 100644
index d9ab4007c9b..00000000000
--- a/print/podofo/patches/patch-src_base_PdfLocale.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_base_PdfLocale.h,v 1.1 2013/05/04 12:51:31 joerg Exp $
-
---- src/base/PdfLocale.h.orig	2013-05-04 02:06:09.000000000 +0000
-+++ src/base/PdfLocale.h
-@@ -1,7 +1,7 @@
- #ifndef PODOFO_PDFLOCALE_H
- #define PODOFO_PDFLOCALE_H
- 
--namespace std { class ios_base; };
-+#include <ios>
- 
- namespace PoDoFo {
- 
diff --git a/print/podofo/patches/patch-src_base_PdfVariant.cpp b/print/podofo/patches/patch-src_base_PdfVariant.cpp
deleted file mode 100644
index 75975a7fe0c..00000000000
--- a/print/podofo/patches/patch-src_base_PdfVariant.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_base_PdfVariant.cpp,v 1.1 2013/07/16 21:28:43 joerg Exp $
-
---- src/base/PdfVariant.cpp.orig	2011-04-19 17:34:25.000000000 +0000
-+++ src/base/PdfVariant.cpp
-@@ -267,8 +267,24 @@ void PdfVariant::Write( PdfOutputDevice*
-             std::ostringstream oss;
-             PdfLocaleImbue(oss);
-             oss << std::fixed << m_Data.dNumber;
-+            size_t len = oss.str().size();
- 
--            pDevice->Write( oss.str().c_str(), oss.str().size() );
-+            if( (eWriteMode & ePdfWriteMode_Compact) == ePdfWriteMode_Compact && 
-+                oss.str().find('.') != string::npos )
-+            {
-+                const char *str = oss.str().c_str();
-+                while( str[len - 1] == '0' )
-+                    --len;
-+                if( str[len - 1] == '.' )
-+                    --len;
-+                if( len == 0 )
-+                {
-+                    pDevice->Write( "0", 1 );
-+                    break;
-+                }
-+            }
-+
-+            pDevice->Write( oss.str().c_str(), len );
-             break;
-         }
-         case ePdfDataType_HexString:
diff --git a/print/podofo/patches/patch-src_doc_PdfFontType1Base14.cpp b/print/podofo/patches/patch-src_doc_PdfFontType1Base14.cpp
deleted file mode 100644
index eb378e2bff9..00000000000
--- a/print/podofo/patches/patch-src_doc_PdfFontType1Base14.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-src_doc_PdfFontType1Base14.cpp,v 1.1 2013/07/16 21:28:43 joerg Exp $
-
---- src/doc/PdfFontType1Base14.cpp.orig	2010-10-21 17:09:00.000000000 +0000
-+++ src/doc/PdfFontType1Base14.cpp
-@@ -31,7 +31,7 @@ PdfFontType1Base14::PdfFontType1Base14(
-                                         PdfVecObjects* pParent )
-     : PdfFontSimple( pMetrics, pEncoding, pParent )
- {
--    InitBase14Font();
-+    InitBase14Font( pMetrics );
- }
- 
- // OC 13.08.2010 New:
-@@ -39,7 +39,7 @@ PdfFontType1Base14::PdfFontType1Base14(
-                                         PdfObject* pObject )
-     : PdfFontSimple( pMetrics, pEncoding, pObject )
- {
--    InitBase14Font();
-+    InitBase14Font( pMetrics );
- }
- 
- PdfFontType1Base14::~PdfFontType1Base14()
-@@ -52,12 +52,12 @@ PdfFontType1Base14::~PdfFontType1Base14(
- kausik : April 12th 2010
- This is the font dictionary. It gets added to the page resources dictionary of the pdf.
- */
--void PdfFontType1Base14::InitBase14Font( )
-+void PdfFontType1Base14::InitBase14Font( PdfFontMetrics* pMetrics )
- {
-     PdfVariant    var;
-     
-     this->GetObject()->GetDictionary().AddKey( PdfName::KeySubtype, PdfName("Type1"));
--    this->GetObject()->GetDictionary().AddKey("BaseFont", this->GetBaseFont() );
-+    this->GetObject()->GetDictionary().AddKey("BaseFont", PdfName( pMetrics->GetFontname() ) );
- 		 
-     m_pEncoding->AddToDictionary( this->GetObject()->GetDictionary() ); // Add encoding key
- //	pDescriptor->GetDictionary().AddKey( "FontName", this->GetBaseFont() );
diff --git a/print/podofo/patches/patch-src_doc_PdfFontType1Base14.h b/print/podofo/patches/patch-src_doc_PdfFontType1Base14.h
deleted file mode 100644
index 0eb3dac4180..00000000000
--- a/print/podofo/patches/patch-src_doc_PdfFontType1Base14.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_doc_PdfFontType1Base14.h,v 1.1 2013/07/16 21:28:43 joerg Exp $
-
---- src/doc/PdfFontType1Base14.h.orig	2013-07-08 13:31:23.631273082 +0000
-+++ src/doc/PdfFontType1Base14.h
-@@ -66,7 +66,7 @@ class PdfFontType1Base14 : public PdfFon
-     virtual void EmbedFontFile( PdfObject* pDescriptor );
- 
-  private:
--    void InitBase14Font();
-+    void InitBase14Font( PdfFontMetrics* pMetrics );
- 
- };
-