From nobody Fri Jun 30 07:18:10 2023 X-Original-To: dev-commits-ports-main@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 4Qsmr35lx9z4kp3P; Fri, 30 Jun 2023 07:18:11 +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 4Qsmr30s4dz3k1V; Fri, 30 Jun 2023 07:18:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109491; 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=GZDkm/V7EeK0HDNCFYL4oL6Qj2cCfWeUwaMND0/MoQw=; b=vL+xYsBRR+B721IIK0pGcEry87tGJQqh1t7gepVJsbTgciA04WCXORFBBlGizBXqZJ8wtZ /2ugl5kkRVziKRM7wUQmw1tgayz5D9k7UKyBdNnPbHgt58KGJwmBdAgzNYKZbR1CDcpcXx 0a1JUOJJjuX4jyUA16UE/9RqcUuu/Lb194GbZhYCF0HEaepA36SxOgeCDJdQys79Bh2S3R 9fPVpqKaLdXaDTzIiMpQ9e3Vg8QuBq1H+g3cCWqIb85fjOMHQ4NM+gZjjSg0LuG+dtez9k gyGPuoXXa7RUEtM1Xv4CF2jE2TUadgVi/nRXf1q+r5tko/X9nhdZP3v6W9oSLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688109491; 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=GZDkm/V7EeK0HDNCFYL4oL6Qj2cCfWeUwaMND0/MoQw=; b=vVVzu2H6a3Dj4Oe+lgJFE6zQOexR3LhyFzwC5qsDui5MMMkbUp7N+kH/dgGXLrtSLG1j9o LTwlU80zcG1xqgERLR+YgTmWemFzh8sbz+87IeL/Q6hwJ+0ctycjitwBqALHwOMXK/Yqyd xv4aiqLhdZwVpSlVmIzNUzHyFHhlAQXGS7oAuXAqFiHAtXdJHbrwDq2DbAwAjn9p2s+SyQ /xpWh3X7RlMQM4f/y00wbF2cIV9TX8XkEMjVXeMIBEOMq4nsvYWYpLaYlvZ5gQ/F3NpNEH JQYhXUUKPlE+0bi8YPX53a7gpHnsA+5KmeJT4YagsvKctQxlDkwKTBDXKWnsPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688109491; a=rsa-sha256; cv=none; b=NAR6n0g88FnCahMlXLdAxUZBwI9ScczGAAfyaupQ4OH8WkDMZ+61gfbdESSRklikzsw3m0 pGHtIuC0ssYfk2Ar4s0G8kURelbCsHYc4It2ewDGG1ib30Loo38C9iY3a2npXnGBvFkoeO er3WXXqT1vDyBD4hoDQwKei1Jo+FAciR4ifXv9OkMQkaQk6jE9jOlcmoLk+SSOa5jdD3lF vjxFGB/VuJGMF0pNXBg7OBVTvwP8fGyamc1j8IyA4+yAB1rSoDEYSd0IKwJcJKN+P1fqAP 5fyagO+VXKvqpng4aHtuK8y09nLx0Y0RdVVumqOQ+5wlQUPFub0iiUJGnX8IyQ== 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 4Qsmr274MyzqN2; Fri, 30 Jun 2023 07:18:10 +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 35U7IAuJ064676; Fri, 30 Jun 2023 07:18:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U7IA7w064675; Fri, 30 Jun 2023 07:18:10 GMT (envelope-from git) Date: Fri, 30 Jun 2023 07:18:10 GMT Message-Id: <202306300718.35U7IA7w064675@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: 6363066eb52d - main - graphics/podofo: Simplify the patch with symbolic link List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 6363066eb52d4e8a90c08c64801a87e06a3b5287 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6363066eb52d4e8a90c08c64801a87e06a3b5287 commit 6363066eb52d4e8a90c08c64801a87e06a3b5287 Author: Po-Chuan Hsieh AuthorDate: 2023-06-30 07:01:53 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-06-30 07:01:53 +0000 graphics/podofo: Simplify the patch with symbolic link - Regenerate the patch file --- graphics/podofo/Makefile | 3 +- graphics/podofo/files/patch-CMakeLists.txt | 10 +- graphics/podofo/files/patch-utf8cpp | 176 ----------------------------- 3 files changed, 7 insertions(+), 182 deletions(-) diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index 99b070c65bce..9ac4d354f995 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -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 +CFLAGS+= -I${LOCALBASE}/include/fast_float -I${WRKSRC} CMAKE_ARGS= -DFONTCONFIG_LIBRARIES=${LOCALBASE}/lib/libfontconfig.so \ -DOPENSSL_INCLUDE_DIR=${OPENSSLINC} \ -DOPENSSL_LIBRARIES=${OPENSSLDIR} @@ -49,5 +49,6 @@ post-patch: @${RM} -r ${WRKSRC}/3rdparty/date/ @${RM} -r ${WRKSRC}/3rdparty/fmt/ @${RM} -r ${WRKSRC}/3rdparty/utfcpp/ + @${LN} -s ${LOCALBASE}/include/utf8cpp ${WRKSRC}/3rdparty/utfcpp .include diff --git a/graphics/podofo/files/patch-CMakeLists.txt b/graphics/podofo/files/patch-CMakeLists.txt index bb895715b2e1..74a6fd522797 100644 --- a/graphics/podofo/files/patch-CMakeLists.txt +++ b/graphics/podofo/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2023-03-25 11:01:27 UTC +++ CMakeLists.txt -@@ -21,7 +21,7 @@ set(PODOFO_VERSION_PATCH "0" CACHE STRING "Patchlevel +@@ -21,7 +21,7 @@ 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") @@ -9,7 +9,7 @@ set(PODOFO_SOVERSION "1") # -@@ -149,6 +149,7 @@ endif() +@@ -149,6 +149,7 @@ else() message("Libidn not found. AES-256 Encryption support will be disabled") endif() @@ -17,7 +17,7 @@ find_package(JPEG) if(JPEG_FOUND) -@@ -157,7 +158,9 @@ endif() +@@ -157,7 +158,9 @@ if(JPEG_FOUND) else() message("Libjpeg not found. JPEG support will be disabled") endif() @@ -27,7 +27,7 @@ find_package(TIFF) if(TIFF_FOUND) -@@ -166,7 +169,9 @@ endif() +@@ -166,7 +169,9 @@ if(TIFF_FOUND) else() message("Libtiff not found. TIFF support will be disabled") endif() @@ -37,7 +37,7 @@ find_package(PNG) if(PNG_FOUND) -@@ -175,6 +180,7 @@ else() +@@ -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 5788189e8fe5..000000000000 --- a/graphics/podofo/files/patch-utf8cpp +++ /dev/null @@ -1,176 +0,0 @@ ---- src/podofo/main/PdfCMapEncoding.cpp.orig 2023-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 UTC -+++ src/podofo/main/PdfDifferenceEncoding.cpp -@@ -9,7 +9,7 @@ - - #include - --#include -+#include - #include - - #include "PdfArray.h" ---- src/podofo/main/PdfEncoding.cpp.orig 2023-03-25 11:01:27 UTC -+++ src/podofo/main/PdfEncoding.cpp -@@ -8,7 +8,7 @@ - #include "PdfEncoding.h" - - #include --#include -+#include - - #include - ---- src/podofo/main/PdfEncodingMap.cpp.orig 2023-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 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-03-25 11:01:27 UTC -+++ src/podofo/main/PdfString.cpp -@@ -7,7 +7,7 @@ - #include - #include "PdfString.h" - --#include -+#include - - #include - ---- src/podofo/private/PdfEncodingPrivate.cpp.orig 2023-03-25 11:01:27 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-03-25 11:01:27 UTC -+++ src/podofo/private/utfcpp_extensions.h -@@ -3,7 +3,7 @@ - - #include - #include --#include -+#include - - namespace utf8 - { ---- test/common/PdfTest.cpp.orig 2023-03-25 11:01:27 UTC -+++ test/common/PdfTest.cpp -@@ -8,7 +8,7 @@ - - #include "PdfTest.h" - --#include -+#include - - using namespace std; - using namespace PoDoFo;