From nobody Tue Nov 14 17:17:59 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SVCfv3C7zz51YSw; Tue, 14 Nov 2023 17:17:59 +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 4SVCfv2Vl4z4S2N; Tue, 14 Nov 2023 17:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awpt+tZ3Ki2y39TawtPMrmGVSf+XTq6ZrSPfd8C47gU=; b=EAUJSkvb+6vye8emmLkAvAR4gYMzhVM4kbyWVe0FyY99d+9gUasMxU/vHN2l+ktpeaL9IQ n0GKqw69nPLq45NW/SmwObQi1aQKxHBbZsmdrZWdwUrp/FBUYOfFvYBcgb0+XcHZ+acGWL aCS80SwthrPV7Xl/EVslHTm5PK9keHVJZKmI9jpz7rjI1XbrwLEVxE20vqNStTvjYmzYpc D5ebwkwTDRhnnUONRkBcZxsHxH6hV3sXwqB29oJxXcEd1MPCBnuX2LbBawXeOo2HmwUDjc 3DKSW/HChg5R0J5pTijSHobjRCSKsCDER7cCEVBWUlb1pREleXh/sLxtI0Hm7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699982279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awpt+tZ3Ki2y39TawtPMrmGVSf+XTq6ZrSPfd8C47gU=; b=nbejhAU0NkVvTgAZuJn+DJX9cLmsVlDotWFqO4SV1xD5eVnzAhrJIEc4t1iJs/b++IM9oi nx/+d5hTOV3ZfP5NPevtPts89KxZQExnQ6woz2XBRJA6vXxHQCj+I7GHQ43Y+t1tJue46o d8lX8LX7kHNbPNTsX55skev+STZT9jVlqkzEBq4trFEDiRrrpl6WyY05Yk04C25t4+f0wU sf24w0siQFZ21YwzlDBD8mlrd0t07LhL9jzV8AFTpTXu6T4VP2YwtdpJB/PP5mqztkklAn bJ7bIlcT/zqtsqVe3dJmMPbD7YxFzQVfeKfQ0QoLJQTYuxM5qyZtPutkhU6O8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699982279; a=rsa-sha256; cv=none; b=gW5WKoefLUW1HLt8JCjVtjuiGKYHGvnepxBfhw7T0+IA7zGSuRku2PLmuDmFw931Ug69NI eExlhGbU2361eAa9/hXNW12pqu0mnXYKaNGAzPQnOKVfLaySbqS8NTXnL9E4qWcT6UbZlv CtK/DrcydNO1WhNH5lAKMCRZfDGLdwQOXCX4jZ+OGgpLFzq9e8HNkNTB8s9+kJToBaAYro 9ZjJtbdc2vna1YQXswhquS/qNn+7cQz953GGqJqYN/uIIXq/FOeN5cWf9NTNd2HYKgiaBA AWyALdDxY/Algi8uXCrS8mE+i7i2ruwTAu6ScxsleTqjulTMhZ2As36y2jeAEw== 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 4SVCfv1cRjzx6r; Tue, 14 Nov 2023 17:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AEHHxET057550; Tue, 14 Nov 2023 17:17:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEHHxow057547; Tue, 14 Nov 2023 17:17:59 GMT (envelope-from git) Date: Tue, 14 Nov 2023 17:17:59 GMT Message-Id: <202311141717.3AEHHxow057547@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: 63e7c60a55f0 - main - graphics/podofo: Fix build with utf8cpp 4.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 63e7c60a55f0d993237d6afe9ca6bc82209b9aa3 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=63e7c60a55f0d993237d6afe9ca6bc82209b9aa3 commit 63e7c60a55f0d993237d6afe9ca6bc82209b9aa3 Author: Po-Chuan Hsieh AuthorDate: 2023-11-14 16:38:16 +0000 Commit: Po-Chuan Hsieh 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 + #include "PdfCMapEncoding.h" + +-#include ++#include + + #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 + #include +-#include ++#include + + 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 + +-#include ++#include + #include + + #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 +-#include ++#include + + #include + +--- src/podofo/main/PdfEncodingMap.cpp.orig 2023-10-29 16:21:49 UTC ++++ src/podofo/main/PdfEncodingMap.cpp +@@ -7,7 +7,7 @@ + #include + #include "PdfEncodingMap.h" + +-#include ++#include + + #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 + #include "PdfFont.h" + +-#include ++#include + + #include + #include +--- src/podofo/main/PdfFontManager.cpp.orig 2023-10-29 16:21:49 UTC ++++ src/podofo/main/PdfFontManager.cpp +@@ -16,7 +16,7 @@ + + #include + #include FT_TRUETYPE_TABLES_H +-#include ++#include + + #include "PdfDictionary.h" + #include +--- src/podofo/main/PdfFontType1.cpp.orig 2023-10-29 16:21:49 UTC ++++ src/podofo/main/PdfFontType1.cpp +@@ -7,7 +7,7 @@ + #include + #include "PdfFontType1.h" + +-#include ++#include + + #include + #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 + #include "PdfIdentityEncoding.h" + +-#include ++#include + + #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 ++#include + + #include + #include +--- 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 + #include + +-#include ++#include + + #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 + +-#include ++#include + + #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 + #include "PdfString.h" + +-#include ++#include + + #include + +--- 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 ++#include + + 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 + #include +-#include ++#include + + 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 ++#include + + 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 + #include + +-#include ++#include + #include + #include +