Update podofo to 0.9.6 which fix the build with upcoming cmake 3.15.
Here are my changes:
- Removed and added dynamic export symbols so bump libpodofo
- Add patches from FreddBSD to fix the cmake build
- Fix wrong elif define
- regen WANTLIB
- fix white space
No consumer tests. yet I'm trying to fix all broken cmake 3.15 users.
Anyway, tested with current and upcoming cmake.
Best regards.
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/podofo/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile 3 Jun 2019 16:06:58 -0000 1.10
+++ Makefile 6 Aug 2019 19:54:57 -0000
@@ -2,10 +2,9 @@
COMMENT= library and tools to modify and parse PDF documents
-DISTNAME= podofo-0.9.5
-REVISION= 0
+DISTNAME= podofo-0.9.6
-SHARED_LIBS += podofo 2.0 # 0.9
+SHARED_LIBS += podofo 3.0 # 0.9
CATEGORIES= textproc
@@ -16,16 +15,17 @@ MAINTAINER= Stuart Henderson <sthen@open
# GPLv2+ (tools) LGPLv2+ (lib)
PERMIT_PACKAGE= Yes
-WANTLIB += c crypto fontconfig freetype idn jpeg m png pthread tiff z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} c crypto fontconfig freetype idn
+WANTLIB += jpeg m png ssl tiff unistring z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=podofo/}
-MODULES= devel/cmake
+MODULES= devel/cmake
COMPILER = base-clang ports-gcc
-LIB_DEPENDS= devel/libidn \
+LIB_DEPENDS= converters/libunistring \
+ devel/libidn \
graphics/jpeg \
graphics/png \
graphics/tiff
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/podofo/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 7 Feb 2017 15:10:10 -0000 1.3
+++ distinfo 6 Aug 2019 19:54:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (podofo-0.9.5.tar.gz) = hUmBy4l+vBS6yFTqDyUwU3ImGkiiBTY/4cYWWbp7UwQ=
-SIZE (podofo-0.9.5.tar.gz) = 1160799
+SHA256 (podofo-0.9.6.tar.gz) = 6RY2UJVauOS5Uy56pDuEG6xFcB97D5t5OpjIyj7xQHI=
+SIZE (podofo-0.9.6.tar.gz) = 995898
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/textproc/podofo/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 7 Feb 2017 15:10:10 -0000 1.4
+++ patches/patch-CMakeLists_txt 6 Aug 2019 19:54:57 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2017/02/07 15:10:10 sthen Exp $
---- CMakeLists.txt.orig Wed Feb 1 21:23:03 2017
-+++ CMakeLists.txt Tue Feb 7 14:51:41 2017
-@@ -298,7 +298,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -290,7 +290,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder
-Wno-deprecated-declarations")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wreorder")
#
# Note that we do not need debug definitions here. Set
-@@ -517,7 +517,7 @@ SET(PODOFO_LIB
+@@ -530,7 +530,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC)
#
# Setup directories we will need
#
Index: patches/patch-test_TokenizerTest_CMakeLists_txt
===================================================================
RCS file: patches/patch-test_TokenizerTest_CMakeLists_txt
diff -N patches/patch-test_TokenizerTest_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_TokenizerTest_CMakeLists_txt 6 Aug 2019 19:54:57
-0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Prior to 3.12 cmake silently created an empty destination directory if the
+origin of the copy_directory does not exist.
+
+Index: test/TokenizerTest/CMakeLists.txt
+--- test/TokenizerTest/CMakeLists.txt.orig
++++ test/TokenizerTest/CMakeLists.txt
+@@ -7,5 +7,6 @@ ADD_DEPENDENCIES(TokenizerTest ${PODOFO_DEPEND_TARGET}
+ ADD_CUSTOM_COMMAND(
+ TARGET TokenizerTest
+ POST_BUILD
++ COMMAND "${CMAKE_COMMAND}" -E make_directory
"${CMAKE_CURRENT_SOURCE_DIR}/objects"
+ COMMAND "${CMAKE_COMMAND}" -E copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/objects" "${CMAKE_CURRENT_BINARY_DIR}/objects"
+ )
Index: patches/patch-test_unit_ParserTest_cpp
===================================================================
RCS file: patches/patch-test_unit_ParserTest_cpp
diff -N patches/patch-test_unit_ParserTest_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_unit_ParserTest_cpp 6 Aug 2019 19:54:57 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: test/unit/ParserTest.cpp
+--- test/unit/ParserTest.cpp.orig
++++ test/unit/ParserTest.cpp
+@@ -2037,7 +2037,7 @@ bool ParserTest::canOutOfMemoryKillUnitTests()
+ #elif defined( __linux__ )
+ // TODO do big allocs succeed then trigger OOM-killer fiasco??
+ bool bCanTerminateProcess = false;
+-#elif
++#else
+ // other systems - assume big allocs faily gracefully and throw bad_alloc
+ bool bCanTerminateProcess = false;
+ #endif
