podofo: fix recipe, use -std=c++11 (#3049)

app-text/podofo/patches/podofo-0.9.5.patchset

@@ -1,14 +1,14 @@
-From a5ae4c10ce2eebf032782c3d8e43c26bec4cd3be Mon Sep 17 00:00:00 2001
+From 57c02713fc1fa6084d347cd21f8c1f1fb5aeb4f4 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 6 Jan 2016 13:57:24 +0000
 Subject: haiku patch
 
 
 diff --git a/src/base/PdfFiltersPrivate.cpp b/src/base/PdfFiltersPrivate.cpp
-index 0a70eff..1d7b8b3 100644
+index e564df8..737a972 100644
 --- a/src/base/PdfFiltersPrivate.cpp
 +++ b/src/base/PdfFiltersPrivate.cpp
-@@ -908,7 +908,7 @@ void PdfDCTFilter::EndDecodeImpl()
+@@ -925,7 +925,7 @@ void PdfDCTFilter::EndDecodeImpl()
  
      jpeg_memory_src ( &m_cinfo, reinterpret_cast<JOCTET*>(m_buffer.GetBuffer()), m_buffer.GetSize() );
  
@@ -17,7 +17,7 @@ index 0a70eff..1d7b8b3 100644
      {
          (void) jpeg_destroy_decompress(&m_cinfo);
  
-@@ -1039,7 +1039,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
+@@ -1056,7 +1056,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
      src->pub.next_input_byte = src->eoi_buffer;
      src->pub.bytes_in_buffer = 2;
  
@@ -27,10 +27,10 @@ index 0a70eff..1d7b8b3 100644
  
  /*
 diff --git a/src/doc/PdfImage.cpp b/src/doc/PdfImage.cpp
-index 8b4638c..8a880ae 100644
+index 8cd712a..23972b5 100644
 --- a/src/doc/PdfImage.cpp
 +++ b/src/doc/PdfImage.cpp
-@@ -368,7 +368,7 @@ void PdfImage::LoadFromJpegHandle( PdfFileInputStream* pInStream )
+@@ -349,7 +349,7 @@ void PdfImage::LoadFromJpegHandle( PdfFileInputStream* pInStream )
  
      jpeg_stdio_src(&cinfo, pInStream->GetHandle());
  
@@ -39,7 +39,7 @@ index 8b4638c..8a880ae 100644
      {
          (void) jpeg_destroy_decompress(&cinfo);
  
-@@ -434,7 +434,7 @@ void PdfImage::LoadFromJpegData(const unsigned char* pData, pdf_long dwLen)
+@@ -415,7 +415,7 @@ void PdfImage::LoadFromJpegData(const unsigned char* pData, pdf_long dwLen)
  
      jpeg_memory_src(&cinfo, pData, dwLen);
  
@@ -49,5 +49,28 @@ index 8b4638c..8a880ae 100644
          (void) jpeg_destroy_decompress(&cinfo);
  
 -- 
-2.2.2
+2.19.0
+
+
+From 4e19557010e7ef77f39b616b4086809717fce4b1 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Thu, 13 Sep 2018 10:20:09 +0200
+Subject: use -std=c++11
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d804426..939ae56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -296,7 +296,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+         SET(PODOFO_USE_VISIBILITY ${PODOFO_HAVE_GCC4})
+     ENDIF(NOT DEFINED PODOFO_USE_VISIBILITY)
+ 
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ 
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
+ 
+-- 
+2.19.0
 

app-text/podofo/podofo-0.9.5.recipe

@@ -1,24 +1,22 @@
 SUMMARY="A library to work with the PDF file format"
-DESCRIPTION="
-PoDoFo is a library to work with the PDF file format and includes also a few \
-tools. The name comes from the first two letters of PDF (Portable Document \
-Format.
-"
+DESCRIPTION="PoDoFo is a library to work with the PDF file format and \
+includes also a few tools. The name comes from the first two letters of \
+PDF (Portable Document Format."
 HOMEPAGE="https://sourceforge.net/projects/podofo"
-COPYRIGHT="
-	2005-2014 Dominik Seichter
-	2008 Craig Ringer
-	"
-LICENSE="
-GNU GPL v2
-GNU LGPL v2.1
-"
-SOURCE_URI="http://sourceforge.net/projects/podofo/files/podofo/$portVersion/podofo-$portVersion.tar.gz"
+COPYRIGHT="2005-2014 Dominik Seichter
+	2008 Craig Ringer"
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+REVISION="5"
+SOURCE_URI="https://sourceforge.net/projects/podofo/files/podofo/$portVersion/podofo-$portVersion.tar.gz"
 CHECKSUM_SHA256="854981cb897ebc14bac854ea0f25305372261a48a205363fe1c61659ba7b5304"
-REVISION="4"
+PATCHES="podofo-$portVersion.patchset"
+
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
-PATCHES="podofo-$portVersion.patchset"
+
+libVersion="0.9.5"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 if [ $targetArchitecture != x86_gcc2 ]; then
 	commandSuffix=
@@ -27,29 +25,25 @@ fi
 
 PROVIDES="
 	podofo$secondaryArchSuffix = $portVersion
-	lib:libpodofo$secondaryArchSuffix = $portVersion compat >= $portVersion
-	cmd:podofobox
-	cmd:podofocolor
-	cmd:podofocountpages
-	cmd:podofocrop
-	cmd:podofoencrypt
-	cmd:podofogc
-	cmd:podofoimg2pdf
-	cmd:podofoimgextract
-	cmd:podofoimpose
-	cmd:podofoincrementalupdates
-	cmd:podofomerge
-	cmd:podofopages
-	cmd:podofopdfinfo
-	cmd:podofosign
-	cmd:podofotxt2pdf
-	cmd:podofotxtextract
-	cmd:podofouncompress
-	cmd:podofoxmp
-	"
-PROVIDES_devel="
-	podofo${secondaryArchSuffix}_devel = $portVersion
-	devel:libpodofo$secondaryArchSuffix = $portVersion compat >= $portVersion
+	lib:libpodofo$secondaryArchSuffix = $libVersionCompat
+	cmd:podofobox$commandSuffix
+	cmd:podofocolor$commandSuffix
+	cmd:podofocountpages$commandSuffix
+	cmd:podofocrop$commandSuffix
+	cmd:podofoencrypt$commandSuffix
+	cmd:podofogc$commandSuffix
+	cmd:podofoimg2pdf$commandSuffix
+	cmd:podofoimgextract$commandSuffix
+	cmd:podofoimpose$commandSuffix
+	cmd:podofoincrementalupdates$commandSuffix
+	cmd:podofomerge$commandSuffix
+	cmd:podofopages$commandSuffix
+	cmd:podofopdfinfo$commandSuffix
+	cmd:podofosign$commandSuffix
+	cmd:podofotxt2pdf$commandSuffix
+	cmd:podofotxtextract$commandSuffix
+	cmd:podofouncompress$commandSuffix
+	cmd:podofoxmp$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -61,10 +55,16 @@ REQUIRES="
 	lib:libtiff$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	podofo${secondaryArchSuffix}_devel = $portVersion
+	devel:libpodofo$secondaryArchSuffix = $libVersionCompat
+	"
 REQUIRES_devel="
 	podofo$secondaryArchSuffix == $portVersion base
 	devel:libssl$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcppunit$secondaryArchSuffix
@@ -77,10 +77,11 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:cmake
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:sed
 	"