Page MenuHomeFreeBSD
Files F157197603

D56472.diff
No OneTemporary
Actions

D56472.diff
View Options

diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile
--- a/graphics/poppler-qt5/Makefile
+++ b/graphics/poppler-qt5/Makefile
@@ -1,8 +1,13 @@
COMMENT= Qt 5 bindings to poppler
+# needed for tests
+USE_LOCALE= en_US.UTF-8
+
MASTERDIR= ${.CURDIR}/../../graphics/poppler
_SLAVE_PORT= qt5
PLIST= ${.CURDIR}/pkg-plist
+OPTIONS_DEFINE= TEST
+
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist
--- a/graphics/poppler-qt5/pkg-plist
+++ b/graphics/poppler-qt5/pkg-plist
@@ -9,5 +9,5 @@
include/poppler/qt5/poppler-version.h
lib/libpoppler-qt5.so
lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.39.0
+lib/libpoppler-qt5.so.1.40.0
libdata/pkgconfig/poppler-qt5.pc
diff --git a/graphics/poppler-qt6/Makefile b/graphics/poppler-qt6/Makefile
--- a/graphics/poppler-qt6/Makefile
+++ b/graphics/poppler-qt6/Makefile
@@ -5,4 +5,6 @@
_SLAVE_PORT= qt6
PLIST= ${.CURDIR}/pkg-plist
+OPTIONS_DEFINE= TEST
+
.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt6/pkg-plist b/graphics/poppler-qt6/pkg-plist
--- a/graphics/poppler-qt6/pkg-plist
+++ b/graphics/poppler-qt6/pkg-plist
@@ -10,5 +10,5 @@
include/poppler/qt6/poppler-version.h
lib/libpoppler-qt6.so
lib/libpoppler-qt6.so.3
-lib/libpoppler-qt6.so.3.11.0
+lib/libpoppler-qt6.so.3.12.0
libdata/pkgconfig/poppler-qt6.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -1,8 +1,8 @@
PORTNAME= poppler
-DISTVERSION= 25.10.0
-PORTREVISION= 1
+DISTVERSION= 26.04.0
CATEGORIES= graphics print
MASTER_SITES= https://poppler.freedesktop.org/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= desktop@FreeBSD.org
COMMENT?= PDF rendering library
@@ -23,7 +23,7 @@
gsed:textproc/gsed
RUN_DEPENDS= poppler-data>0:graphics/poppler-data
-USES= cmake:insource compiler:c++20-lang cpe gperf jpeg \
+USES= cmake:testing compiler:c++20-lang cpe gperf jpeg \
localbase pathfix pkgconfig tar:xz
CPE_VENDOR= freedesktop
USE_LDCONFIG= yes
@@ -40,7 +40,10 @@
# Note: since f3ba77e14cac05d43caf35100848eeaee3bc64b4 graphics/openjpeg15 installs
# its cmake files to ${PREFIX}/lib/openjpeg15
CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 \
- -DENABLE_DCTDECODER:STRING="libjpeg"
+ -DENABLE_DCTDECODER:STRING="libjpeg" \
+ -DTESTDATADIR:PATH=${WRKSRC}/testdata
+
+USE_GITLAB= nodefault
# Slave ports.
_POPPLER_SLAVES= library glib qt5 qt6 utils
@@ -57,9 +60,9 @@
PORTSCOUT= limitw:1,even
USES+= iconv
CMAKE_ON+= ENABLE_CPP
-PLIST_SUB+= SHLIB_VER=154
+PLIST_SUB+= SHLIB_VER=159
-OPTIONS_DEFINE= CURL OPENJPEG GNUPG
+OPTIONS_DEFINE= CURL OPENJPEG GNUPG TEST
OPTIONS_DEFAULT= OPENJPEG GNUPG
OPTIONS_SUB= yes
.else
@@ -68,8 +71,8 @@
LIB_DEPENDS+= libpoppler.so:graphics/poppler
PKGNAMESUFFIX= -${_SLAVE_PORT}
-BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT}
-INSTALL_WRKSRC= ${WRKSRC}/${_SLAVE_PORT}
+BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/${_SLAVE_PORT}
+INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}/${_SLAVE_PORT}
CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \
-DENABLE_LIBCURL:BOOL=FALSE \
@@ -105,15 +108,17 @@
GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \
libgpgmepp.so:security/gpgmepp
+TEST_GL_TUPLE= https://gitlab.freedesktop.org:poppler:test:b85e4d1ce75636b3e727555a9d31da34ad771c1c:testdata/testdata
+
post-install:
.if ${_SLAVE_PORT} == glib
- ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-glib.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
.elif ${_SLAVE_PORT} == qt5
- ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-qt5.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
.elif ${_SLAVE_PORT} == qt6
- ${INSTALL_DATA} ${WRKSRC}/poppler-qt6.pc \
+ ${INSTALL_DATA} ${BUILD_WRKSRC}/../poppler-qt6.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
.endif
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1764268443
-SHA256 (poppler-25.10.0.tar.xz) = 6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0
-SIZE (poppler-25.10.0.tar.xz) = 1985796
+TIMESTAMP = 1776172947
+SHA256 (poppler-26.04.0.tar.xz) = b0955163114af96bc0106f68cb24daf973a629462453d8b82775f81b0d4e0693
+SIZE (poppler-26.04.0.tar.xz) = 2032180
+SHA256 (poppler-test-b85e4d1ce75636b3e727555a9d31da34ad771c1c_GL0.tar.gz) = 2b662350a1680343a14737e4824aa98b6048a808b7972959f1da641cd5f182c7
+SIZE (poppler-test-b85e4d1ce75636b3e727555a9d31da34ad771c1c_GL0.tar.gz) = 5928271
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -40,6 +40,7 @@
include/poppler/PDFDocBuilder.h
include/poppler/PDFDocEncoding.h
include/poppler/PDFDocFactory.h
+include/poppler/PDFRectangle.h
include/poppler/PSOutputDev.h
include/poppler/Page.h
include/poppler/PageTransition.h
@@ -112,8 +113,8 @@
include/poppler/splash/SplashPattern.h
include/poppler/splash/SplashTypes.h
lib/libpoppler-cpp.so
-lib/libpoppler-cpp.so.2
-lib/libpoppler-cpp.so.2.2.0
+lib/libpoppler-cpp.so.3
+lib/libpoppler-cpp.so.3.0.0
lib/libpoppler.so
lib/libpoppler.so.%%SHLIB_VER%%
lib/libpoppler.so.%%SHLIB_VER%%.0.0

File Metadata

Mime Type
text/plain
Expires
Wed, May 20, 6:21 AM (8 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33338578
Default Alt Text
D56472.diff (5 KB)

Event Timeline