CVS commit: pkgsrc/print/podofo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug  1 13:39:34 UTC 2016

Modified Files:
        pkgsrc/print/podofo: Makefile distinfo
        pkgsrc/print/podofo/patches: patch-CMakeLists.txt
            patch-src_doc_PdfImage.cpp

Log Message:
PoDoFo 0.9.4 was released today, after over two years of development and with the help of many new contributors.
As there are so many improvements, patches and fixes that made it into this release, we are not able to list them, so please stick with the svn log.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/podofo/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/podofo/patches/patch-CMakeLists.txt \
    pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/podofo/Makefile
diff -u pkgsrc/print/podofo/Makefile:1.26 pkgsrc/print/podofo/Makefile:1.27
--- pkgsrc/print/podofo/Makefile:1.26   Sun Jun 19 22:55:18 2016
+++ pkgsrc/print/podofo/Makefile        Mon Aug  1 13:39:34 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2016/06/19 22:55:18 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/01 13:39:34 adam Exp $
 
-DISTNAME=      podofo-0.9.3
-PKGREVISION=   2
+DISTNAME=      podofo-0.9.4
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=podofo/}
 

Index: pkgsrc/print/podofo/distinfo
diff -u pkgsrc/print/podofo/distinfo:1.14 pkgsrc/print/podofo/distinfo:1.15
--- pkgsrc/print/podofo/distinfo:1.14   Thu Jun 23 14:15:15 2016
+++ pkgsrc/print/podofo/distinfo        Mon Aug  1 13:39:34 2016
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2016/06/23 14:15:15 adam Exp $
+$NetBSD: distinfo,v 1.15 2016/08/01 13:39:34 adam Exp $
 
-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) = be4020c8af88e3f8785cd5b8cb365af1e862207e
+SHA1 (podofo-0.9.4.tar.gz) = e91929e0e4c020aee77d6aca5a5af8195888918c
+RMD160 (podofo-0.9.4.tar.gz) = 431496b2e4f5d14d05d56f0a5c9bf328fbab1b7a
+SHA512 (podofo-0.9.4.tar.gz) = 2f675757d76ccfe2472358b04dc4cd55e2cf00ae447731af75645c7091a338b6d91dcd4b16240b305cdbb02384ddcd38048c0e3f1700185347d4e1eb5df9ee39
+Size (podofo-0.9.4.tar.gz) = 1147939 bytes
+SHA1 (patch-CMakeLists.txt) = f6e51c220fcd1cca833cdf5e4d9c3e0da9116c1e
 SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
 SHA1 (patch-src_base_PdfCompilerCompat.h) = 5472e3fdda57f48ac5d6f24e916e94c51fd18af4
-SHA1 (patch-src_doc_PdfImage.cpp) = 158f09d27e28fa242c90d5132946ceb529b567c6
+SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664
 SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f

Index: pkgsrc/print/podofo/patches/patch-CMakeLists.txt
diff -u pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.2 pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.2        Fri Apr  1 11:04:43 2016
+++ pkgsrc/print/podofo/patches/patch-CMakeLists.txt    Mon Aug  1 13:39:34 2016
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2016/04/01 11:04:43 jperkin Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2016/08/01 13:39:34 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        2014-06-15 16:53:10.000000000 +0000
+--- CMakeLists.txt.orig        2016-06-08 20:55:08.000000000 +0000
 +++ CMakeLists.txt
-@@ -372,7 +372,7 @@ ENDIF(PNG_FOUND)
+@@ -377,7 +377,7 @@ ENDIF(PNG_FOUND)
  
  IF(NOT PODOFO_BUILD_LIB_ONLY)
  
@@ -15,8 +15,8 @@ Dont look for CppUnit as we dont want to
  
  IF(CppUnit_FOUND)
    MESSAGE("Found cppunit. Unit tests will be built.")
-@@ -443,7 +443,9 @@ ELSE(DEFINED JPEG_RUNTIME_COMPATIBLE)
- ENDIF(DEFINED JPEG_RUNTIME_COMPATIBLE)
+@@ -426,7 +426,9 @@ ELSE(WANT_FONTCONFIG)
+ ENDIF(WANT_FONTCONFIG)
  
  IF(NOT PODOFO_BUILD_LIB_ONLY)
 -FIND_PACKAGE(LUA)
@@ -26,7 +26,7 @@ Dont look for CppUnit as we dont want to
  IF(LUA_FOUND)
        # If we have lua, we can build podofoimpose.
        MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
-@@ -516,15 +518,16 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
+@@ -502,15 +504,16 @@ IF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
    INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
  ENDIF(FONTCONFIG_FOUND AND WANT_FONTCONFIG)
  
Index: pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp
diff -u pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp:1.2 pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp:1.3
--- pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp:1.2  Thu Jun 23 14:15:15 2016
+++ pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp      Mon Aug  1 13:39:34 2016
@@ -1,16 +1,16 @@
-$NetBSD: patch-src_doc_PdfImage.cpp,v 1.2 2016/06/23 14:15:15 adam Exp $
+$NetBSD: patch-src_doc_PdfImage.cpp,v 1.3 2016/08/01 13:39:34 adam Exp $
 
 Recognize TIFF images with alpha channel when using the photometric
 colour tag.
 
---- src/doc/PdfImage.cpp.orig  2016-06-07 16:48:51.790860153 +0000
+--- src/doc/PdfImage.cpp.orig  2016-05-15 19:06:35.000000000 +0000
 +++ src/doc/PdfImage.cpp
-@@ -550,7 +550,7 @@ void PdfImage::LoadFromTiff( const char*
-               break;
- 
-               case PHOTOMETRIC_RGB:
+@@ -589,7 +589,7 @@ void PdfImage::LoadFromTiffHandle(void* 
+             break;
+             
+         case PHOTOMETRIC_RGB:
 -            if ( bitsPixel != 24 )
 +            if ( bitsPixel != 24 && bitsPixel != 32 )
-                       {
-                               TIFFClose(hInfile);
-                               PODOFO_RAISE_ERROR( ePdfError_UnsupportedImageFormat );
+             {
+                 TIFFClose(hInTiffHandle);
+                 PODOFO_RAISE_ERROR( ePdfError_UnsupportedImageFormat );