git: 63e7c60a55f0 - main - graphics/podofo: Fix build with utf8cpp 4.0.0+
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Nov 2023 17:17:59 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=63e7c60a55f0d993237d6afe9ca6bc82209b9aa3
commit 63e7c60a55f0d993237d6afe9ca6bc82209b9aa3
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-14 16:38:16 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-11-14 17:15:33 +0000
graphics/podofo: Fix build with utf8cpp 4.0.0+
---
graphics/podofo/Makefile | 2 +-
graphics/podofo/files/patch-utf8cpp | 187 ++++++++++++++++++++++++++++++++++++
2 files changed, 188 insertions(+), 1 deletion(-)
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index 3ebb3a2f1b22..c672c54351b0 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -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>=0:devel/utf8cpp
+ utf8cpp>=4.0.0:devel/utf8cpp
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libidn.so:dns/libidn
diff --git a/graphics/podofo/files/patch-utf8cpp b/graphics/podofo/files/patch-utf8cpp
new file mode 100644
index 000000000000..68a3bf774bea
--- /dev/null
+++ b/graphics/podofo/files/patch-utf8cpp
@@ -0,0 +1,187 @@
+--- 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>
+