From owner-dev-commits-ports-main@freebsd.org Sun Aug 8 22:04:13 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F3A1F66471D; Sun, 8 Aug 2021 22:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GjYCJ633Nz4R0X; Sun, 8 Aug 2021 22:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B047C1C915; Sun, 8 Aug 2021 22:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 178M4CXg010851; Sun, 8 Aug 2021 22:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178M4CKi010850; Sun, 8 Aug 2021 22:04:12 GMT (envelope-from git) Date: Sun, 8 Aug 2021 22:04:12 GMT Message-Id: <202108082204.178M4CKi010850@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: bf9fa6a11d68 - main - graphics/podofo: Update to 0.9.7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf9fa6a11d68854408f569686bc966882a07573f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 22:04:13 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf9fa6a11d68854408f569686bc966882a07573f commit bf9fa6a11d68854408f569686bc966882a07573f Author: Po-Chuan Hsieh AuthorDate: 2021-08-08 21:35:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-08-08 21:43:49 +0000 graphics/podofo: Update to 0.9.7 Changes: https://sourceforge.net/p/podofo/code/commit_browser --- graphics/podofo/Makefile | 16 ++++++++-------- graphics/podofo/distinfo | 6 +++--- graphics/podofo/files/patch-CMakeLists.txt | 20 ++++++++++---------- ...MakeLists.txt => patch-src-podofo-CMakeLists.txt} | 8 ++++---- .../files/patch-test_TokenizerTest_CMakeLists.txt | 11 ----------- graphics/podofo/pkg-plist | 4 +++- 6 files changed, 28 insertions(+), 37 deletions(-) diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index e3b379437b3c..a4c352c0062d 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -1,8 +1,7 @@ # Created by: stas PORTNAME= podofo -PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTVERSION= 0.9.7 CATEGORIES= graphics print MASTER_SITES= SF @@ -16,19 +15,20 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libidn.so:dns/libidn -OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF -OPTIONS_DEFAULT=JPEG PNG TIFF -IMPOSE_DESC= Build impose tool (Lua required) +USES= cmake compiler:c++11-lang dos2unix pkgconfig ssl CMAKE_ARGS= -DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \ -DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \ -DOPENSSL_LIBRARIES=${OPENSSLDIR} CMAKE_ON= PODOFO_BUILD_SHARED PODOFO_BUILD_STATIC USE_LDCONFIG= yes -USES= cmake compiler:c++11-lang dos2unix pkgconfig ssl DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake +OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF +OPTIONS_DEFAULT=JPEG PNG TIFF +IMPOSE_DESC= Build impose tool (Lua required) + IMPOSE_CMAKE_BOOL= WANT_LUA IMPOSE_CXXFLAGS= -I${LUA_INCDIR} IMPOSE_LDFLAGS= -L${LUA_LIBDIR} @@ -41,7 +41,7 @@ TIFF_CMAKE_BOOL= WANT_TIFF TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff post-patch: - @${REINPLACE_CMD} -e 's|$${LIBDIRNAME}/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/src/CMakeLists.txt - @${REINPLACE_CMD} -e '/^Libs: / s|-@PODOFO_VERSION_MAJOR@||' ${WRKSRC}/src/libpodofo.pc.in + @${REINPLACE_CMD} -e 's|$${LIBDIRNAME}/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/src/podofo/CMakeLists.txt + @${REINPLACE_CMD} -e '/^Libs: / s|-@PODOFO_VERSION_MAJOR@||' ${WRKSRC}/src/podofo/libpodofo.pc.in .include diff --git a/graphics/podofo/distinfo b/graphics/podofo/distinfo index ea7f27a021a7..8f0ffd1139b2 100644 --- a/graphics/podofo/distinfo +++ b/graphics/podofo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532975069 -SHA256 (podofo-0.9.6.tar.gz) = e9163650955ab8e4b9532e7aa43b841bac45701f7b0f9b793a98c8ca3ef14072 -SIZE (podofo-0.9.6.tar.gz) = 995898 +TIMESTAMP = 1610268828 +SHA256 (podofo-0.9.7.tar.gz) = 7cf2e716daaef89647c54ffcd08940492fd40c385ef040ce7529396bfadc1eb8 +SIZE (podofo-0.9.7.tar.gz) = 1005247 diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt index d4fa141f26d0..e1fbc8716862 100644 --- a/graphics/podofo/files/patch-CMakeLists.txt +++ b/graphics/podofo/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2018-07-08 10:33:27 UTC +--- CMakeLists.txt.orig 2021-01-05 16:56:54 UTC +++ CMakeLists.txt -@@ -339,6 +339,7 @@ ELSE(LIBIDN_FOUND) +@@ -348,6 +348,7 @@ ELSE(LIBIDN_FOUND) MESSAGE("Libidn not found. AES-256 Encryption support will be disabled") ENDIF(LIBIDN_FOUND) @@ -8,7 +8,7 @@ FIND_PACKAGE(LIBJPEG) IF(LIBJPEG_FOUND) -@@ -348,7 +349,9 @@ IF(LIBJPEG_FOUND) +@@ -357,7 +358,9 @@ IF(LIBJPEG_FOUND) ELSE(LIBJPEG_FOUND) MESSAGE("Libjpeg not found. JPEG support will be disabled") ENDIF(LIBJPEG_FOUND) @@ -18,7 +18,7 @@ FIND_PACKAGE(TIFF) IF(TIFF_FOUND) -@@ -358,7 +361,9 @@ IF(TIFF_FOUND) +@@ -367,7 +370,9 @@ IF(TIFF_FOUND) ELSE(TIFF_FOUND) MESSAGE("Libtiff not found. TIFF support will be disabled") ENDIF(TIFF_FOUND) @@ -28,7 +28,7 @@ FIND_PACKAGE(PNG) IF(PNG_FOUND) -@@ -369,6 +374,7 @@ ELSE(PNG_FOUND) +@@ -378,6 +383,7 @@ ELSE(PNG_FOUND) MESSAGE("LibPng not found. PNG support will be disabled") SET(PNG_LIBRARIES "") ENDIF(PNG_FOUND) @@ -36,7 +36,7 @@ FIND_PACKAGE(UNISTRING) -@@ -384,6 +390,7 @@ ENDIF(UNISTRING_FOUND) +@@ -393,6 +399,7 @@ ENDIF(UNISTRING_FOUND) IF(NOT PODOFO_BUILD_LIB_ONLY) @@ -44,7 +44,7 @@ FIND_PACKAGE(CppUnit) IF(CppUnit_FOUND) -@@ -393,6 +400,7 @@ IF(CppUnit_FOUND) +@@ -402,6 +409,7 @@ IF(CppUnit_FOUND) ELSE(CppUnit_FOUND) MESSAGE("Cppunit not found. No unit tests will be built.") ENDIF(CppUnit_FOUND) @@ -52,7 +52,7 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY) -@@ -433,6 +441,7 @@ ELSE(WANT_FONTCONFIG) +@@ -442,6 +450,7 @@ ELSE(WANT_FONTCONFIG) ENDIF(WANT_FONTCONFIG) IF(NOT PODOFO_BUILD_LIB_ONLY) @@ -60,7 +60,7 @@ FIND_PACKAGE(LUA) IF(LUA_FOUND) # If we have lua, we can build podofoimpose. -@@ -444,6 +453,7 @@ IF(LUA_FOUND) +@@ -453,6 +462,7 @@ IF(LUA_FOUND) ELSE(LUA_FOUND) MESSAGE("Lua not found - PoDoFoImpose and PoDoFoColor will be built without Lua support") ENDIF(LUA_FOUND) @@ -68,7 +68,7 @@ ENDIF(NOT PODOFO_BUILD_LIB_ONLY) -@@ -530,7 +540,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC) +@@ -539,7 +549,7 @@ ENDIF(WIN32 OR PODOFO_BUILD_STATIC) # # Setup directories we will need # diff --git a/graphics/podofo/files/patch-src-CMakeLists.txt b/graphics/podofo/files/patch-src-podofo-CMakeLists.txt similarity index 82% rename from graphics/podofo/files/patch-src-CMakeLists.txt rename to graphics/podofo/files/patch-src-podofo-CMakeLists.txt index 2da848249e58..305f5cdf6821 100644 --- a/graphics/podofo/files/patch-src-CMakeLists.txt +++ b/graphics/podofo/files/patch-src-podofo-CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/CMakeLists.txt.orig 2018-03-11 11:42:20 UTC -+++ src/CMakeLists.txt -@@ -263,8 +263,8 @@ IF(PODOFO_BUILD_STATIC) +--- src/podofo/CMakeLists.txt.orig 2020-03-27 16:13:28 UTC ++++ src/podofo/CMakeLists.txt +@@ -265,8 +265,8 @@ IF(PODOFO_BUILD_STATIC) ADD_LIBRARY(podofo_static STATIC ${PODOFO_BASE_SOURCES} ${PODOFO_DOC_SOURCES} ${PODOFO_HEADER_FILES}) TARGET_LINK_LIBRARIES(podofo_static ${PODOFO_LIB_DEPENDS}) SET_TARGET_PROPERTIES(podofo_static PROPERTIES @@ -11,7 +11,7 @@ CLEAN_DIRECT_OUTPUT 1 OUTPUT_NAME "podofo" COMPILE_FLAGS "-DBUILDING_PODOFO" -@@ -287,8 +287,8 @@ IF(PODOFO_BUILD_SHARED) +@@ -289,8 +289,8 @@ IF(PODOFO_BUILD_SHARED) # Visual Studio, since it produces invalid warnings about STL # use. SET_TARGET_PROPERTIES(podofo_shared PROPERTIES diff --git a/graphics/podofo/files/patch-test_TokenizerTest_CMakeLists.txt b/graphics/podofo/files/patch-test_TokenizerTest_CMakeLists.txt deleted file mode 100644 index e67b8949b0f7..000000000000 --- a/graphics/podofo/files/patch-test_TokenizerTest_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -Prior to 3.12 cmake silently created an empty destination directory if the origin of the copy_directory does not exist. - ---- test/TokenizerTest/CMakeLists.txt.orig 2007-09-16 09:33:38 UTC -+++ test/TokenizerTest/CMakeLists.txt -@@ -7,5 +7,6 @@ ADD_DEPENDENCIES(TokenizerTest ${PODOFO_ - 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" - ) diff --git a/graphics/podofo/pkg-plist b/graphics/podofo/pkg-plist index 5ed71e579c0f..5d5d488d50d2 100644 --- a/graphics/podofo/pkg-plist +++ b/graphics/podofo/pkg-plist @@ -9,6 +9,7 @@ bin/podofoimgextract bin/podofoimpose bin/podofoincrementalupdates bin/podofomerge +bin/podofonooc bin/podofopages bin/podofopdfinfo bin/podofosign @@ -48,6 +49,7 @@ include/podofo/base/PdfObject.h include/podofo/base/PdfObjectStreamParserObject.h include/podofo/base/PdfOutputDevice.h include/podofo/base/PdfOutputStream.h +include/podofo/base/PdfOwnedDataType.h include/podofo/base/PdfParser.h include/podofo/base/PdfParserObject.h include/podofo/base/PdfRect.h @@ -125,7 +127,7 @@ include/podofo/podofo.h lib/libpodofo.a lib/libpodofo.so lib/libpodofo.so.0 -libdata/pkgconfig/libpodofo-0.pc +libdata/pkgconfig/libpodofo.pc man/man1/podofobox.1.gz man/man1/podofocolor.1.gz man/man1/podofocountpages.1.gz