[podofo] update to 0.9.7 (#16373)

* [podofo] update to 0.9.7

* update version

* [podofo] update to 0.9.7

* update version

* fix-osx-error

* Modify patch format

* update version

* Restore patch endline format

* update version

* update patch file

* update version

* update patch file

* update version

* revert the changes to this file

* update version

* revert the changes to this file

* update version

8 files changed, 50 insertions, 217 deletions

diff --git a/ports/podofo/0001-unique_ptr.patch b/ports/podofo/0001-unique_ptr.patch
deleted file mode 100644
index 5c70e8471..000000000
--- a/ports/podofo/0001-unique_ptr.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -ruNp a/src/base/PdfFilter.cpp b/src/base/PdfFilter.cpp
---- a/src/base/PdfFilter.cpp	2016-11-18 20:08:56.000000000 +0100
-+++ b/src/base/PdfFilter.cpp	2019-01-16 10:25:22.934430500 +0100
-@@ -131,7 +131,7 @@ class PdfFilteredEncodeStream : public P
- 
- private:
-     PdfOutputStream*         m_pOutputStream;
--    std::auto_ptr<PdfFilter> m_filter;
-+    std::unique_ptr<PdfFilter> m_filter;
- };
- 
- /** Create a filter that is a PdfOutputStream.
-@@ -206,7 +206,7 @@ class PdfFilteredDecodeStream : public P
- 
- private:
-     PdfOutputStream*         m_pOutputStream;
--    std::auto_ptr<PdfFilter> m_filter;
-+    std::unique_ptr<PdfFilter> m_filter;
-     bool                     m_bFilterFailed;
- };
- 
-@@ -264,7 +264,7 @@ PdfFilterFactory::PdfFilterFactory()
- {
- }
- 
--std::auto_ptr<PdfFilter> PdfFilterFactory::Create( const EPdfFilter eFilter ) 
-+std::unique_ptr<PdfFilter> PdfFilterFactory::Create( const EPdfFilter eFilter ) 
- {
-     PdfFilter* pFilter = NULL;
-     switch( eFilter )
-@@ -316,7 +316,7 @@ std::auto_ptr<PdfFilter> PdfFilterFactor
-             break;
-     }
- 
--    return std::auto_ptr<PdfFilter>(pFilter);
-+    return std::unique_ptr<PdfFilter>(pFilter);
- }
- 
- PdfOutputStream* PdfFilterFactory::CreateEncodeStream( const TVecFilters & filters, PdfOutputStream* pStream ) 
-diff -ruNp a/src/base/PdfFilter.h b/src/base/PdfFilter.h
---- a/src/base/PdfFilter.h	2016-11-18 20:08:56.000000000 +0100
-+++ b/src/base/PdfFilter.h	2019-01-16 10:25:22.981323900 +0100
-@@ -454,7 +454,7 @@ class PODOFO_API PdfFilterFactory {
-  public:
-     /** Create a filter from an enum.
-      *
--     *  Ownership is transferred to the caller, who should let the auto_ptr
-+     *  Ownership is transferred to the caller, who should let the unique_ptr
-      *  the filter is returned in take care of freeing it when they're done
-      *  with it.
-      *
-@@ -463,7 +463,7 @@ class PODOFO_API PdfFilterFactory {
-      *  \returns a new PdfFilter allocated using new, or NULL if no
-      *           filter is available for this type.
-      */
--    static std::auto_ptr<PdfFilter> Create( const EPdfFilter eFilter );
-+    static std::unique_ptr<PdfFilter> Create( const EPdfFilter eFilter );
- 
-     /** Create a PdfOutputStream that applies a list of filters 
-      *  on all data written to it.
-diff -ruNp a/src/base/PdfMemStream.cpp b/src/base/PdfMemStream.cpp
---- a/src/base/PdfMemStream.cpp	2016-11-18 20:08:56.000000000 +0100
-+++ b/src/base/PdfMemStream.cpp	2019-01-16 10:25:23.479681200 +0100
-@@ -245,7 +245,7 @@ void PdfMemStream::FlateCompressStreamDa
-     if( !m_lLength )
-         return;
- 
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_FlateDecode );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_FlateDecode );
-     if( pFilter.get() )
-     {
-         pFilter->Encode( m_buffer.GetBuffer(), m_buffer.GetSize(), &pBuffer, &lLen );
-diff -ruNp a/src/base/PdfStream.cpp b/src/base/PdfStream.cpp
---- a/src/base/PdfStream.cpp	2016-11-18 20:08:56.000000000 +0100
-+++ b/src/base/PdfStream.cpp	2019-01-16 10:25:24.387075400 +0100
-@@ -91,9 +91,9 @@ void PdfStream::GetFilteredCopy( char**
-     PdfMemoryOutputStream  stream;
-     if( vecFilters.size() )
-     {
--        // Use std::auto_ptr so that pDecodeStream is deleted 
-+        // Use std::unique_ptr so that pDecodeStream is deleted 
-         // even in the case of an exception 
--        std::auto_ptr<PdfOutputStream> pDecodeStream( PdfFilterFactory::CreateDecodeStream( vecFilters, &stream, 
-+        std::unique_ptr<PdfOutputStream> pDecodeStream( PdfFilterFactory::CreateDecodeStream( vecFilters, &stream, 
-                                                                                             m_pParent ? 
-                                                                                             &(m_pParent->GetDictionary()) : NULL  ) );
- 
-diff -ruNp a/src/base/PdfString.cpp b/src/base/PdfString.cpp
---- a/src/base/PdfString.cpp	2018-03-10 17:30:53.000000000 +0100
-+++ b/src/base/PdfString.cpp	2019-01-16 10:25:24.480799400 +0100
-@@ -673,7 +673,7 @@ PdfString PdfString::HexEncode() const
-         return *this;
-     else
-     {
--        std::auto_ptr<PdfFilter> pFilter;
-+        std::unique_ptr<PdfFilter> pFilter;
- 
-         pdf_long                  lLen  = (m_buffer.GetSize() - 1) << 1;
-         PdfString             str;
-@@ -702,7 +702,7 @@ PdfString PdfString::HexDecode() const
-         return *this;
-     else
-     {
--        std::auto_ptr<PdfFilter> pFilter;
-+        std::unique_ptr<PdfFilter> pFilter;
- 
-         pdf_long                  lLen = m_buffer.GetSize() >> 1;
-         PdfString             str;
-diff -ruNp a/src/doc/PdfFont.cpp b/src/doc/PdfFont.cpp
---- a/src/doc/PdfFont.cpp	2016-05-13 16:04:34.000000000 +0200
-+++ b/src/doc/PdfFont.cpp	2019-01-16 10:25:26.372048300 +0100
-@@ -145,7 +145,7 @@ void PdfFont::WriteStringToStream( const
-     pdf_long  lLen    = 0;
-     char* pBuffer = NULL;
- 
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );    
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );    
-     pFilter->Encode( buffer.GetBuffer(), buffer.GetSize(), &pBuffer, &lLen );
- 
-     pStream->Append( "<", 1 );
-diff -ruNp a/src/doc/PdfPainter.cpp b/src/doc/PdfPainter.cpp
---- a/src/doc/PdfPainter.cpp	2018-03-06 15:04:03.000000000 +0100
-+++ b/src/doc/PdfPainter.cpp	2019-01-16 10:25:28.512159900 +0100
-@@ -829,7 +829,7 @@ void PdfPainter::DrawText( double dX, do
- 
-     /*
-     char* pBuffer;
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
-     pFilter->Encode( sString.GetString(), sString.GetLength(), &pBuffer, &lLen );
- 
-     m_pCanvas->Append( pBuffer, lLen );
-diff -ruNp a/test/CreationTest/CreationTest.cpp b/test/CreationTest/CreationTest.cpp
---- a/test/CreationTest/CreationTest.cpp	2018-02-25 12:48:38.000000000 +0100
-+++ b/test/CreationTest/CreationTest.cpp	2019-01-16 10:25:29.605315700 +0100
-@@ -37,7 +37,7 @@ void WriteStringToStream( const PdfStrin
-     pdf_long  lLen    = 0;
-     char* pBuffer = NULL;
- 
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
-     pFilter->Encode( buffer.GetBuffer(), buffer.GetSize(), &pBuffer, &lLen );
- 
-     oss << "<";
-diff -ruNp a/test/FilterTest/FilterTest.cpp b/test/FilterTest/FilterTest.cpp
---- a/test/FilterTest/FilterTest.cpp	2018-03-10 15:06:27.000000000 +0100
-+++ b/test/FilterTest/FilterTest.cpp	2019-01-16 10:25:29.777214800 +0100
-@@ -57,7 +57,7 @@ void test_filter( EPdfFilter eFilter, co
-     pdf_long   lEncoded;
-     pdf_long   lDecoded;
- 
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( eFilter );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( eFilter );
-     if( !pFilter.get() )
-     {
-         printf("!!! Filter %i not implemented.\n", eFilter);
-@@ -256,7 +256,7 @@ int main()
-     char*    pLargeBuffer2 = static_cast<char*>(malloc( strlen(pszInputAscii85Lzw) * 6 ));
- 
-     try {
--        std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCII85Decode );
-+        std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCII85Decode );
-         pFilter->Decode( pszInputAscii85Lzw, strlen(pszInputAscii85Lzw),
-                          &pLargeBuffer1, &lLargeBufer1 );
-         pFilter->Encode( pLargeBuffer1, lLargeBufer1,
-diff -ruNp a/test/VariantTest/VariantTest.cpp b/test/VariantTest/VariantTest.cpp
---- a/test/VariantTest/VariantTest.cpp	2010-10-21 19:09:00.000000000 +0200
-+++ b/test/VariantTest/VariantTest.cpp	2019-01-16 10:25:32.418465600 +0100
-@@ -124,7 +124,7 @@ int main()
-     printf("This test tests the PdfVariant class.\n");
-     printf("---\n");
- 
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_ASCIIHexDecode );
- 
-     // testing strings
-     TEST_SAFE_OP( Test( "(Hallo Welt!)", ePdfDataType_String ) );
-diff -ruNp a/test/unit/FilterTest.cpp b/test/unit/FilterTest.cpp
---- a/test/unit/FilterTest.cpp	2016-05-12 22:25:45.000000000 +0200
-+++ b/test/unit/FilterTest.cpp	2019-01-16 10:25:31.464162600 +0100
-@@ -59,7 +59,7 @@ void FilterTest::TestFilter( EPdfFilter
-     pdf_long   lEncoded;
-     pdf_long   lDecoded;
-    
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( eFilter );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( eFilter );
-     if( !pFilter.get() )
-     {
-         printf("!!! Filter %i not implemented.\n", eFilter);
-@@ -123,7 +123,7 @@ void FilterTest::testFilters()
- 
- void FilterTest::testCCITT()
- {
--    std::auto_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_CCITTFaxDecode );
-+    std::unique_ptr<PdfFilter> pFilter = PdfFilterFactory::Create( ePdfFilter_CCITTFaxDecode );
-     if( !pFilter.get() )
-     {
-         printf("!!! ePdfFilter_CCITTFaxDecode not implemented skipping test!\n");
diff --git a/ports/podofo/0003-uwp_fix.patch b/ports/podofo/0003-uwp_fix.patch
index 91872d7eb..4801447c7 100644
--- a/ports/podofo/0003-uwp_fix.patch
+++ b/ports/podofo/0003-uwp_fix.patch
@@ -1,7 +1,7 @@
-diff --git a/src/base/PdfCompilerCompat.h b/src/base/PdfCompilerCompat.h
-index 706875f..8efb349 100644
---- a/src/base/PdfCompilerCompat.h
-+++ b/src/base/PdfCompilerCompat.h
+diff --git a/src/podofo/base/PdfCompilerCompat.h b/src/podofo/base/PdfCompilerCompat.h
+index 146731d..7041712 100644
+--- a/src/podofo/base/PdfCompilerCompat.h
++++ b/src/podofo/base/PdfCompilerCompat.h
 @@ -113,6 +113,10 @@
  #define NOMINMAX
  #endif
diff --git a/ports/podofo/CONTROL b/ports/podofo/CONTROL
deleted file mode 100644
index 80171a235..000000000
--- a/ports/podofo/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: podofo
-Version: 0.9.6
-Port-Version: 13
-Homepage: https://sourceforge.net/projects/podofo/
-Description: PoDoFo is a library to work with the PDF file format
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openssl, freetype
-
-Feature: fontconfig
-Description: Enable font manager support on Unix platforms.
-Build-Depends: fontconfig
diff --git a/ports/podofo/fix-x64-osx.patch b/ports/podofo/fix-x64-osx.patch
new file mode 100644
index 000000000..621f0f68e
--- /dev/null
+++ b/ports/podofo/fix-x64-osx.patch
@@ -0,0 +1,13 @@
+diff --git a/src/podofo/base/PdfDate.cpp b/src/podofo/base/PdfDate.cpp

+index cefa221..75d80e4 100644

+--- a/src/podofo/base/PdfDate.cpp

++++ b/src/podofo/base/PdfDate.cpp

+@@ -196,7 +196,7 @@ PdfDate::PdfDate( const PdfString & sDate )

+ 

+     strncpy(m_szDate,sDate.GetString(),PDF_DATE_BUFFER_SIZE);

+ 

+-    struct tm _tm{};

++    struct tm _tm; memset (&_tm, 0, sizeof(struct tm));

+     _tm.tm_mday = 1;

+ 

+     const char * pszDate = sDate.GetString();

diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake
index 8bde0930e..b47fbaaf8 100644
--- a/ports/podofo/portfile.cmake
+++ b/ports/podofo/portfile.cmake
@@ -1,4 +1,4 @@
-set(PODOFO_VERSION 0.9.6)
+set(PODOFO_VERSION 0.9.7)
 
 if (VCPKG_TARGET_IS_UWP)
   set(ADDITIONAL_PATCH "0003-uwp_fix.patch")
@@ -9,13 +9,13 @@ vcpkg_from_sourceforge(
     REPO podofo/podofo
     REF ${PODOFO_VERSION}
     FILENAME "podofo-${PODOFO_VERSION}.tar.gz"
-    SHA512 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130
+    SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b
     PATCHES
-        0001-unique_ptr.patch
         0002-HAVE_UNISTD_H.patch
         freetype.patch
         ${ADDITIONAL_PATCH}
         0005-fix-crypto.patch
+        fix-x64-osx.patch
 )
 
 set(PODOFO_NO_FONTMANAGER ON)
diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json
new file mode 100644
index 000000000..19429b858
--- /dev/null
+++ b/ports/podofo/vcpkg.json
@@ -0,0 +1,23 @@
+{
+  "name": "podofo",
+  "version": "0.9.7",
+  "description": "PoDoFo is a library to work with the PDF file format",
+  "homepage": "https://sourceforge.net/projects/podofo/",
+  "supports": "!uwp",
+  "dependencies": [
+    "freetype",
+    "libjpeg-turbo",
+    "libpng",
+    "openssl",
+    "tiff",
+    "zlib"
+  ],
+  "features": {
+    "fontconfig": {
+      "description": "Enable font manager support on Unix platforms",
+      "dependencies": [
+        "fontconfig"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 409aece97..4adebc09d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4773,8 +4773,8 @@
       "port-version": 4
     },
     "podofo": {
-      "baseline": "0.9.6",
-      "port-version": 13
+      "baseline": "0.9.7",
+      "port-version": 0
     },
     "poly2tri": {
       "baseline": "2020-07-21",
diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json
index 42c72581c..58c25a330 100644
--- a/versions/p-/podofo.json
+++ b/versions/p-/podofo.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "5dd647995b24991182eb684029b8629eb6d66e43",
+      "version": "0.9.7",
+      "port-version": 0
+    },
+    {
       "git-tree": "69967a79faa43c4d15f5fc533f44b3d095813d63",
       "version-string": "0.9.6",
       "port-version": 13