CVS commit: pkgsrc/print/podofo

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Nov  9 12:33:29 UTC 2019

Modified Files:
        pkgsrc/print/podofo: Makefile distinfo
        pkgsrc/print/podofo/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/print/podofo/patches: patch-src_base_PdfCompilerCompat.h
            patch-src_base_PdfDefines.h patch-src_base_PdfVariant.h

Log Message:
podofo: Update to 0.9.6

"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.30 -r1.31 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/podofo/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/podofo/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/print/podofo/patches/patch-src_base_PdfCompilerCompat.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/print/podofo/patches/patch-src_base_PdfDefines.h \
    pkgsrc/print/podofo/patches/patch-src_base_PdfVariant.h

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.30 pkgsrc/print/podofo/Makefile:1.31
--- pkgsrc/print/podofo/Makefile:1.30   Mon Mar 12 11:17:27 2018
+++ pkgsrc/print/podofo/Makefile        Sat Nov  9 12:33:29 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2018/03/12 11:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/09 12:33:29 nia Exp $
 
-DISTNAME=      podofo-0.9.5
-PKGREVISION=   2
+DISTNAME=      podofo-0.9.6
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=podofo/}
 
@@ -13,12 +12,17 @@ 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
 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
 
+# Avoid building unit tests.
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_CppUnit=TRUE
+CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_LUA=TRUE
+
 .include "options.mk"
 
 # tests-depend on cppunit (for unit tests)
@@ -29,5 +33,6 @@ CMAKE_ARGS+=  -DFREETYPE_LIB_PATHS:PATH=$
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/podofo/distinfo
diff -u pkgsrc/print/podofo/distinfo:1.19 pkgsrc/print/podofo/distinfo:1.20
--- pkgsrc/print/podofo/distinfo:1.19   Sun Jul 22 22:36:17 2018
+++ pkgsrc/print/podofo/distinfo        Sat Nov  9 12:33:29 2019
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.19 2018/07/22 22:36:17 wiz Exp $
+$NetBSD: distinfo,v 1.20 2019/11/09 12:33:29 nia Exp $
 
-SHA1 (podofo-0.9.5.tar.gz) = 25c84a9e4815197e967bdb93fc2de8e1654a2812
-RMD160 (podofo-0.9.5.tar.gz) = a557330766b1795dd010937eb5c08ce7df671122
-SHA512 (podofo-0.9.5.tar.gz) = d13b30bfebc89b809173cd2251eed1f15dfa90abb58371bfdce875797d40663923571824ad2b0b1d97aa1be212bdbb710c3a0439bc05bed7022b8eb75ca74705
-Size (podofo-0.9.5.tar.gz) = 1160799 bytes
-SHA1 (patch-CMakeLists.txt) = f6e51c220fcd1cca833cdf5e4d9c3e0da9116c1e
+SHA1 (podofo-0.9.6.tar.gz) = 54275025b1049e40177e35c7003e87ea092f277c
+RMD160 (podofo-0.9.6.tar.gz) = 71764cd85c7e443654689f84dd8c68fccb24e442
+SHA512 (podofo-0.9.6.tar.gz) = 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130
+Size (podofo-0.9.6.tar.gz) = 995898 bytes
+SHA1 (patch-CMakeLists.txt) = c92ea81cde1af07ac3464d1a6a8df1f36f81a833
 SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
-SHA1 (patch-src_base_PdfCompilerCompat.h) = 965cc15853f9829fad0e018651a7640914108c67
-SHA1 (patch-src_base_PdfDefines.h) = 1526aacbe680adaa6f147aafb3303ec2f45991e7
 SHA1 (patch-src_base_PdfMemoryManagement.cpp) = 9303daf1e471106d9d22e42230db650dba5f1006
-SHA1 (patch-src_base_PdfVariant.h) = 8e9c206738716fd51a1d56f34e7aa35cc6718d48
 SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664
 SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f
 SHA1 (patch-test_TokenizerTest_CMakeLists.txt) = 588f0f26aa5c8d6a1d1e6119680b9ee7416781d6

Index: pkgsrc/print/podofo/patches/patch-CMakeLists.txt
diff -u pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.3 pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/print/podofo/patches/patch-CMakeLists.txt:1.3        Mon Aug  1 13:39:34 2016
+++ pkgsrc/print/podofo/patches/patch-CMakeLists.txt    Sat Nov  9 12:33:29 2019
@@ -1,45 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2016/08/01 13:39:34 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2019/11/09 12:33:29 nia 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.
+Install man pages to correct directory.
 
---- CMakeLists.txt.orig        2016-06-08 20:55:08.000000000 +0000
+--- CMakeLists.txt.orig        2018-07-08 10:33:27.000000000 +0000
 +++ CMakeLists.txt
-@@ -377,7 +377,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.")
-@@ -426,7 +426,9 @@ ELSE(WANT_FONTCONFIG)
- ENDIF(WANT_FONTCONFIG)
- 
- IF(NOT PODOFO_BUILD_LIB_ONLY)
--FIND_PACKAGE(LUA)
-+IF(DEFINED LUA_ENABLED)
-+      FIND_PACKAGE(LUA)
-+ENDIF(DEFINED LUA_ENABLED)
- IF(LUA_FOUND)
-       # If we have lua, we can build podofoimpose.
-       MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
-@@ -502,15 +504,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)
- 
+@@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
  #
  # Setup directories we will need
  #