freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics/poppler: Update to 25.04.0

Browse Source 
PR:		286099
Exp-run by:	antoine
This commit is contained in:
Loïc Bartoletti 2025-04-10 07:40:41 +02:00
parent b60a4e53fa
commit 7b1c8b968e
7 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/poppler-qt5/pkg-plist
View File

@ -9,5 +9,5 @@ include/poppler/qt5/poppler-qt5.h
include/poppler/qt5/poppler-version.h include/poppler/qt5/poppler-version.h
lib/libpoppler-qt5.so lib/libpoppler-qt5.so
lib/libpoppler-qt5.so.1 lib/libpoppler-qt5.so.1
lib/libpoppler-qt5.so.1.37.0 lib/libpoppler-qt5.so.1.38.0
libdata/pkgconfig/poppler-qt5.pc libdata/pkgconfig/poppler-qt5.pc

2
graphics/poppler-qt6/pkg-plist
View File

@ -10,5 +10,5 @@ include/poppler/qt6/poppler-qt6.h
include/poppler/qt6/poppler-version.h include/poppler/qt6/poppler-version.h
lib/libpoppler-qt6.so lib/libpoppler-qt6.so
lib/libpoppler-qt6.so.3 lib/libpoppler-qt6.so.3
lib/libpoppler-qt6.so.3.9.0 lib/libpoppler-qt6.so.3.10.0
libdata/pkgconfig/poppler-qt6.pc libdata/pkgconfig/poppler-qt6.pc

15
graphics/poppler/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= poppler PORTNAME= poppler
DISTVERSION= 25.02.0 DISTVERSION= 25.04.0
CATEGORIES= graphics print CATEGORIES= graphics print
MASTER_SITES= https://poppler.freedesktop.org/ MASTER_SITES= https://poppler.freedesktop.org/
@ -17,8 +17,6 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libnss3.so:security/nss \ libnss3.so:security/nss \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgme-cpp \
libassuan.so:security/libassuan libassuan.so:security/libassuan
BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \ BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \
gsed:textproc/gsed gsed:textproc/gsed
@ -29,7 +27,6 @@ USES= cmake:insource compiler:c++20-lang cpe gperf jpeg \
CPE_VENDOR= freedesktop CPE_VENDOR= freedesktop
USE_LDCONFIG= yes USE_LDCONFIG= yes
CMAKE_ON= ENABLE_BOOST \ CMAKE_ON= ENABLE_BOOST \
ENABLE_GPGME \
ENABLE_LCMS \ ENABLE_LCMS \
ENABLE_LIBTIFF \ ENABLE_LIBTIFF \
ENABLE_NSS3 \ ENABLE_NSS3 \
@ -59,10 +56,10 @@ CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/}
PORTSCOUT= limitw:1,even PORTSCOUT= limitw:1,even
USES+= iconv USES+= iconv
CMAKE_ON+= ENABLE_CPP CMAKE_ON+= ENABLE_CPP
PLIST_SUB+= SHLIB_VER=146 PLIST_SUB+= SHLIB_VER=148
OPTIONS_DEFINE= CURL OPENJPEG OPTIONS_DEFINE= CURL OPENJPEG GNUPG
OPTIONS_DEFAULT= OPENJPEG OPTIONS_DEFAULT= OPENJPEG GNUPG
OPTIONS_SUB= yes OPTIONS_SUB= yes
.else .else
PORTSCOUT= ignore:1 PORTSCOUT= ignore:1
@ -102,6 +99,10 @@ OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2" OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2"
OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" 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: post-install:
.if ${_SLAVE_PORT} == glib .if ${_SLAVE_PORT} == glib
${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \

6
graphics/poppler/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1742579130 TIMESTAMP = 1744042785
SHA256 (poppler-25.02.0.tar.xz) = 21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee SHA256 (poppler-25.04.0.tar.xz) = b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d
SIZE (poppler-25.02.0.tar.xz) = 1943728 SIZE (poppler-25.04.0.tar.xz) = 1957260

33
graphics/poppler/files/patch-poppler_FlateStream.cc Normal file
View File

@ -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<std::string> 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

11
graphics/poppler/files/patch-poppler_FlateStream.h Normal file
View File

@ -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<std::string> getPSFilter(int psLevel, const char *indent) override;
bool isBinary(bool last = true) const override;
private:

2
graphics/poppler/pkg-plist
View File

@ -113,7 +113,7 @@ include/poppler/splash/SplashPattern.h
include/poppler/splash/SplashTypes.h include/poppler/splash/SplashTypes.h
lib/libpoppler-cpp.so lib/libpoppler-cpp.so
lib/libpoppler-cpp.so.2 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
lib/libpoppler.so.%%SHLIB_VER%% lib/libpoppler.so.%%SHLIB_VER%%
lib/libpoppler.so.%%SHLIB_VER%%.0.0 lib/libpoppler.so.%%SHLIB_VER%%.0.0