diff options
Diffstat (limited to '')
88 files changed, 382 insertions, 78 deletions
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 2a5ecf662a5e..edbed3001bef 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -2,7 +2,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.9.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/converters/pdf2djvu/files/patch-pdf-backend.cc b/converters/pdf2djvu/files/patch-pdf-backend.cc new file mode 100644 index 000000000000..7e967b6c7210 --- /dev/null +++ b/converters/pdf2djvu/files/patch-pdf-backend.cc @@ -0,0 +1,26 @@ +--- pdf-backend.cc.orig 2019-06-10 17:06:44 UTC ++++ pdf-backend.cc +@@ -103,7 +103,7 @@ static void poppler_error_handler(void *data, ErrorCat + + pdf::Environment::Environment() + { +- globalParams = new GlobalParams(); ++ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams); + setErrorCallback(poppler_error_handler, nullptr); + } + +@@ -499,12 +499,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo + void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path) + { + /* Source was copied from <poppler/SplashOutputDev.c>. */ +- pdf::gfx::Subpath *subpath; +- pdf::gfx::Path *path = state->getPath(); ++ auto path = state->getPath(); + int n_subpaths = path->getNumSubpaths(); + for (int i = 0; i < n_subpaths; i++) + { +- subpath = path->getSubpath(i); ++ auto subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) + { + double x1, y1, x2, y2, x3, y3; diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index 5b1127e7b7b1..b5e82a19faaf 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -3,6 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION} diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index b17647abae7d..4f92d54a3a6b 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,7 +3,7 @@ PORTNAME= calibre PORTVERSION= 4.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/cfiles/Makefile b/deskutils/cfiles/Makefile index 48cc92497286..0b9c1909c02f 100644 --- a/deskutils/cfiles/Makefile +++ b/deskutils/cfiles/Makefile @@ -3,6 +3,7 @@ PORTNAME= cfiles DISTVERSIONPREFIX= v DISTVERSION= 1.8 +PORTREVISION= 1 CATEGORIES= deskutils MAINTAINER= yuri@FreeBSD.org diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile index 9ac4d99b92b3..8488cc71ae0b 100644 --- a/deskutils/gourmet/Makefile +++ b/deskutils/gourmet/Makefile @@ -3,7 +3,7 @@ PORTNAME= gourmet PORTVERSION= 0.17.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils gnome MAINTAINER= rm@FreeBSD.org diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile index c1c2a9918432..cc23176eeba2 100644 --- a/deskutils/lumina-pdf/Makefile +++ b/deskutils/lumina-pdf/Makefile @@ -2,7 +2,7 @@ PORTNAME= lumina-pdf DISTVERSION= 1.5.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MAINTAINER= ken@ixsystems.com diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index 53aaacd34e7f..cd2c75981fee 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -3,7 +3,7 @@ PORTNAME= recoll DISTVERSION= 1.25.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= https://www.lesbonscomptes.com/recoll/ diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 92516ff7a0c0..e4f0d4792f7a 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -3,6 +3,7 @@ PORTNAME= tumbler PORTVERSION= 0.2.8 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE PKGNAMEPREFIX= xfce4- diff --git a/devel/efl/Makefile b/devel/efl/Makefile index cfb0cb6f9c2b..99af2a59e522 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -3,7 +3,7 @@ PORTNAME= efl DISTVERSION= 1.20.7 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment diff --git a/devel/kf5-kfilemetadata/Makefile b/devel/kf5-kfilemetadata/Makefile index ef04ad37c07f..781de67dde1b 100644 --- a/devel/kf5-kfilemetadata/Makefile +++ b/devel/kf5-kfilemetadata/Makefile @@ -2,6 +2,7 @@ PORTNAME= kfilemetadata DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 5289f7bdb5b7..cb285df07d4f 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra DISTVERSION= 3.1.0 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= editors kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/editors/calligra/files/patch-kde_pr-414795 b/editors/calligra/files/patch-kde_pr-414795 new file mode 100644 index 000000000000..2a8e252f8c2d --- /dev/null +++ b/editors/calligra/files/patch-kde_pr-414795 @@ -0,0 +1,69 @@ +Source: Timo Gurr <timo.gurr@gmail.com> +Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795 +Reason: Fix build with poppler 0.83.0 + +diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp +--- filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:41:13.000000000 +0100 ++++ filters/karbon/pdf/PdfImport.cpp 2019-12-04 12:39:03.000000000 +0100 +@@ -60,19 +60,17 @@ + } + + // read config file +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + if (! globalParams) + return KoFilter::NotImplemented; + + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); + if (! pdfDoc) { +- delete globalParams; + return KoFilter::StupidError; + } + + if (! pdfDoc->isOk()) { +- delete globalParams; + delete pdfDoc; + return KoFilter::StupidError; + } +@@ -99,7 +97,6 @@ + + delete dev; + delete pdfDoc; +- delete globalParams; + globalParams = 0; + + return KoFilter::OK; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp +--- filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.000000000 +0100 ++++ filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.000000000 +0100 +@@ -172,7 +172,7 @@ + *d->body << "/>" << endl; + } + +-QString SvgOutputDev::convertPath(GfxPath *path) ++QString SvgOutputDev::convertPath(const GfxPath *path) + { + if (! path) + return QString(); +@@ -180,7 +180,7 @@ + QString output; + + for (int i = 0; i < path->getNumSubpaths(); ++i) { +- GfxSubpath * subpath = path->getSubpath(i); ++ const GfxSubpath * subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); + int j = 1; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.h +--- filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:41:14.000000000 +0100 ++++ filters/karbon/pdf/SvgOutputDev.h 2019-12-04 12:30:41.000000000 +0100 +@@ -83,7 +83,7 @@ + /// Dumps content to svg file + void dumpContent(); + private: +- QString convertPath(GfxPath *path); ++ QString convertPath(const GfxPath *path); + QString convertMatrix(const QMatrix &matrix); + QString convertMatrix(const double * matrix); + QString printFill(); diff --git a/editors/kile/Makefile b/editors/kile/Makefile index f6f62b0386ee..7fe7fec6e8ef 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -3,7 +3,7 @@ PORTNAME= kile DISTVERSIONPREFIX= v DISTVERSION= 3.0b3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 672525ad8b43..e23a018291b3 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,5 @@ # $FreeBSD$ +PORTREVISION= 1 .include "${.CURDIR}/Makefile.common" diff --git a/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 b/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 new file mode 100644 index 000000000000..849e994dd895 --- /dev/null +++ b/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 @@ -0,0 +1,70 @@ +From 9065cd8d9a19864f6b618f2dc10daf577badd9ee Mon Sep 17 00:00:00 2001 +From: Martin Milata <martin@martinmilata.cz> +Date: Wed, 4 Dec 2019 02:37:40 +0100 +Subject: [PATCH] Fix build with poppler-0.83 + +Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 +Reviewed-on: https://gerrit.libreoffice.org/84384 +Tested-by: Jenkins +Reviewed-by: Michael Stahl <michael.stahl@cib.de> +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ + sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ + 3 files changed, 15 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 26048177e87d..e9c2a407c279 100644 +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const + gfree(pBuf); + } + ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++void PDFOutDev::printPath( const GfxPath* pPath ) ++#else + void PDFOutDev::printPath( GfxPath* pPath ) ++#endif + { + int nSubPaths = pPath ? pPath->getNumSubpaths() : 0; + for( int i=0; i<nSubPaths; i++ ) + { ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ const ++#endif + GfxSubpath* pSub = pPath->getSubpath( i ); + const int nPoints = pSub->getNumPoints(); + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 02f6b59f6f15..2e7d2186f9a1 100644 +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -149,7 +149,11 @@ namespace pdfi + + int parseFont( long long nNewId, GfxFont* pFont, GfxState* state ) const; + void writeFontFile( GfxFont* gfxFont ) const; ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ static void printPath( const GfxPath* pPath ); ++#else + static void printPath( GfxPath* pPath ); ++#endif + + public: + explicit PDFOutDev( PDFDoc* pDoc ); +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index 42178b650cdd..b1a54bd09c5f 100644 +--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -68,7 +68,11 @@ int main(int argc, char **argv) + } + + // read config file ++#if POPPLER_CHECK_VERSION(0, 83, 0) ++ globalParams = std::make_unique<GlobalParams>(); ++#else + globalParams = new GlobalParams(); ++#endif + globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index a87a2b532789..a597b6bd2acd 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index 96ca6eb5b713..a2f82cea694a 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -2,6 +2,7 @@ PORTNAME= texstudio DISTVERSION= 2.12.18 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= rigoletto@FreeBSD.org diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 6a5bef574220..c77c0643989f 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -4,7 +4,7 @@ PORTNAME= texworks DISTVERSIONPREFIX= release- DISTVERSION= 0.6.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= editors MAINTAINER= hrs@FreeBSD.org diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index a1a3ed8a282b..6fbd3d15c9ec 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -5,6 +5,7 @@ PORTNAME= atril PORTVERSION= 1.22.3 +PORTREVISION= 1 CATEGORIES= graphics print mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/graphics/diff-pdf/Makefile b/graphics/diff-pdf/Makefile index 3ab14b31b570..b5141c5d5acb 100644 --- a/graphics/diff-pdf/Makefile +++ b/graphics/diff-pdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= diff-pdf DISTVERSIONPREFIX= v DISTVERSION= 0.3-20190713 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= uzsolt@uzsolt.hu diff --git a/graphics/diffpdf/Makefile b/graphics/diffpdf/Makefile index d93d634ada5d..3ed322006954 100644 --- a/graphics/diffpdf/Makefile +++ b/graphics/diffpdf/Makefile @@ -2,7 +2,7 @@ PORTNAME= diffpdf PORTVERSION= 2.1.3 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MASTER_SITES= http://www.qtrac.eu/ diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile index a5084495e70d..ed5fec2e0c90 100644 --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= dspdfviewer PORTVERSION= 1.15.1 DISTVERSIONPREFIX= v -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= graphics MAINTAINER= fox@FreeBSD.org diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile index c3bfe51c87ab..ccfd191dce6c 100644 --- a/graphics/electrix/Makefile +++ b/graphics/electrix/Makefile @@ -2,7 +2,7 @@ PORTNAME= electrix PORTVERSION= 0.2.0 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile index 1ff6e9aa5007..793487065b05 100644 --- a/graphics/engauge-digitizer/Makefile +++ b/graphics/engauge-digitizer/Makefile @@ -3,6 +3,7 @@ PORTNAME= engauge-digitizer DISTVERSIONPREFIX= v DISTVERSION= 12.1 +PORTREVISION= 1 CATEGORIES= graphics math science MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index feae98420444..2a326f5ad025 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 24 +PORTREVISION= 25 CATEGORIES= graphics print gnome MASTER_SITES= FRUGALWARE/xapps-extra/${PORTNAME} \ ftp://ftp.slackware.com/.1/blfs/conglomeration/${PORTNAME}/ \ diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index d9cdc5b3b1d6..ee8eeb50e804 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ PORTNAME= evince PORTVERSION= 3.28.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 5c50e87d1da6..f3855d5c84f7 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 1d2d96dd14af..618dedf28498 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -3,6 +3,7 @@ PORTNAME= geeqie PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.geeqie.org/ diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 6e38644e9239..84c82b5658dd 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -3,7 +3,7 @@ PORTNAME= gegl PORTVERSION= 0.4.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GIMP diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index eb9fae8fd5f2..91de0e176ea4 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,6 +3,7 @@ PORTNAME?= gimp-app PORTVERSION= 2.10.14 +PORTREVISION= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 7f68a61d6eca..9d0fbf00ebd3 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.42.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics tk MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PORTVERSION}/ diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile index 3431e7d7a970..b8bfc81a45fc 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -3,6 +3,7 @@ PORTNAME= impressive PORTVERSION= 0.12.1 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}/Impressive/${PORTVERSION}/ DISTNAME= Impressive-${PORTVERSION} diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 23d86bd88d12..6bea2cc4dd31 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.92.4 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ @@ -94,5 +94,11 @@ post-patch: # Fix with poppler 0.73 @${REINPLACE_CMD} -E '/#include "goo\/gtypes.h"/d' \ ${WRKSRC}/src/extension/internal/pdfinput/pdf-parser.h + # Fix build with poppler 0.83 + ${REINPLACE_CMD} -e 's|(GfxPath|(const GfxPath|g' \ + -e 's|GfxSubpath|const GfxSubpath|g' \ + -e 's|new GlobalParams()|std::unique_ptr<GlobalParams>(new GlobalParams())|g' \ + -e 's|new GlobalParams(poppler_datadir)|std::unique_ptr<GlobalParams>(new GlobalParams(poppler_datadir))|g' \ + ${WRKSRC}/src/extension/internal/pdfinput/*.cpp .include <bsd.port.mk> diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 4e155235b7c7..3daca1c7e685 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -2,7 +2,7 @@ PORTNAME= krita DISTVERSION= 4.2.8.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION:R} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index a40bc5252c5e..874cfa5b337c 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -2,6 +2,7 @@ PORTNAME= okular DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile index e47a54f973a7..b9b62054e231 100644 --- a/graphics/openfx-arena/Makefile +++ b/graphics/openfx-arena/Makefile @@ -3,7 +3,7 @@ PORTNAME= openfx-arena PORTVERSION= 2.3.14 DISTVERSIONPREFIX= Natron- -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org diff --git a/graphics/openfx-arena/files/patch-Extra_ReadPDF.cpp b/graphics/openfx-arena/files/patch-Extra_ReadPDF.cpp new file mode 100644 index 000000000000..7213735c54d8 --- /dev/null +++ b/graphics/openfx-arena/files/patch-Extra_ReadPDF.cpp @@ -0,0 +1,13 @@ +Fix build with poppler 0.83 + +--- Extra/ReadPDF.cpp.orig 2020-01-18 15:54:18 UTC ++++ Extra/ReadPDF.cpp +@@ -134,7 +134,7 @@ false + if (!popplerData.empty()) { + struct stat sb; + if (stat(popplerData.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode)) { +- globalParams = new GlobalParams(popplerData.c_str()); ++ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams(popplerData.c_str())); + } + } + } diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 7ceb8de17c22..1296872205e5 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.6.4 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile index a302aed459ea..4d8da952b9d3 100644 --- a/graphics/pdf2svg/Makefile +++ b/graphics/pdf2svg/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdf2svg PORTVERSION= 0.2.3 -PORTREVISION= 12 +PORTREVISION= 13 DISTVERSIONPREFIX= v CATEGORIES= graphics diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile index d41a52f027be..ac50882de5c2 100644 --- a/graphics/pdfpc/Makefile +++ b/graphics/pdfpc/Makefile @@ -4,7 +4,7 @@ PORTNAME= pdfpc DISTVERSION= 4.3.4 CATEGORIES= graphics DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 MAINTAINER= bapt@FreeBSD.org COMMENT= Keynote-like multi-monitor presentation viewer diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile index 9530efa69cc0..962666585a16 100644 --- a/graphics/poppler-data/Makefile +++ b/graphics/poppler-data/Makefile @@ -2,7 +2,7 @@ PORTNAME= poppler-data PORTVERSION= 0.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index fc61a3effe42..13ebb1558f82 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 COMMENT= GLib bindings to poppler diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index f617c40a8d1a..686ee8cf48b0 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 COMMENT= Qt 5 bindings to poppler diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index 9657f45fa6f2..67fa87041131 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 COMMENT= Poppler's xpdf-workalike command line utilities # ' diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index f5a9ba003fc0..d05874159aa5 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -DISTVERSION= 0.82.0 -PORTREVISION?= 1 +DISTVERSION= 0.84.0 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index bfb21b5db967..5e65fa82b4ce 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1572047126 -SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df -SIZE (poppler-0.82.0.tar.xz) = 1553336 +TIMESTAMP = 1577727452 +SHA256 (poppler-0.84.0.tar.xz) = c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731 +SIZE (poppler-0.84.0.tar.xz) = 1561236 diff --git a/graphics/poppler/files/patch-CMakeLists.txt b/graphics/poppler/files/patch-CMakeLists.txt deleted file mode 100644 index 33521f482a64..000000000000 --- a/graphics/poppler/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- 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) diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 220402819e2e..3d6074597778 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -135,8 +135,8 @@ lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 lib/libpoppler-cpp.so.0.7.0 lib/libpoppler.so -lib/libpoppler.so.92 -lib/libpoppler.so.92.0.0 +lib/libpoppler.so.94 +lib/libpoppler.so.94.0.0 libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index 6fa9bc47e697..7bd608cb36fc 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -3,7 +3,7 @@ PORTNAME= pqiv PORTVERSION= 2.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MAINTAINER= danilo@FreeBSD.org diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 920bbceaf46b..dfc9468c9dd7 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= poppler PORTVERSION= 0.12.1 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= graphics python MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \ http://launchpadlibrarian.net/30270080/ \ diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index 967b13e5f5bb..70e9ca78a93a 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 0.75.0 +PORTREVISION= 1 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index f2f53f70487d..59a4969c41d8 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -3,7 +3,7 @@ PORTNAME= QComicBook PORTVERSION= 0.9.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 87665b1c2b30..ca3005f3c917 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -3,7 +3,7 @@ PORTNAME= vips PORTVERSION= 8.8.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/ diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index 8c5a1dee7927..26c057f198e6 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -3,7 +3,7 @@ PORTNAME= xournal PORTVERSION= 0.4.8.2016 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile index 3902fb61f583..3d46fee47c6c 100644 --- a/graphics/xournalpp/Makefile +++ b/graphics/xournalpp/Makefile @@ -2,6 +2,7 @@ PORTNAME= xournalpp DISTVERSION= 1.0.16 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/yacreader/Makefile b/graphics/yacreader/Makefile index 8c841e816876..6edffebfdb55 100644 --- a/graphics/yacreader/Makefile +++ b/graphics/yacreader/Makefile @@ -2,6 +2,7 @@ PORTNAME= yacreader DISTVERSION= 9.6.2 +PORTREVISION= 1 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile index 2b1143c7e648..d39094947f3d 100644 --- a/graphics/zathura-pdf-mupdf/Makefile +++ b/graphics/zathura-pdf-mupdf/Makefile @@ -3,7 +3,7 @@ PORTNAME= zathura-pdf-mupdf DISTVERSION= 0.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://pwmt.org/projects/zathura-pdf-mupdf/download/ \ http://freebsd.uzsolt.hu/src/ diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile index 7eee7746725e..3d4178e2fe27 100644 --- a/graphics/zathura-pdf-poppler/Makefile +++ b/graphics/zathura-pdf-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= zathura-pdf-poppler PORTVERSION= 0.2.9 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= https://pwmt.org/projects/zathura/plugins/download/ \ http://www.madpilot.net/~mad/pwmt.org/ diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile index 0ab1deb81d00..fd438f91f9c0 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pdf_viewer -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= PDF and PostScript viewer plugin for Claws Mail diff --git a/mail/textmail/Makefile b/mail/textmail/Makefile index cba698347f49..2e8b74df2b4b 100644 --- a/mail/textmail/Makefile +++ b/mail/textmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= textmail PORTVERSION= 20070803 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail MASTER_SITES= http://raf.org/textmail/ diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 7ebc4a6f079b..ebb77ed349ec 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -3,7 +3,7 @@ PORTNAME= labplot PORTVERSION= 2.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile index 8efb23cc1aad..b4c7cad8a20c 100644 --- a/misc/auto-multiple-choice/Makefile +++ b/misc/auto-multiple-choice/Makefile @@ -2,7 +2,7 @@ PORTNAME= auto-multiple-choice PORTVERSION= 1.3.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= misc MASTER_SITES= http://download.gna.org/auto-qcm/ DISTNAME= auto-multiple-choice_${PORTVERSION}_precomp diff --git a/misc/rubygem-rabbit/Makefile b/misc/rubygem-rabbit/Makefile index b6bc6553c57e..8edaec707cce 100644 --- a/misc/rubygem-rabbit/Makefile +++ b/misc/rubygem-rabbit/Makefile @@ -3,7 +3,7 @@ PORTNAME= rabbit PORTVERSION= 2.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc rubygems MASTER_SITES= RG diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index 3f25511de655..bdef238bbe9f 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico DISTVERSION= 3.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile index 580187e56a50..5fd9ffb852a2 100644 --- a/net/kitinerary/Makefile +++ b/net/kitinerary/Makefile @@ -2,6 +2,7 @@ PORTNAME= kitinerary DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 6720a9507c27..8b34482f82ae 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -2,6 +2,7 @@ PORTNAME= cups-filters PORTVERSION= 1.26.1 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://www.openprinting.org/download/cups-filters/ diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile index 4124bbe1d85c..0f29b5233d97 100644 --- a/print/deforaos-pdfviewer/Makefile +++ b/print/deforaos-pdfviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfviewer PORTVERSION= 0.0.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= print MASTER_SITES= http://www.defora.org/os/download/download/4431/ PKGNAMEPREFIX= deforaos- diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile index 355c416da56e..1de9fc6651db 100644 --- a/print/frescobaldi/Makefile +++ b/print/frescobaldi/Makefile @@ -4,7 +4,7 @@ PORTNAME= frescobaldi DISTVERSIONPREFIX= v DISTVERSION= 3.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print kde MAINTAINER= m.ne@gmx.net diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile index c8b41b578687..d3293aadd994 100644 --- a/print/ghostscript9-agpl-base/Makefile +++ b/print/ghostscript9-agpl-base/Makefile @@ -2,6 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.50 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/ PKGNAMESUFFIX= 9-agpl-base diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index e998b88a32a5..e1819d3c570e 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -4,7 +4,7 @@ PORTNAME= pdf-tools DISTVERSIONPREFIX= v DISTVERSION= 0.90-34 DISTVERSIONSUFFIX= -g29d9f4f -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index fa0ca4c0aba7..84a1fd2b9240 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfcube PORTVERSION= 0.0.5 -PORTREVISION= 33 +PORTREVISION= 34 CATEGORIES= print MASTER_SITES= http://code.100allora.it/releases/pdfcube/ diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index 4d2bd1d210ee..2d8d09e271d0 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpdfview DISTVERSION= 0.4.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/294276875/ \ https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/ diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 7c359475b67c..60639b7e767e 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.5.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp new file mode 100644 index 000000000000..f9309530fe67 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp @@ -0,0 +1,65 @@ +--- scribus/plugins/import/pdf/importpdf.cpp.orig 2020-01-18 17:59:00 UTC ++++ scribus/plugins/import/pdf/importpdf.cpp +@@ -75,7 +75,7 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) + QImage PdfPlug::readThumbnail(const QString& fName) + { + QString pdfFile = QDir::toNativeSeparators(fName); +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + if (globalParams) + { + #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) +@@ -90,7 +90,6 @@ QImage PdfPlug::readThumbnail(const QString& fName) + if (pdfDoc->getErrorCode() == errEncrypted) + { + delete pdfDoc; +- delete globalParams; + return QImage(); + } + if (pdfDoc->isOk()) +@@ -134,11 +133,9 @@ QImage PdfPlug::readThumbnail(const QString& fName) + image.setText("YSize", QString("%1").arg(h)); + delete dev; + delete pdfDoc; +- delete globalParams; + return image; + } + delete pdfDoc; +- delete globalParams; + } + } + return QImage(); +@@ -387,7 +384,7 @@ bool PdfPlug::convert(const QString& fn) + qApp->processEvents(); + } + +- globalParams = new GlobalParams(); ++ globalParams.reset(new GlobalParams()); + GooString *userPW = nullptr; + if (globalParams) + { +@@ -429,7 +426,6 @@ bool PdfPlug::convert(const QString& fn) + if (progressDialog) + progressDialog->close(); + delete pdfDoc; +- delete globalParams; + return false; + } + if (progressDialog) +@@ -474,7 +470,6 @@ bool PdfPlug::convert(const QString& fn) + progressDialog->close(); + delete optImp; + delete pdfDoc; +- delete globalParams; + return false; + } + pageString = optImp->getPagesString(); +@@ -908,7 +903,7 @@ bool PdfPlug::convert(const QString& fn) + } + delete pdfDoc; + } +- delete globalParams; ++ globalParams.release(); + globalParams = nullptr; + + // qDebug() << "converting finished"; diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp index 8f4f7d06a446..d73ea82f4885 100644 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp @@ -1,6 +1,24 @@ ---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-10-27 16:14:24 UTC +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2020-01-18 17:22:17 UTC +++ scribus/plugins/import/pdf/slaoutput.cpp -@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob +@@ -1224,16 +1224,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, + catalog = catA; + pdfDoc = doc; + updateGUICounter = 0; +- m_fontEngine = new SplashFontEngine( +-#if HAVE_T1LIB_H +- globalParams->getEnableT1lib(), +-#endif +-#if HAVE_FREETYPE_H +- globalParams->getEnableFreeType(), +- true, +- true, +-#endif +- true); ++ m_fontEngine = new SplashFontEngine(true, true, true, true); + } + + void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) +@@ -2784,7 +2775,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob delete[] mbuffer; } @@ -9,7 +27,7 @@ { ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; -@@ -3365,7 +3365,7 @@ err1: +@@ -3365,7 +3356,7 @@ err1: fontsrc->unref(); } @@ -18,7 +36,7 @@ { double x1, y1, x2, y2; int render; -@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, +@@ -3452,7 +3443,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, } } @@ -27,3 +45,21 @@ { // qDebug() << "beginType3Char"; GfxFont *gfxFont; +@@ -3705,7 +3696,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo + return fNam; + } + +-QString SlaOutputDev::convertPath(GfxPath *path) ++QString SlaOutputDev::convertPath(const GfxPath *path) + { + if (! path) + return QString(); +@@ -3715,7 +3706,7 @@ QString SlaOutputDev::convertPath(GfxPath *path) + + for (int i = 0; i < path->getNumSubpaths(); ++i) + { +- GfxSubpath * subpath = path->getSubpath(i); ++ const GfxSubpath * subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) + { + output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h index 46128ebe8f14..849403c1d0c3 100644 --- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h @@ -1,4 +1,4 @@ ---- scribus/plugins/import/pdf/slaoutput.h.orig 2019-10-27 16:12:47 UTC +--- scribus/plugins/import/pdf/slaoutput.h.orig 2020-01-18 17:22:17 UTC +++ scribus/plugins/import/pdf/slaoutput.h @@ -229,7 +229,7 @@ class SlaOutputDev : public OutputDev (public) @@ -20,3 +20,12 @@ void endType3Char(GfxState * /*state*/) override; void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; +@@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev (public) + void getPenState(GfxState *state); + QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); + QString getAnnotationColor(const AnnotColor *color); +- QString convertPath(GfxPath *path); ++ QString convertPath(const GfxPath *path); + int getBlendMode(GfxState *state); + void applyMask(PageItem *ite); + void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index 094096bb8440..1c6038bc7a6c 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -2,7 +2,7 @@ PORTNAME= luatex PORTVERSION= 0.80.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile index 0e55507ee6b2..53b71f20294d 100644 --- a/print/tex-xetex/Makefile +++ b/print/tex-xetex/Makefile @@ -2,7 +2,7 @@ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 26 +PORTREVISION= 27 CATEGORIES= print MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ PKGNAMEPREFIX= tex- diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 1bcb5d20e3d1..87b72119bb41 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 43 +PORTREVISION= 44 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile index c05f589e567f..b567491db275 100644 --- a/sysutils/tracker-miners/Makefile +++ b/sysutils/tracker-miners/Makefile @@ -3,7 +3,7 @@ PORTNAME= tracker-miners PORTVERSION= 2.0.5 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 638fc8ac38a0..12bec7af5178 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfgrep PORTVERSION= 2.1.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc MASTER_SITES= https://pdfgrep.org/download/ diff --git a/textproc/pdfsandwich/Makefile b/textproc/pdfsandwich/Makefile index 9cdb17a78466..0bd76ea7cb78 100644 --- a/textproc/pdfsandwich/Makefile +++ b/textproc/pdfsandwich/Makefile @@ -2,7 +2,7 @@ PORTNAME= pdfsandwich DISTVERSION= 0.1.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/pdfsandwich%20${DISTVERSION}/ diff --git a/textproc/py-pdftotext/Makefile b/textproc/py-pdftotext/Makefile index 97ec99aaf724..d9f93e2725a8 100644 --- a/textproc/py-pdftotext/Makefile +++ b/textproc/py-pdftotext/Makefile @@ -2,7 +2,7 @@ PORTNAME= pdftotext PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/hotcrp/Makefile b/www/hotcrp/Makefile index 66326bc11037..9be13c39f6c3 100644 --- a/www/hotcrp/Makefile +++ b/www/hotcrp/Makefile @@ -2,7 +2,7 @@ PORTNAME= hotcrp PORTVERSION= 2.94 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= http://www.read.seas.harvard.edu/~kohler/hotcrp/ diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile index 7026628f1d74..e066741ffda9 100644 --- a/x11-toolkits/rubygem-poppler/Makefile +++ b/x11-toolkits/rubygem-poppler/Makefile @@ -2,7 +2,7 @@ PORTNAME= poppler PORTVERSION= 3.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index 4b755fff8547..54cc7d322406 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -3,7 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.94.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/x11/rubygem-gnome/Makefile b/x11/rubygem-gnome/Makefile index a5ce4cd0caf6..448c6d7076e4 100644 --- a/x11/rubygem-gnome/Makefile +++ b/x11/rubygem-gnome/Makefile @@ -2,6 +2,7 @@ PORTNAME= gnome PORTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= x11 gnome rubygems PKGNAMEPREFIX= rubygem- |