From nobody Fri Apr 18 16:22:37 2025 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 4ZfKmY4lk2z5t2dj; Fri, 18 Apr 2025 16:22:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfKmY47hTz3KhZ; Fri, 18 Apr 2025 16:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744993357; 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=vu5mipYhOqTNr0uCctBDxsvKvCxmgMjIIQf9U9A7w6Y=; b=jGM4c56hwBQMRE6qvDYRKGZasZ6DtVosaNu8Ituy3Vn2gSvwJqlr5AYWN+tdkq0lnz2fMj cclmb4LryZrpZXTsVAGbOW3HoQw3cQAjs+DeTVKgl2kgzeeQad2uj2CwwGMf8AqlZjU2+2 vnYa+3sCVffJCE51iaYQ9/5DypHnw3Z4vynaBm9ZnDa9/fU3/4vdloi/6wzhJm/Fvl3Bub G5FVeb9zLZfLQ4rir9lvfzxCikJxGLABQl4yh5tfdYOpmK/3vj+09soBet9YN9lUAVYUvU CiRL97pjVhkZ/4/wlRMwlqDfBU3wSMClWHfm6dpeT8RijwaNuo1NmfJr3cQ+VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744993357; a=rsa-sha256; cv=none; b=rQVRZLtRdnrilg8v6MZIvb7/QL9RRtD/gTerCMZqAHtirjHZSdhxl8IsWgzfJUmrKWeGWi 4CNlrptCcbJbN7tHdr2A9HO202vDXKlZJ8C7JCixK8Vf6GAQt5Ff118rky6OD8/i0/RaiT QgJgsJkfu1XeaRkAvwBgwkgZ679GEq+q+fbp+VQxjQd7/ZW/lVkQohleVUqMKNVjDkBaDt zP5OnxdesgTeQl2QWa4zumCpbd6OmUCBt4OE0vNvMSl42VwjjJmTU+lkGgtZCPQnj3ggia 5J5RkmCI9waUgiOgxy3f7MvYP7I6CJ/1UXcxd8I6sxfdtLetIv80pGTf4FyafQ== 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=1744993357; 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=vu5mipYhOqTNr0uCctBDxsvKvCxmgMjIIQf9U9A7w6Y=; b=ohxL4cJ5vl5ru1kb8PumI7albTvNGVgSh3571ISnyTMiFihoSUpKB6blBXaWaa7CMYBU/U aewnKb6gWGYgDOCVMAU6eLC6mhyq8S6m1kPodV6InlahnxPUlNl+KqhTgtmabeGQhsMaFv /XOgPSfh90eh/PXg5459f+th/hpb1eNLnTfowDmy+foPwI8TiILJzTYQOD6IkjCONFC9DD JyGrOYWQo31gb9krMKFOWmk30UQj0VwSqSZtoFy07GtZrKp1ov99p1Tok9i4iTP07uXqga VRzikqAJLD0zPUVy8sn9jO7wVWwJnSJodyTeF9ro8RpbII9QyvlaI7Xg02br2w== 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 4ZfKmY3VJ7zj7x; Fri, 18 Apr 2025 16:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IGMbcA097997; Fri, 18 Apr 2025 16:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IGMbm7097994; Fri, 18 Apr 2025 16:22:37 GMT (envelope-from git) Date: Fri, 18 Apr 2025 16:22:37 GMT Message-Id: <202504181622.53IGMbm7097994@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc?= Bartoletti Subject: git: 7b1c8b968ea9 - main - graphics/poppler: Update to 25.04.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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b1c8b968ea965822996bebb1ee64e7b85f2b99c Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b1c8b968ea965822996bebb1ee64e7b85f2b99c commit 7b1c8b968ea965822996bebb1ee64e7b85f2b99c Author: Loïc Bartoletti AuthorDate: 2025-04-10 05:40:41 +0000 Commit: Loïc Bartoletti CommitDate: 2025-04-18 16:21:34 +0000 graphics/poppler: Update to 25.04.0 PR: 286099 Exp-run by: antoine --- graphics/poppler-qt5/pkg-plist | 2 +- graphics/poppler-qt6/pkg-plist | 2 +- graphics/poppler/Makefile | 15 +++++----- graphics/poppler/distinfo | 6 ++-- .../poppler/files/patch-poppler_FlateStream.cc | 33 ++++++++++++++++++++++ graphics/poppler/files/patch-poppler_FlateStream.h | 11 ++++++++ graphics/poppler/pkg-plist | 2 +- 7 files changed, 58 insertions(+), 13 deletions(-) diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist index c5427ae04222..f6c2ea2ecf4c 100644 --- a/graphics/poppler-qt5/pkg-plist +++ b/graphics/poppler-qt5/pkg-plist @@ -9,5 +9,5 @@ include/poppler/qt5/poppler-qt5.h include/poppler/qt5/poppler-version.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.37.0 +lib/libpoppler-qt5.so.1.38.0 libdata/pkgconfig/poppler-qt5.pc diff --git a/graphics/poppler-qt6/pkg-plist b/graphics/poppler-qt6/pkg-plist index 431222f2c84e..799a56b8851b 100644 --- a/graphics/poppler-qt6/pkg-plist +++ b/graphics/poppler-qt6/pkg-plist @@ -10,5 +10,5 @@ include/poppler/qt6/poppler-qt6.h include/poppler/qt6/poppler-version.h lib/libpoppler-qt6.so lib/libpoppler-qt6.so.3 -lib/libpoppler-qt6.so.3.9.0 +lib/libpoppler-qt6.so.3.10.0 libdata/pkgconfig/poppler-qt6.pc diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 3d093292c70a..8717cb70b3c4 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,5 +1,5 @@ PORTNAME= poppler -DISTVERSION= 25.02.0 +DISTVERSION= 25.04.0 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ @@ -17,8 +17,6 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libfontconfig.so:x11-fonts/fontconfig \ - libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp \ libassuan.so:security/libassuan BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \ gsed:textproc/gsed @@ -29,7 +27,6 @@ USES= cmake:insource compiler:c++20-lang cpe gperf jpeg \ CPE_VENDOR= freedesktop USE_LDCONFIG= yes CMAKE_ON= ENABLE_BOOST \ - ENABLE_GPGME \ ENABLE_LCMS \ ENABLE_LIBTIFF \ ENABLE_NSS3 \ @@ -59,10 +56,10 @@ CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} PORTSCOUT= limitw:1,even USES+= iconv CMAKE_ON+= ENABLE_CPP -PLIST_SUB+= SHLIB_VER=146 +PLIST_SUB+= SHLIB_VER=148 -OPTIONS_DEFINE= CURL OPENJPEG -OPTIONS_DEFAULT= OPENJPEG +OPTIONS_DEFINE= CURL OPENJPEG GNUPG +OPTIONS_DEFAULT= OPENJPEG GNUPG OPTIONS_SUB= yes .else PORTSCOUT= ignore:1 @@ -102,6 +99,10 @@ OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2" OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" +GNUPG_CMAKE_BOOL= ENABLE_GPGME +GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ + libgpgmepp.so:security/gpgme-cpp + post-install: .if ${_SLAVE_PORT} == glib ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index d5959f62b10e..2c310994dfb2 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742579130 -SHA256 (poppler-25.02.0.tar.xz) = 21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee -SIZE (poppler-25.02.0.tar.xz) = 1943728 +TIMESTAMP = 1744042785 +SHA256 (poppler-25.04.0.tar.xz) = b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d +SIZE (poppler-25.04.0.tar.xz) = 1957260 diff --git a/graphics/poppler/files/patch-poppler_FlateStream.cc b/graphics/poppler/files/patch-poppler_FlateStream.cc new file mode 100644 index 000000000000..5e1b2da32a64 --- /dev/null +++ b/graphics/poppler/files/patch-poppler_FlateStream.cc @@ -0,0 +1,33 @@ +--- poppler/FlateStream.cc.orig 2025-04-09 19:16:40 UTC ++++ poppler/FlateStream.cc +@@ -133,18 +133,22 @@ int FlateStream::fill_buffer() + return 0; + } + +-GooString *FlateStream::getPSFilter(int psLevel, const char *indent) ++std::optional FlateStream::getPSFilter(int psLevel, const char *indent) + { +- GooString *s; +- + if (psLevel < 3 || pred) { +- return NULL; ++ return std::nullopt; + } +- if (!(s = str->getPSFilter(psLevel, indent))) { +- return NULL; ++ ++ auto inner = str->getPSFilter(psLevel, indent); ++ if (!inner.has_value()) { ++ return std::nullopt; + } +- s->append(indent)->append("<< >> /FlateDecode filter\n"); +- return s; ++ ++ std::string result = *inner; ++ result.append(indent); ++ result.append("<< >> /FlateDecode filter\n"); ++ ++ return result; + } + + bool FlateStream::isBinary(bool last) const diff --git a/graphics/poppler/files/patch-poppler_FlateStream.h b/graphics/poppler/files/patch-poppler_FlateStream.h new file mode 100644 index 000000000000..a8909b42032e --- /dev/null +++ b/graphics/poppler/files/patch-poppler_FlateStream.h @@ -0,0 +1,11 @@ +--- poppler/FlateStream.h.orig 2025-04-09 19:14:40 UTC ++++ poppler/FlateStream.h +@@ -45,7 +45,7 @@ class FlateStream : public FilterStream (public) + int lookChar() override; + int getRawChar() override; + void getRawChars(int nChars, int *buffer) override; +- GooString *getPSFilter(int psLevel, const char *indent) override; ++ std::optional getPSFilter(int psLevel, const char *indent) override; + bool isBinary(bool last = true) const override; + + private: diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index db057dea03b5..58019476d0d8 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -113,7 +113,7 @@ include/poppler/splash/SplashPattern.h include/poppler/splash/SplashTypes.h lib/libpoppler-cpp.so lib/libpoppler-cpp.so.2 -lib/libpoppler-cpp.so.2.0.0 +lib/libpoppler-cpp.so.2.1.0 lib/libpoppler.so lib/libpoppler.so.%%SHLIB_VER%% lib/libpoppler.so.%%SHLIB_VER%%.0.0