On Tue Aug 06, 2019 at 09:28:15PM +0100, Stuart Henderson wrote:
> On 2019/08/06 22:15, Rafael Sadowski wrote:
> > 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.
>
> It was kept at 0.9.5 for a reason, the update breaks one of the consumers,
> IIRC calibre.
>
>
I see, so here is a version that only fixes the cmake 3.15 build
problem. Tested with current and upcoming cmake.
OK?
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 21:05:03 -0000
@@ -3,7 +3,7 @@
COMMENT= library and tools to modify and parse PDF documents
DISTNAME= podofo-0.9.5
-REVISION= 0
+REVISION= 1
SHARED_LIBS += podofo 2.0 # 0.9
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 21:05:03
-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"
+ )
