git: 3adf2e528e70 - main - graphics/podofo: Update to 0.10.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sun, 09 Jul 2023 10:34:03 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3adf2e528e70422551bb07f23c044887198fc028

commit 3adf2e528e70422551bb07f23c044887198fc028
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-07-09 10:17:12 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-07-09 10:17:12 +0000

    graphics/podofo: Update to 0.10.1
    
    - Bump PORTREVISION of dependent ports for shlib change
    
    Changes:        https://github.com/podofo/podofo/releases
---
 deskutils/calibre/Makefile                 |  1 +
 graphics/podofo/Makefile                   |  9 +++++----
 graphics/podofo/distinfo                   |  6 +++---
 graphics/podofo/files/patch-CMakeLists.txt | 13 +++++++------
 graphics/podofo/pkg-plist                  |  7 ++++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 4d0f94acbbd7..426a1d9e3ee5 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	calibre
 PORTVERSION=	6.22.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/ \
 		https://curl.haxx.se/ca/:cacert
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index 9ac4d354f995..7be1913c43f1 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	podofo
-PORTVERSION=	0.10.0
+PORTVERSION=	0.10.1
 CATEGORIES=	graphics print
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 USES=		cmake compiler:c++17-lang cpe gnome localbase:ldflags pkgconfig ssl
 USE_GNOME=	libxml2
 
-CFLAGS+=	-I${LOCALBASE}/include/fast_float -I${WRKSRC}
+CFLAGS+=	-I${LOCALBASE}/include/fast_float
 CMAKE_ARGS=	-DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \
 		-DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \
 		-DOPENSSL_LIBRARIES=${OPENSSLDIR}
@@ -29,6 +29,8 @@ CMAKE_OFF=	PODOFO_BUILD_EXAMPLES PODOFO_BUILD_LIB_ONLY PODOFO_BUILD_STATIC PODOF
 CMAKE_TESTING_ON=	PODOFO_BUILD_TEST
 USE_LDCONFIG=	yes
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 USE_GITHUB=	yes
 
 CPE_VENDOR=	podofo_project
@@ -48,7 +50,6 @@ post-patch:
 	@${RM} ${WRKSRC}/3rdparty/fast_float.h
 	@${RM} -r ${WRKSRC}/3rdparty/date/
 	@${RM} -r ${WRKSRC}/3rdparty/fmt/
-	@${RM} -r ${WRKSRC}/3rdparty/utfcpp/
-	@${LN} -s ${LOCALBASE}/include/utf8cpp ${WRKSRC}/3rdparty/utfcpp
+	@${RM} -r ${WRKSRC}/3rdparty/utf8cpp/
 
 .include <bsd.port.mk>
diff --git a/graphics/podofo/distinfo b/graphics/podofo/distinfo
index 429ff9e8f512..179f84209711 100644
--- a/graphics/podofo/distinfo
+++ b/graphics/podofo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685219099
-SHA256 (podofo-podofo-0.10.0_GH0.tar.gz) = c9bf607fe4862b5cc6eac1754f0e39674c553350e8bbde68f5fff3e3eb2ed4bc
-SIZE (podofo-podofo-0.10.0_GH0.tar.gz) = 1660970
+TIMESTAMP = 1688132640
+SHA256 (podofo-podofo-0.10.1_GH0.tar.gz) = 9b2bb5d54185a547e440413ca2e9ec3ea9c522fec81dfeb9a23dbc3d65fbaa55
+SIZE (podofo-podofo-0.10.1_GH0.tar.gz) = 1690279
diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt
index 74a6fd522797..8c17487d09ef 100644
--- a/graphics/podofo/files/patch-CMakeLists.txt
+++ b/graphics/podofo/files/patch-CMakeLists.txt
@@ -1,14 +1,15 @@
---- CMakeLists.txt.orig	2023-03-25 11:01:27 UTC
+--- CMakeLists.txt.orig	2023-06-29 08:54:06 UTC
 +++ CMakeLists.txt
-@@ -21,7 +21,7 @@ endif()
+@@ -21,8 +21,8 @@ endif()
  set(PODOFO_VERSION_MAJOR "0" CACHE STRING "Major part of podofo version number")
  set(PODOFO_VERSION_MINOR "10" CACHE STRING "Minor part of podofo version number")
- set(PODOFO_VERSION_PATCH "0" CACHE STRING "Patchlevel part of podofo version number")
--set(PODOFO_LIBVERSION "${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}")
-+set(PODOFO_LIBVERSION "1.${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}")
- set(PODOFO_SOVERSION "1")
+ set(PODOFO_VERSION_PATCH "1" CACHE STRING "Patchlevel part of podofo version number")
+-set(PODOFO_VERSION "${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}")
+ set(PODOFO_SOVERSION "2")
++set(PODOFO_VERSION "${PODOFO_SOVERSION}.${PODOFO_VERSION_MAJOR}.${PODOFO_VERSION_MINOR}.${PODOFO_VERSION_PATCH}")
  
  #
+ # Main includes
 @@ -149,6 +149,7 @@ else()
      message("Libidn not found. AES-256 Encryption support will be disabled")
  endif()
diff --git a/graphics/podofo/pkg-plist b/graphics/podofo/pkg-plist
index a3eafb891f41..e9ef840d29b5 100644
--- a/graphics/podofo/pkg-plist
+++ b/graphics/podofo/pkg-plist
@@ -103,7 +103,6 @@ include/podofo/main/PdfOperatorUtils.h
 include/podofo/main/PdfOutlines.h
 include/podofo/main/PdfPage.h
 include/podofo/main/PdfPageCollection.h
-include/podofo/main/PdfPageTreeCache.h
 include/podofo/main/PdfPainter.h
 include/podofo/main/PdfPainterPath.h
 include/podofo/main/PdfPainterTextObject.h
@@ -144,6 +143,8 @@ include/podofo/staging/PdfPainterExtensions.h
 include/podofo/staging/PdfShadingPattern.h
 include/podofo/staging/PdfTilingPattern.h
 lib/libpodofo.so
-lib/libpodofo.so.1
-lib/libpodofo.so.1.0.10.0
+lib/libpodofo.so.2
+lib/libpodofo.so.2.%%PORTVERSION%%
 libdata/pkgconfig/libpodofo.pc
+%%DATADIR%%/podofo-config-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/podofo-config.cmake