Index: editors/texmaker/Makefile =================================================================== --- editors/texmaker/Makefile +++ editors/texmaker/Makefile @@ -3,7 +3,7 @@ PORTNAME= texmaker PORTVERSION= 4.5 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ @@ -33,7 +33,6 @@ TOOLKIT_DESC= Qt toolkit QT4_USES= qt:4 QT4_USE= ${_USE_QT4:S/^/QT=/} -QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 QT5_USES= qt:5 QT5_USE= ${_USE_QT5:S/^/QT=/} QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 Index: editors/texstudio/Makefile =================================================================== --- editors/texstudio/Makefile +++ editors/texstudio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= texstudio -DISTVERSION= 2.12.8 +DISTVERSION= 2.12.10 CATEGORIES= editors PKGNAMESUFFIX= -${FLAVOR} @@ -14,33 +14,17 @@ BROKEN_armv6= fails to compile: error: no member named mc_eip in __mcontext LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \ - libpoppler.so:graphics/poppler + libpoppler.so:graphics/poppler \ + libpoppler-qt5.so:graphics/poppler-qt5 \ + libquazip5.so:archivers/quazip@qt5 -FLAVORS= qt5 qt4 -FLAVOR?= ${FLAVORS:[1]} - -qt4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libquazip.so:archivers/quazip@qt4 -qt5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 \ - libquazip5.so:archivers/quazip@qt5 - USES= desktop-file-utils dos2unix ghostscript:run \ - pkgconfig qmake - -.if ${FLAVOR} == qt4 -USES+= qt:4 -USE_QT= corelib gui network script svg xml \ - iconengines_run designer_build moc_build rcc_build uic_build -QMAKE_ARGS= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \ - QUAZIP_LIB="-lquazip" -.else -USES+= qt:5 + pkgconfig qmake qt:5 USE_QT = core gui network script svg widgets xml \ printsupport concurrent uitools buildtools_build QMAKE_ARGS= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \ QUAZIP_LIB="-lquazip5" QTVER_SUFFIX= 5 -.endif USE_XORG= x11 USE_GL= gl Index: editors/texstudio/distinfo =================================================================== --- editors/texstudio/distinfo +++ editors/texstudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523190835 -SHA256 (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062 -SIZE (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 26555418 +TIMESTAMP = 1538913866 +SHA256 (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 92cf9cbb536e58a5929611fa40438cd9d7ea6880022cd3c5de0483fd15d3df0b +SIZE (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 26770850 Index: editors/texstudio/pkg-plist =================================================================== --- editors/texstudio/pkg-plist +++ editors/texstudio/pkg-plist @@ -128,6 +128,8 @@ %%DATADIR%%/texstudio_hu.qm %%DATADIR%%/texstudio_it.qm %%DATADIR%%/texstudio_ja.qm +%%DATADIR%%/texstudio_ko.qm +%%DATADIR%%/texstudio_ko_KR.qm %%DATADIR%%/texstudio_nl.qm %%DATADIR%%/texstudio_pl.qm %%DATADIR%%/texstudio_pt_BR.qm Index: editors/texworks/Makefile =================================================================== --- editors/texworks/Makefile +++ editors/texworks/Makefile @@ -4,7 +4,6 @@ PORTNAME= texworks PORTVERSION= 0.4.6 DISTVERSIONPREFIX= release- -PORTREVISION= 7 CATEGORIES= editors MAINTAINER= hrs@FreeBSD.org @@ -16,13 +15,13 @@ BROKEN_armv7= fails to install: PDFDocument.cpp:1836:39: cannot initialize a parameter of type 'qreal *' with an rvalue of type 'double *' BUILD_DEPENDS= hunspell:textproc/hunspell -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 +LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 -USES= compiler:c++11-lang pkgconfig qmake qt:4 +USES= compiler:c++11-lang pkgconfig qmake qt:5 USE_GITHUB= yes GH_ACCOUNT= TeXworks -USE_QT= gui corelib rcc_build moc_build uic_build \ - dbus xml scripttools designer_build +USE_QT= core dbus gui script scripttools uitools widgets xml \ + buildtools_build designer_build qmake_build QMAKE_ARGS= INSTALL_PREFIX=${PREFIX} \ DATA_DIR=${DATADIR} \ DOCS_DIR=${DOCSDIR} \ Index: editors/texworks/distinfo =================================================================== --- editors/texworks/distinfo +++ editors/texworks/distinfo @@ -1,2 +1,3 @@ -SHA256 (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 58650574c1e3234c38cddc3375f8043a83cc65075839030fc7089471af6a3bde -SIZE (TeXworks-texworks-release-0.4.6_GH0.tar.gz) = 11271881 +TIMESTAMP = 1538912693 +SHA256 (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 22885c11d92654b0cba1f4808fc9aa3c2fdd3e5435fd89dff9aa1e67658a6339 +SIZE (TeXworks-texworks-release-0.6.2_GH0.tar.gz) = 11508277 Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -862,7 +862,6 @@ SUBDIR += poppler SUBDIR += poppler-data SUBDIR += poppler-glib - SUBDIR += poppler-qt4 SUBDIR += poppler-qt5 SUBDIR += poppler-utils SUBDIR += potrace @@ -933,7 +932,6 @@ SUBDIR += py-plotly SUBDIR += py-png SUBDIR += py-poppler - SUBDIR += py-poppler-qt4 SUBDIR += py-pycha SUBDIR += py-pycollada SUBDIR += py-pydot Index: graphics/diffpdf/Makefile =================================================================== --- graphics/diffpdf/Makefile +++ graphics/diffpdf/Makefile @@ -11,7 +11,8 @@ LICENSE= GPLv2+ -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 +IGNORE= Depends on no longer shipped graphics/poppler-qt4 +#LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 USES= compiler:c++11-lang qmake qt:4 USE_QT= qmake_build moc_build rcc_build uic_build linguist_build Index: graphics/inkscape/files/patch-archgit_10e8ae0 =================================================================== --- /dev/null +++ graphics/inkscape/files/patch-archgit_10e8ae0 @@ -0,0 +1,32 @@ +https://git.archlinux.org/svntogit/packages.git/plain/trunk/poppler-0.65.0.patch?h=packages/inkscape + +From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 721524e10a..a3aa3213a1 100644 +--- src/extension/internal/pdfinput/pdf-parser.cpp ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +-- +2.18.0 + + Index: graphics/okular-kde4/Makefile =================================================================== --- graphics/okular-kde4/Makefile +++ graphics/okular-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -15,7 +15,6 @@ libkscreen.so:graphics/libkscreen \ libqca.so:devel/qca@qt4 \ libtiff.so:graphics/tiff \ - libpoppler-qt4.so:graphics/poppler-qt4 \ libspectre.so:print/libspectre \ libchm.so:misc/chmlib \ libfreetype.so:print/freetype2 \ Index: graphics/okular-kde4/pkg-plist =================================================================== --- graphics/okular-kde4/pkg-plist +++ graphics/okular-kde4/pkg-plist @@ -44,7 +44,6 @@ lib/kde4/okularGenerator_mobi.so lib/kde4/okularGenerator_ooo.so lib/kde4/okularGenerator_plucker.so -lib/kde4/okularGenerator_poppler.so lib/kde4/okularGenerator_tiff.so lib/kde4/okularGenerator_txt.so lib/kde4/okularGenerator_xps.so @@ -63,7 +62,6 @@ share/applications/kde4/active-documentviewer_ghostview.desktop share/applications/kde4/active-documentviewer_kimgio.desktop share/applications/kde4/active-documentviewer_ooo.desktop -share/applications/kde4/active-documentviewer_pdf.desktop share/applications/kde4/active-documentviewer_plucker.desktop share/applications/kde4/active-documentviewer_tiff.desktop share/applications/kde4/active-documentviewer_txt.desktop @@ -80,7 +78,6 @@ share/applications/kde4/okularApplication_kimgio.desktop share/applications/kde4/okularApplication_mobi.desktop share/applications/kde4/okularApplication_ooo.desktop -share/applications/kde4/okularApplication_pdf.desktop share/applications/kde4/okularApplication_plucker.desktop share/applications/kde4/okularApplication_tiff.desktop share/applications/kde4/okularApplication_txt.desktop @@ -125,7 +122,6 @@ share/config.kcfg/gssettings.kcfg share/config.kcfg/okular.kcfg share/config.kcfg/okular_core.kcfg -share/config.kcfg/pdfsettings.kcfg share/doc/HTML/en/okular/annotation-properties.png share/doc/HTML/en/okular/annotations.png share/doc/HTML/en/okular/bookmark-management.png @@ -174,7 +170,6 @@ share/kde4/services/libokularGenerator_mobi.desktop share/kde4/services/libokularGenerator_ooo.desktop share/kde4/services/libokularGenerator_plucker.desktop -share/kde4/services/libokularGenerator_poppler.desktop share/kde4/services/libokularGenerator_tiff.desktop share/kde4/services/libokularGenerator_txt.desktop share/kde4/services/libokularGenerator_xps.desktop @@ -191,7 +186,6 @@ share/kde4/services/okularMobi.desktop share/kde4/services/okularOoo.desktop share/kde4/services/okularPlucker.desktop -share/kde4/services/okularPoppler.desktop share/kde4/services/okularTiff.desktop share/kde4/services/okularTxt.desktop share/kde4/services/okularXps.desktop Index: graphics/poppler-glib/Makefile =================================================================== --- graphics/poppler-glib/Makefile +++ graphics/poppler-glib/Makefile @@ -2,17 +2,11 @@ # $FreeBSD$ PORTREVISION= 0 -PKGNAMESUFFIX= -glib -MAINTAINER= gnome@FreeBSD.org COMMENT= GLib bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= glib +_SLAVE_PORT= glib PLIST= ${.CURDIR}/pkg-plist - -pre-build: - @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} libpoppler-cairo.la .include "${MASTERDIR}/Makefile" Index: graphics/poppler-qt4/Makefile =================================================================== --- graphics/poppler-qt4/Makefile +++ graphics/poppler-qt4/Makefile @@ -1,14 +0,0 @@ -# Created by: Michael Johnson -# $FreeBSD$ - -PORTREVISION= 1 -PKGNAMESUFFIX= -qt4 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Qt 4 bindings to poppler - -MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= qt4 -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: graphics/poppler-qt4/pkg-plist =================================================================== --- graphics/poppler-qt4/pkg-plist +++ graphics/poppler-qt4/pkg-plist @@ -1,13 +0,0 @@ -include/poppler/qt4/poppler-annotation.h -include/poppler/qt4/poppler-export.h -include/poppler/qt4/poppler-form.h -include/poppler/qt4/poppler-link.h -include/poppler/qt4/poppler-link-private.h -include/poppler/qt4/poppler-media.h -include/poppler/qt4/poppler-optcontent.h -include/poppler/qt4/poppler-page-transition.h -include/poppler/qt4/poppler-qt4.h -lib/libpoppler-qt4.so -lib/libpoppler-qt4.so.4 -lib/libpoppler-qt4.so.4.11.0 -libdata/pkgconfig/poppler-qt4.pc Index: graphics/poppler-qt5/Makefile =================================================================== --- graphics/poppler-qt5/Makefile +++ graphics/poppler-qt5/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 -MAINTAINER= gnome@FreeBSD.org COMMENT= Qt 5 bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= qt5 +_SLAVE_PORT= qt5 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: graphics/poppler-qt5/pkg-plist =================================================================== --- graphics/poppler-qt5/pkg-plist +++ graphics/poppler-qt5/pkg-plist @@ -2,12 +2,11 @@ include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.h include/poppler/qt5/poppler-link.h -include/poppler/qt5/poppler-link-private.h include/poppler/qt5/poppler-media.h include/poppler/qt5/poppler-optcontent.h include/poppler/qt5/poppler-page-transition.h include/poppler/qt5/poppler-qt5.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.10.0 +lib/libpoppler-qt5.so.1.16.0 libdata/pkgconfig/poppler-qt5.pc Index: graphics/poppler-utils/Makefile =================================================================== --- graphics/poppler-utils/Makefile +++ graphics/poppler-utils/Makefile @@ -1,14 +1,12 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 1 -PKGNAMESUFFIX= -utils +PORTREVISION= 0 -MAINTAINER= gnome@FreeBSD.org -COMMENT= Poppler's xpdf-workalike command line utilities +COMMENT= Poppler's xpdf-workalike command line utilities # ' MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= utils +_SLAVE_PORT= utils PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Index: graphics/poppler/Makefile =================================================================== --- graphics/poppler/Makefile +++ graphics/poppler/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -PORTVERSION= 0.57.0 -PORTREVISION= 1 +DISTVERSION= 0.69.0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -13,133 +12,86 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ - libfontconfig.so:x11-fonts/fontconfig \ +LIB_DEPENDS= libnspr4.so:devel/nspr \ + libcairo.so:graphics/cairo \ liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png \ + libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ - libnspr4.so:devel/nspr + libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= poppler-data>0:graphics/poppler-data -USES= compiler:c++11-lang cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz +USES= compiler:c++11-lang cpe cmake jpeg libtool localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= libxml2 -GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-zlib \ - --enable-xpdf-headers \ - --disable-libnss \ - --disable-gtk-test \ - --without-html-dir \ - --disable-static \ - --enable-libnss +CMAKE_ON= ENABLE_LIBJPEG \ + ENABLE_LIBPNG \ + ENABLE_LIBTIFF \ + ENABLE_XPDF_HEADERS \ + ENABLE_ZLIB \ + ENABLE_NSS \ + ENABLE_SPLASH -INSTALL_TARGET= install-strip -.if !defined(SLAVEPORT) -PORTSCOUT= limitw:1,even +# Slave ports. +_POPPLER_SLAVES= library glib qt5 utils +_SLAVE_PORT?= library -OPTIONS_DEFINE= CAIRO CURL OPENJPEG -OPTIONS_DEFAULT=CAIRO OPENJPEG +# Activate the wanted module, and deactivate the others. +CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu} +CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} +.if ${_SLAVE_PORT} == library +PORTSCOUT= limitw:1,even USES+= iconv -.endif +CMAKE_ON+= ENABLE_CPP -.include - -.if defined(SLAVEPORT) -PORTSCOUT= ignore:1 -LIB_DEPENDS+= libpoppler.so:graphics/poppler - -.if ${SLAVEPORT}==glib -CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes -USE_GNOME+= cairo glib20 introspection:build -BUILD_WRKSRC= ${WRKSRC}/glib -INSTALL_WRKSRC= ${WRKSRC}/glib +OPTIONS_DEFINE= CURL OPENJPEG +OPTIONS_DEFAULT= OPENJPEG +OPTIONS_SUB= yes .else -CONFIGURE_ARGS+=--disable-poppler-glib -.endif +PORTSCOUT= ignore:1 -.if ${SLAVEPORT}==qt4 -CONFIGURE_ARGS+=--enable-poppler-qt4 -CONFIGURE_ENV+= MOCQT4=${MOC} -USES+= qt:4 -USE_QT= gui corelib xml qtestlib moc_build -BUILD_WRKSRC= ${WRKSRC}/qt4 -INSTALL_WRKSRC= ${WRKSRC}/qt4 -.else -CONFIGURE_ARGS+=--disable-poppler-qt4 -.endif +LIB_DEPENDS+= libpoppler.so:graphics/poppler +PKGNAMESUFFIX= -${_SLAVE_PORT} -.if ${SLAVEPORT}==qt5 -CONFIGURE_ARGS+=--enable-poppler-qt5 -CONFIGURE_ENV+= MOCQT5=${MOC} -USES+= qt:5 -USE_QT= core gui widgets xml buildtools_build testlib_build -# Qt from 5.7.0 on requires c++11. -USE_CXXSTD= c++11 -BUILD_WRKSRC= ${WRKSRC}/qt5 -INSTALL_WRKSRC= ${WRKSRC}/qt5 -.else -CONFIGURE_ARGS+=--disable-poppler-qt5 -.endif +BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} +INSTALL_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} -.if ${SLAVEPORT}==utils -LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib -CONFIGURE_ARGS+=--enable-utils -BUILD_WRKSRC= ${WRKSRC}/utils -INSTALL_WRKSRC= ${WRKSRC}/utils -.else -CONFIGURE_ARGS+=--disable-utils -.endif +CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ + -DENABLE_LIBCURL:BOOL=FALSE -.else # ! SLAVE options below -CONFIGURE_ARGS+=--disable-poppler-glib \ - --disable-poppler-qt4 \ - --disable-poppler-qt5 \ - --disable-utils +. if ${_SLAVE_PORT} == glib +USES+= gnome +USE_GNOME+= cairo glib20 introspection:Build +. elif ${_SLAVE_PORT} == qt5 +USES+= qt:5 +USE_QT= core gui widgets xml \ + buildtools_build qmake_build testlib_build +. elif ${_SLAVE_PORT} == utils +LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib +USES+= gnome +USE_GNOME+= cairo +. endif -.if ${PORT_OPTIONS:MCAIRO} -LIB_DEPENDS+= libcairo.so:graphics/cairo -PLIST_SUB+= CAIRO="" -.else -CONFIGURE_ARGS+=--disable-cairo-output -PLIST_SUB+= CAIRO="@comment " .endif -.if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= libcurl.so:ftp/curl -CONFIGURE_ARGS+=--enable-libcurl -PLIST_SUB+= CURL="" -.else -CONFIGURE_ARGS+=--disable-libcurl -PLIST_SUB+= CURL="@comment " -.endif +CURL_CMAKE_BOOL= ENABLE_LIBCURL +CURL_LIB_DEPENDS= libcurl.so:ftp/curl -.if ${PORT_OPTIONS:MOPENJPEG} -CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2 -LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg -.else -CONFIGURE_ARGS+=--enable-libopenjpeg=none -.endif -.endif # end of options +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2" +OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" -post-patch: - @${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure - post-install: -.if defined(SLAVEPORT) -. if ${SLAVEPORT}==glib +.if ${_SLAVE_PORT} == glib ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. elif ${SLAVEPORT}==qt4 - ${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. elif ${SLAVEPORT}==qt5 +.elif ${_SLAVE_PORT} == qt5 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. endif .endif .include Index: graphics/poppler/distinfo =================================================================== --- graphics/poppler/distinfo +++ graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503426409 -SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 -SIZE (poppler-0.57.0.tar.xz) = 1703300 +TIMESTAMP = 1538899223 +SHA256 (poppler-0.69.0.tar.xz) = 637ff943f805f304ff1da77ba2e7f1cbd675f474941fd8ae1e0fc01a5b45a3f9 +SIZE (poppler-0.69.0.tar.xz) = 1472276 Index: graphics/poppler/files/patch-CMakeLists.txt =================================================================== --- /dev/null +++ graphics/poppler/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2018-10-07 08:06:59 UTC ++++ CMakeLists.txt +@@ -263,6 +263,7 @@ endif() + + if (NSS3_FOUND) + add_definitions(${NSS3_CFLAGS}) ++ link_directories(${NSS3_LIBRARY_DIRS}) + set(ENABLE_NSS3 ON) + endif() + if(JPEG_FOUND) Index: graphics/poppler/files/patch-configure =================================================================== --- graphics/poppler/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2016-07-24 22:14:28 UTC -+++ configure -@@ -20556,7 +20556,7 @@ fi - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" --ac_save_LIBS="$LDFLAGS" -+ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS" - LIBS="$LIBS $LIBTIFF_LIBS" -@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then : - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext Index: graphics/poppler/files/patch-glib_Makefile.in =================================================================== --- graphics/poppler/files/patch-glib_Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ ---- glib/Makefile.in.orig 2015-01-19 11:51:06.175898921 +0100 -+++ glib/Makefile.in 2015-01-19 11:51:27.026898915 +0100 -@@ -134,7 +134,6 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__objects_1 = libpoppler_glib_la-poppler-enums.lo -@@ -553,7 +552,7 @@ - $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) -@@ -576,7 +575,7 @@ - @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS) - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0 - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) --@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la -+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files) - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib Index: graphics/poppler/files/patch-glib_demo_Makefile.in =================================================================== --- graphics/poppler/files/patch-glib_demo_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/demo/Makefile.in.orig 2012-06-13 13:31:37.000000000 +0200 -+++ glib/demo/Makefile.in 2012-06-13 13:32:45.000000000 +0200 -@@ -66,7 +66,7 @@ - am__DEPENDENCIES_1 = - poppler_glib_demo_DEPENDENCIES = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent -@@ -365,7 +365,7 @@ - - LDADD = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(GTK_TEST_LIBS) - - all: all-am Index: graphics/poppler/files/patch-qt4_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt4_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- qt4/Makefile.in.orig 2008-03-24 08:30:49.000000000 -0400 -+++ qt4/Makefile.in 2008-03-24 08:30:34.000000000 -0400 -@@ -223,7 +223,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: Index: graphics/poppler/files/patch-qt4_src_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt4_src_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- qt4/src/Makefile.in.orig 2013-12-02 18:58:51.000000000 +0100 -+++ qt4/src/Makefile.in 2013-12-02 18:59:39.000000000 +0100 -@@ -129,7 +129,7 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \ - libpoppler_qt4_la-poppler-page.lo \ - libpoppler_qt4_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ - -Dpoppler_qt4_EXPORTS - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@ Index: graphics/poppler/files/patch-qt5_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt5_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- qt5/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/Makefile.in -@@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: Index: graphics/poppler/files/patch-qt5_src_Makefile.in =================================================================== --- graphics/poppler/files/patch-qt5_src_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- qt5/src/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/src/Makefile.in -@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt5_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ - libpoppler_qt5_la-poppler-page.lo \ - libpoppler_qt5_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ - -Dpoppler_qt5_EXPORTS -fPIC - - libpoppler_qt5_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT5_LIBS) - - libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@ Index: graphics/poppler/files/patch-qt5_src_poppler-form.h =================================================================== --- graphics/poppler/files/patch-qt5_src_poppler-form.h +++ /dev/null @@ -1,10 +0,0 @@ ---- qt5/src/poppler-form.h.orig 2017-07-02 21:00:50 UTC -+++ qt5/src/poppler-form.h -@@ -26,6 +26,7 @@ - #include - #include - #include "poppler-export.h" -+#include // time_t - - class Page; - class FormWidget; Index: graphics/poppler/files/patch-utils_Makefile.in =================================================================== --- graphics/poppler/files/patch-utils_Makefile.in +++ /dev/null @@ -1,111 +0,0 @@ ---- utils/Makefile.in.orig 2016-03-16 22:22:14 UTC -+++ utils/Makefile.in -@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS) - am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) - pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) - pdfdetach_LDADD = $(LDADD) --pdfdetach_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfdetach_DEPENDENCIES = libparseargs.la - am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) - pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) - pdffonts_LDADD = $(LDADD) --pdffonts_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdffonts_DEPENDENCIES = libparseargs.la - am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) - pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfimages_DEPENDENCIES = libparseargs.la - am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) - pdfinfo_LDADD = $(LDADD) --pdfinfo_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfinfo_DEPENDENCIES = libparseargs.la - am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) - pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) - pdfseparate_LDADD = $(LDADD) --pdfseparate_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfseparate_DEPENDENCIES = libparseargs.la - am_pdfsig_OBJECTS = pdfsig.$(OBJEXT) - pdfsig_OBJECTS = $(am_pdfsig_OBJECTS) - pdfsig_LDADD = $(LDADD) --pdfsig_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfsig_DEPENDENCIES = libparseargs.la - am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ - pdftocairo-pdftocairo-win32.$(OBJEXT) - pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --am__DEPENDENCIES_1 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+am__DEPENDENCIES_1 = libparseargs.la - am__DEPENDENCIES_2 = - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) - am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) --pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ -+pdftocairo_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ - $(am__DEPENDENCIES_2) - am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ -@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht - pdftohtml-HtmlOutputDev.$(OBJEXT) - pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) - pdftohtml_LDADD = $(LDADD) --pdftohtml_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftohtml_DEPENDENCIES = libparseargs.la - pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) - pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) - pdftoppm_LDADD = $(LDADD) --pdftoppm_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftoppm_DEPENDENCIES = libparseargs.la - am_pdftops_OBJECTS = pdftops.$(OBJEXT) - pdftops_OBJECTS = $(am_pdftops_OBJECTS) - pdftops_LDADD = $(LDADD) --pdftops_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftops_DEPENDENCIES = libparseargs.la - am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) - pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) - pdftotext_LDADD = $(LDADD) --pdftotext_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftotext_DEPENDENCIES = libparseargs.la - am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) - pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) - pdfunite_LDADD = $(LDADD) --pdfunite_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfunite_DEPENDENCIES = libparseargs.la - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -549,7 +537,7 @@ AM_CPPFLAGS = \ - - LDADD = \ - libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(UTILS_LIBS) - - @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ -@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \ - pdftocairo-win32.h - - pdftocairo_LDADD = \ -- $(top_builddir)/poppler/libpoppler-cairo.la \ -+ -lpoppler-glib \ - $(LDADD) \ - $(PDFTOCAIRO_LIBS) \ - $(PTHREAD_LIBS) Index: graphics/poppler/pkg-plist =================================================================== --- graphics/poppler/pkg-plist +++ graphics/poppler/pkg-plist @@ -28,6 +28,8 @@ include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h +%%OPENJPEG%%include/poppler/JPEG2000Stream.h +%%NO_OPENJPEG%%include/poppler/JPXStream.h include/poppler/Lexer.h include/poppler/Linearization.h include/poppler/Link.h @@ -54,8 +56,6 @@ include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h -include/poppler/SignatureHandler.h -include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/StdinCachedFile.h @@ -66,11 +66,11 @@ include/poppler/StructTreeRoot.h include/poppler/TextOutputDev.h include/poppler/UTF.h -include/poppler/UTF8.h include/poppler/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h +include/poppler/UnicodeMapFuncs.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/ViewerPreferences.h @@ -94,7 +94,7 @@ include/poppler/fofi/FoFiType1.h include/poppler/fofi/FoFiType1C.h include/poppler/goo/FixedPoint.h -include/poppler/goo/GooHash.h +include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h include/poppler/goo/GooList.h include/poppler/goo/GooMutex.h @@ -102,9 +102,9 @@ include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h -include/poppler/goo/NetPBMWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h +include/poppler/goo/gdir.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/grandom.h @@ -128,19 +128,16 @@ include/poppler/splash/SplashPattern.h include/poppler/splash/SplashScreen.h include/poppler/splash/SplashState.h -include/poppler/splash/SplashT1Font.h -include/poppler/splash/SplashT1FontEngine.h -include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 -lib/libpoppler-cpp.so.0.3.0 +lib/libpoppler-cpp.so.0.5.0 lib/libpoppler.so -lib/libpoppler.so.68 -lib/libpoppler.so.68.0.0 -%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc +lib/libpoppler.so.80 +lib/libpoppler.so.80.0.0 +libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc Index: graphics/py-poppler-qt4/Makefile =================================================================== --- graphics/py-poppler-qt4/Makefile +++ graphics/py-poppler-qt4/Makefile @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= poppler-qt4 -PORTVERSION= 0.18.1 -PORTREVISION= 10 -CATEGORIES= graphics python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= python-${PORTNAME}-${PORTVERSION} - -MAINTAINER= martin.dieringer@gmx.de -COMMENT= Python bindings for the Poppler-Qt4 PDF rendering library - -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual - -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 - -USES= compiler:c++11-lang pkgconfig pyqt:4 python -USE_PYQT= gui xml sip_build -USE_PYTHON= distutils autoplist - -.include Index: graphics/py-poppler-qt4/distinfo =================================================================== --- graphics/py-poppler-qt4/distinfo +++ graphics/py-poppler-qt4/distinfo @@ -1,2 +0,0 @@ -SHA256 (python-poppler-qt4-0.18.1.tar.gz) = 00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c -SIZE (python-poppler-qt4-0.18.1.tar.gz) = 15523 Index: graphics/py-poppler-qt4/files/patch-types.sip =================================================================== --- graphics/py-poppler-qt4/files/patch-types.sip +++ graphics/py-poppler-qt4/files/patch-types.sip @@ -1,16 +0,0 @@ -PyList_SET_ITEM() is supposed to be void, but as a macro it's an -expression and has a pointer value. Clang 4.0 trips on the bogus -pointer comparison; given the comparison, it should be PyList_SetItem() -which returns -1 on failure. - ---- types.sip.orig 2017-01-21 07:19:29 UTC -+++ types.sip -@@ -27,7 +27,7 @@ - foreach (Poppler::Document::RenderBackend value, set) - { - PyObject *obj = PyLong_FromLong ((long) value); -- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) -+ if (obj == NULL || PyList_SetItem (l, i, obj) < 0) - { - Py_DECREF(l); - Index: graphics/py-poppler-qt4/pkg-descr =================================================================== --- graphics/py-poppler-qt4/pkg-descr +++ graphics/py-poppler-qt4/pkg-descr @@ -1,3 +0,0 @@ -Python bindings for graphics/poppler-qt4. - -WWW: https://pypi.org/project/python-poppler-qt4/ Index: misc/tellico-kde4/Makefile =================================================================== --- misc/tellico-kde4/Makefile +++ misc/tellico-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico PORTVERSION= 2.3.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ @@ -18,7 +18,6 @@ LIB_DEPENDS= libexempi.so:textproc/exempi \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ - libpoppler-qt4.so:graphics/poppler-qt4 \ libqjson.so:devel/qjson@qt4 \ libtag.so:audio/taglib \ libyaz.so:net/yaz Index: print/cups-filters/files/patch-git_6b0747c =================================================================== --- /dev/null +++ print/cups-filters/files/patch-git_6b0747c @@ -0,0 +1,76 @@ +From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001 +From: Olivier Schonken +Date: Fri, 5 Oct 2018 12:05:31 +0200 +Subject: [PATCH] Poppler removed memCheck and gMemReport functions + +Only use gMemReport and memCheck functions if poppler version less +than 0.69.0 + +The poppler project removed the memCheck and gMemReport functions in +commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM +from Object since this uses RAII now and hence cannot leak. +(The existing tracking also is not thread-safe and hence unreliable.) + +and + +f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging +from gmem since external tools and compiler instrumentation achieve the +same effect. + +This commit solves https://github.com/OpenPrinting/cups-filters/issues/62 + +Signed-off-by: Olivier Schonken +--- + filter/pdftoijs.cxx | 2 ++ + filter/pdftoopvp/pdftoopvp.cxx | 2 ++ + filter/pdftoraster.cxx | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx +index 22bc33f4..dd6b6fa0 100644 +--- filter/pdftoijs.cxx ++++ filter/pdftoijs.cxx +@@ -503,9 +503,11 @@ int main(int argc, char *argv[]) { + ppdClose(ppd); + free(outputfile); + ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 + // Check for memory leaks + Object::memCheck(stderr); + gMemReport(stderr); ++#endif + + return exitCode; + } +diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx +index 024941ab..bf25983b 100644 +--- filter/pdftoopvp/pdftoopvp.cxx ++++ filter/pdftoopvp/pdftoopvp.cxx +@@ -763,9 +763,11 @@ fprintf(stderr,"JobInfo=%s\n",jobInfo); + err0: + delete globalParams; + ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 + // check for memory leaks + Object::memCheck(stderr); + gMemReport(stderr); ++#endif + + } + /* muntrace(); */ +diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx +index 0c63ab8d..4ebf02b0 100644 +--- filter/pdftoraster.cxx ++++ filter/pdftoraster.cxx +@@ -2162,9 +2162,11 @@ int main(int argc, char *argv[]) { + cmsDeleteTransform(colorTransform); + } + ++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 + // Check for memory leaks + Object::memCheck(stderr); + gMemReport(stderr); ++#endif + + return exitCode; + } Index: print/qpdfview/Makefile =================================================================== --- print/qpdfview/Makefile +++ print/qpdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpdfview DISTVERSION= 0.4.17beta1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/294276875/ \ https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/ @@ -14,19 +14,20 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake +LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 + +USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5 USE_LDCONFIG= yes +USE_QT= buildtools_build concurrent imageformats linguisttools printsupport sql sql-sqlite3 svg xml QMAKE_SOURCE_PATH= ${PORTNAME}.pro DATADIR= ${PREFIX}/share/${PORTNAME} -OPTIONS_SINGLE= TOOLKITS -OPTIONS_SINGLE_TOOLKITS= QT4 QT5 OPTIONS_DEFINE= CUPS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= DJVU PS BACKEND_DESC= Additional documents support -OPTIONS_DEFAULT= QT4 CUPS PS +OPTIONS_DEFAULT= CUPS PS OPTIONS_SUB= yes CUPS_QMAKE_OFF= "CONFIG+=without_cups" @@ -34,14 +35,6 @@ DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre DJVU_QMAKE_OFF= "CONFIG+=without_djvu" - -QT4_USES= qt:4 -QT4_USE= qt=dbus,gui,imageformats,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml -QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 - -QT5_USES= qt:5 -QT5_USE= qt=buildtools_build,concurrent,imageformats,linguisttools,printsupport,sql,sql-sqlite3,svg,xml -QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 PS_LIB_DEPENDS= libspectre.so:print/libspectre PS_QMAKE_OFF= "CONFIG+=without_ps" Index: sysutils/kfilemetadata-kde4/Makefile =================================================================== --- sysutils/kfilemetadata-kde4/Makefile +++ sysutils/kfilemetadata-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kfilemetadata PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -11,8 +11,7 @@ DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libtag.so:audio/taglib \ +LIB_DEPENDS= libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ Index: sysutils/kfilemetadata-kde4/pkg-plist =================================================================== --- sysutils/kfilemetadata-kde4/pkg-plist +++ sysutils/kfilemetadata-kde4/pkg-plist @@ -17,7 +17,6 @@ lib/kde4/kfilemetadata_office2007extractor.so lib/kde4/kfilemetadata_officeextractor.so lib/kde4/kfilemetadata_plaintextextractor.so -lib/kde4/kfilemetadata_popplerextractor.so lib/kde4/kfilemetadata_taglibextractor.so lib/libkfilemetadata.so lib/libkfilemetadata.so.4 @@ -30,6 +29,5 @@ share/kde4/services/kfilemetadata_office2007extractor.desktop share/kde4/services/kfilemetadata_officeextractor.desktop share/kde4/services/kfilemetadata_plaintextextractor.desktop -share/kde4/services/kfilemetadata_popplerextractor.desktop share/kde4/services/kfilemetadata_taglibextractor.desktop share/kde4/servicetypes/kfilemetadataextractor.desktop Index: sysutils/nepomuk-core-kde4/Makefile =================================================================== --- sysutils/nepomuk-core-kde4/Makefile +++ sysutils/nepomuk-core-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= nepomuk-core PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -12,8 +12,7 @@ DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libtag.so:audio/taglib \ +LIB_DEPENDS= libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ Index: sysutils/nepomuk-core-kde4/pkg-plist =================================================================== --- sysutils/nepomuk-core-kde4/pkg-plist +++ sysutils/nepomuk-core-kde4/pkg-plist @@ -129,7 +129,6 @@ lib/kde4/nepomukoffice2007extractor.so lib/kde4/nepomukofficeextractor.so lib/kde4/nepomukplaintextextractor.so -lib/kde4/nepomukpopplerextractor.so lib/kde4/nepomuktaglibextractor.so lib/libkdeinit4_nepomukserver.so lib/libnepomukcleaner.so @@ -173,7 +172,6 @@ share/kde4/services/nepomukofficeextractor.desktop share/kde4/services/nepomukontologyloader.desktop share/kde4/services/nepomukplaintextextractor.desktop -share/kde4/services/nepomukpopplerextractor.desktop share/kde4/services/nepomukqueryservice.desktop share/kde4/services/nepomukremovablestorageservice.desktop share/kde4/services/nepomukstorage.desktop Index: x11/leechcraft/Makefile =================================================================== --- x11/leechcraft/Makefile +++ x11/leechcraft/Makefile @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 35 +PORTREVISION= 36 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ @@ -36,7 +36,7 @@ ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \ HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \ LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \ - MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ + MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \ ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \ TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \ @@ -222,12 +222,6 @@ MELLONETRAY_CMAKE_OFF= -DENABLE_MELLONETRAY:BOOL=false MELLONETRAY_USE= xorg=xdamage -MONOCLE_DESC= Monocle, the modular document viewer -MONOCLE_CMAKE_ON= -DENABLE_MONOCLE:BOOL=true -MONOCLE_CMAKE_OFF= -DENABLE_MONOCLE:BOOL=false -MONOCLE_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ - libpoppler-qt4.so:graphics/poppler-qt4 - MUSICZOMBIE_DESC= MusicBrainz client plugin MUSICZOMBIE_CMAKE_ON= -DENABLE_MUSICZOMBIE:BOOL=true MUSICZOMBIE_CMAKE_OFF= -DENABLE_MUSICZOMBIE:BOOL=false @@ -360,7 +354,7 @@ CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \ HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \ KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \ - LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ + LMP MELLONETRAY MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \ SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \ TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY