diff options
Diffstat (limited to 'graphics/poppler')
| -rw-r--r-- | graphics/poppler/Makefile | 9 | ||||
| -rw-r--r-- | graphics/poppler/distinfo | 6 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-poppler_FlateStream.cc | 33 | ||||
| -rw-r--r-- | graphics/poppler/files/patch-poppler_FlateStream.h | 11 | ||||
| -rw-r--r-- | graphics/poppler/pkg-plist | 2 |
5 files changed, 8 insertions, 53 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 12a976699b4f..add7e0b93f64 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -1,6 +1,5 @@ PORTNAME= poppler -DISTVERSION= 25.04.0 -PORTREVISION= 1 +DISTVERSION= 25.10.0 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ @@ -57,7 +56,7 @@ CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} PORTSCOUT= limitw:1,even USES+= iconv CMAKE_ON+= ENABLE_CPP -PLIST_SUB+= SHLIB_VER=148 +PLIST_SUB+= SHLIB_VER=154 OPTIONS_DEFINE= CURL OPENJPEG GNUPG OPTIONS_DEFAULT= OPENJPEG GNUPG @@ -77,7 +76,7 @@ CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ . if ${_SLAVE_PORT} == glib USES+= gnome python:build -USE_GNOME+= cairo glib20 introspection:Build libxml2 +USE_GNOME+= cairo glib20 introspection:build libxml2 BINARY_ALIAS+= python3=${PYTHON_CMD} . elif ${_SLAVE_PORT} == qt5 USES+= qt:5 @@ -103,7 +102,7 @@ OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" GNUPG_CMAKE_BOOL= ENABLE_GPGME GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ - libgpgmepp.so:security/gpgme-cpp + libgpgmepp.so:security/gpgmepp post-install: .if ${_SLAVE_PORT} == glib diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 2c310994dfb2..c57e6528ce42 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744042785 -SHA256 (poppler-25.04.0.tar.xz) = b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d -SIZE (poppler-25.04.0.tar.xz) = 1957260 +TIMESTAMP = 1764268443 +SHA256 (poppler-25.10.0.tar.xz) = 6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0 +SIZE (poppler-25.10.0.tar.xz) = 1985796 diff --git a/graphics/poppler/files/patch-poppler_FlateStream.cc b/graphics/poppler/files/patch-poppler_FlateStream.cc deleted file mode 100644 index 5e1b2da32a64..000000000000 --- a/graphics/poppler/files/patch-poppler_FlateStream.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 diff --git a/graphics/poppler/files/patch-poppler_FlateStream.h b/graphics/poppler/files/patch-poppler_FlateStream.h deleted file mode 100644 index a8909b42032e..000000000000 --- a/graphics/poppler/files/patch-poppler_FlateStream.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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: diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 58019476d0d8..bcb50437f3a6 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.1.0 +lib/libpoppler-cpp.so.2.2.0 lib/libpoppler.so lib/libpoppler.so.%%SHLIB_VER%% lib/libpoppler.so.%%SHLIB_VER%%.0.0 |