From nobody Thu Dec 14 06:05:31 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 4SrMK84Gxhz53SZX; Thu, 14 Dec 2023 06:05:32 +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 4SrMK7712Kz3GFq; Thu, 14 Dec 2023 06:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702533932; 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=imngFxb+Ct0TavQ/WTEJzErwm8Eu9N34vB+T4LRazPk=; b=qSfKAk3JEn+tY1goME1BrC0pY9erKxcY/LFCSJOyqAd9nmWnoks+/ubVlg/TFHn55cta5W sYPst3iVhA560Xs3iGqse6DGI1dWn0s/Iraum+t0/dLAQwrIV9veZ3gEosWbJNp3219Dfx C8nbCAGTy3W0frFkNtlu0JEc0boNKOJHDqP9TOxZMZBiJ42FuYJB7K7XEuHKME8V+JQQ81 YDjhgqK5x8hrtVjlQXNWY0vcUBxyZl0F3Vm6s57UX7fYZT6yXYxym5ayUKuFNgpkWqBypn E7ecqIlkI0vm9V3y1MBSNS9tgYudbOW4PmLBsGN16M/kbfEZRMnhaxL00g0wsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702533932; a=rsa-sha256; cv=none; b=T9o/e9Ylq9O1VvNweKbJuZbQHPVa78rrdHPelX72p4CcfYUKOj16Y+pPhJVNN+9LgAtASp IzXkEOoSXZNRmf7Qmxa2KI+2txePgWwPkiAIQKMLE2VnH2cpdCmmo9ioz5KNBBujfDlTJj gIjRxS+T4BevCe0kVwMeoDN73Ifqkib7/4aMFyCEfoCEkD66ZykfrTEc1LYl4EqqvyC0TR FkCOpQdiPymj0zcwYjxHJQhyn/ypqSpGFVnrNhNHg0aIMYYMdDcTIdg34lTv/RyrJHelqZ 7HEBmmQw15U9ZZ+ncHTX8L4puZcuLf+vEJ1y5WynH0wuo1WCNaZ30+CLkjrgcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702533932; 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=imngFxb+Ct0TavQ/WTEJzErwm8Eu9N34vB+T4LRazPk=; b=qX7zGXEV4NNcb5ziL5nrgommRRDpX/8H7ngsxeK60FBfR7gBYFsfaCIxy2qf21HaDDlvHZ mXs9mkSJUJ2lxrU41h4fqpJINsvvnzpIzbgl3DfxeQM1oqoQdny/8c1mYKBxGs4nqehvSW 9nHMEse/PWsNRNPQeaViYcDgQWTUO6Mt8q0dV55LaVxce91hZhGbCWiFcQcrkFSn+DeXyq 592fjTEqeYDh3vkJlQUocoda1u7HcW8YuZ+X3U8/65aMnuAC4z6Cfx3gtNZ0OMvdkhL6zc qCHpUrfbMXbbjqtYhCyqTO5nQQk5JeqXWyhxThhGjXhyPa7L7G0O/IXyQVSZEg== 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 4SrMK75tGXz16Z; Thu, 14 Dec 2023 06:05:31 +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 3BE65V7p098764; Thu, 14 Dec 2023 06:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BE65V6p098761; Thu, 14 Dec 2023 06:05:31 GMT (envelope-from git) Date: Thu, 14 Dec 2023 06:05:31 GMT Message-Id: <202312140605.3BE65V6p098761@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: ce02aaedcbb7 - main - graphics/podofo: Update to 0.10.3 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: ce02aaedcbb7b21bb01c0e81abd4043ce948b300 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce02aaedcbb7b21bb01c0e81abd4043ce948b300 commit ce02aaedcbb7b21bb01c0e81abd4043ce948b300 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 05:35:41 +0000 Commit: Po-Chuan Hsieh 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 - #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 -