git: ce02aaedcbb7 - main - graphics/podofo: Update to 0.10.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Dec 2023 06:05:31 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ce02aaedcbb7b21bb01c0e81abd4043ce948b300
commit ce02aaedcbb7b21bb01c0e81abd4043ce948b300
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 05:35:41 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-12-14 05:48:18 +0000
graphics/podofo: Update to 0.10.3
- Update version requirement of BUILD_DEPENDS to avoid using utf8cpp 4.0.2
utf8cpp 3.* installs to ${PREFIX}/include/utf8cpp/.
utf8cpp 4.0.{0,1,2} changes to ${PREFIX}/include/.
utf8cpp 4.0.3 changes back to ${PREFIX}/include/utf8cpp/.
Changes: https://github.com/podofo/podofo/releases
---
graphics/podofo/Makefile | 4 +-
graphics/podofo/distinfo | 6 +-
graphics/podofo/files/patch-CMakeLists.txt | 16 ++-
graphics/podofo/files/patch-utf8cpp | 187 -----------------------------
4 files changed, 12 insertions(+), 201 deletions(-)
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index c672c54351b0..6da96dc23b37 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -1,5 +1,5 @@
PORTNAME= podofo
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.3
CATEGORIES= graphics print
MAINTAINER= sunpoet@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= fast_float>=0:math/fast_float \
date>=0:devel/date \
libfmt>=0:devel/libfmt \
- utf8cpp>=4.0.0:devel/utf8cpp
+ utf8cpp>=4.0.3:devel/utf8cpp
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libidn.so:dns/libidn
diff --git a/graphics/podofo/distinfo b/graphics/podofo/distinfo
index 1bd7abc9adad..a91a5d664721 100644
--- a/graphics/podofo/distinfo
+++ b/graphics/podofo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698848702
-SHA256 (podofo-podofo-0.10.2_GH0.tar.gz) = 565168132e8fbfcdbad4ea4c5567bcc57ebbffb4528f6273baf3f490a3cf7563
-SIZE (podofo-podofo-0.10.2_GH0.tar.gz) = 1690362
+TIMESTAMP = 1702028052
+SHA256 (podofo-podofo-0.10.3_GH0.tar.gz) = 4be2232643f9e9dd7fbb02894d5a0394c3ca2826aab179654c2cc751074825ec
+SIZE (podofo-podofo-0.10.3_GH0.tar.gz) = 1691469
diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt
index 65d26ea5f65c..b7fcad56f652 100644
--- a/graphics/podofo/files/patch-CMakeLists.txt
+++ b/graphics/podofo/files/patch-CMakeLists.txt
@@ -1,18 +1,16 @@
---- CMakeLists.txt.orig 2023-10-29 16:21:49 UTC
+--- CMakeLists.txt.orig 2023-11-28 09:23:37 UTC
+++ CMakeLists.txt
-@@ -21,9 +21,10 @@ 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 "2" CACHE STRING "Patchlevel part of podofo version number")
+ set(PODOFO_VERSION_PATCH "3" 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 +150,7 @@ else()
+@@ -149,6 +149,7 @@ else()
message("Libidn not found. AES-256 Encryption support will be disabled")
endif()
@@ -20,7 +18,7 @@
find_package(JPEG)
if(JPEG_FOUND)
-@@ -157,7 +159,9 @@ if(JPEG_FOUND)
+@@ -157,7 +158,9 @@ if(JPEG_FOUND)
else()
message("Libjpeg not found. JPEG support will be disabled")
endif()
@@ -30,7 +28,7 @@
find_package(TIFF)
if(TIFF_FOUND)
-@@ -166,7 +170,9 @@ if(TIFF_FOUND)
+@@ -166,7 +169,9 @@ if(TIFF_FOUND)
else()
message("Libtiff not found. TIFF support will be disabled")
endif()
@@ -40,7 +38,7 @@
find_package(PNG)
if(PNG_FOUND)
-@@ -175,6 +181,7 @@ if(PNG_FOUND)
+@@ -175,6 +180,7 @@ if(PNG_FOUND)
else()
message("LibPng not found. PNG support will be disabled")
set(PNG_LIBRARIES "")
diff --git a/graphics/podofo/files/patch-utf8cpp b/graphics/podofo/files/patch-utf8cpp
deleted file mode 100644
index 68a3bf774bea..000000000000
--- a/graphics/podofo/files/patch-utf8cpp
+++ /dev/null
@@ -1,187 +0,0 @@
---- src/podofo/main/PdfCMapEncoding.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfCMapEncoding.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfCMapEncoding.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfDictionary.h"
- #include "PdfObjectStream.h"
---- src/podofo/main/PdfCharCodeMap.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfCharCodeMap.cpp
-@@ -8,7 +8,7 @@
- #include "PdfCharCodeMap.h"
- #include <random>
- #include <algorithm>
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- using namespace std;
- using namespace PoDoFo;
---- src/podofo/main/PdfDifferenceEncoding.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfDifferenceEncoding.cpp
-@@ -9,7 +9,7 @@
-
- #include <algorithm>
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
- #include <podofo/private/charconv_compat.h>
-
- #include "PdfArray.h"
---- src/podofo/main/PdfEncoding.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfEncoding.cpp
-@@ -8,7 +8,7 @@
- #include "PdfEncoding.h"
-
- #include <atomic>
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include <podofo/private/PdfEncodingPrivate.h>
-
---- src/podofo/main/PdfEncodingMap.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfEncodingMap.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfEncodingMap.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfDictionary.h"
- #include "PdfCMapEncoding.h"
---- src/podofo/main/PdfFont.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfFont.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfFont.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include <podofo/private/PdfEncodingPrivate.h>
- #include <podofo/private/PdfStandard14FontData.h>
---- src/podofo/main/PdfFontManager.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfFontManager.cpp
-@@ -16,7 +16,7 @@
-
- #include <podofo/private/FreetypePrivate.h>
- #include FT_TRUETYPE_TABLES_H
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfDictionary.h"
- #include <podofo/auxiliary/InputDevice.h>
---- src/podofo/main/PdfFontType1.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfFontType1.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfFontType1.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include <podofo/auxiliary/InputDevice.h>
- #include "PdfArray.h"
---- src/podofo/main/PdfIdentityEncoding.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfIdentityEncoding.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfIdentityEncoding.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfDictionary.h"
- #include "PdfFont.h"
---- src/podofo/main/PdfImage.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfImage.cpp
-@@ -13,7 +13,7 @@ extern "C" {
- }
- #endif // PODOFO_HAVE_TIFF_LIB
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include <podofo/private/FileSystem.h>
- #include <podofo/private/PdfFiltersPrivate.h>
---- src/podofo/main/PdfPage_TextExtraction.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfPage_TextExtraction.cpp
-@@ -11,7 +11,7 @@
- #include <deque>
- #include <stack>
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfDocument.h"
- #include "PdfTextState.h"
---- src/podofo/main/PdfPainter.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfPainter.cpp
-@@ -9,7 +9,7 @@
-
- #include <podofo/private/PdfDrawingOperations.h>
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include "PdfExtGState.h"
- #include "PdfFont.h"
---- src/podofo/main/PdfString.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/main/PdfString.cpp
-@@ -7,7 +7,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "PdfString.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- #include <podofo/private/PdfEncodingPrivate.h>
-
---- src/podofo/private/PdfEncodingPrivate.cpp.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/private/PdfEncodingPrivate.cpp
-@@ -7,7 +7,7 @@
- #include "PdfDeclarationsPrivate.h"
- #include "PdfEncodingPrivate.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- using namespace std;
- using namespace PoDoFo;
---- src/podofo/private/utfcpp_extensions.h.orig 2023-10-29 16:21:49 UTC
-+++ src/podofo/private/utfcpp_extensions.h
-@@ -3,7 +3,7 @@
-
- #include <cstddef>
- #include <stdexcept>
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- namespace utf8
- {
---- test/common/PdfTest.cpp.orig 2023-10-29 16:21:49 UTC
-+++ test/common/PdfTest.cpp
-@@ -8,7 +8,7 @@
-
- #include "PdfTest.h"
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
-
- using namespace std;
- using namespace PoDoFo;
---- tools/private/MainEntryPoint.cpp.orig 2023-10-29 16:21:49 UTC
-+++ tools/private/MainEntryPoint.cpp
-@@ -2,7 +2,7 @@
- #include <string>
- #include <iostream>
-
--#include <utf8cpp/utf8.h>
-+#include <utf8.h>
- #include <podofo/auxiliary/span.hpp>
- #include <podofo/main/PdfError.h>
-