diff options
89 files changed, 335 insertions, 80 deletions
diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index 3ec67ab013cc..2a5ecf662a5e 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -2,6 +2,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.9.13 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch b/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch new file mode 100644 index 000000000000..c3b4c4781b08 --- /dev/null +++ b/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch @@ -0,0 +1,26 @@ +This patch doesn't come from Gentoo, but because there are already +three unrelated patches that touch the same file, I'm following the +naming convention so that it gets applied in the right order. + +Chase constness changes in the poppler API. + +--- pdf2djvu.cc.orig 2019-10-27 19:16:30.654895000 +0000 ++++ pdf2djvu.cc 2019-10-27 19:16:47.450786000 +0000 +@@ -333,7 +333,7 @@ + } + + void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height, +- pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image) ++ pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image) + { + if (is_foreground_color_map(color_map) || config.no_render) + { +@@ -376,7 +376,7 @@ + bool interpretType3Chars() { return false; } + + void drawChar(pdf::gfx::State *state, double x, double y, double dx, double dy, double origin_x, double origin_y, +- CharCode code, int n_bytes, Unicode *unistr, int length) ++ CharCode code, int n_bytes, const Unicode *unistr, int length) + { + double pox, poy, pdx, pdy, px, py, pw, ph; + x -= origin_x; y -= origin_y; diff --git a/converters/pdf2djvu/files/patch-pdf-dpi.cc b/converters/pdf2djvu/files/patch-pdf-dpi.cc new file mode 100644 index 000000000000..e1be2fa9e1c0 --- /dev/null +++ b/converters/pdf2djvu/files/patch-pdf-dpi.cc @@ -0,0 +1,11 @@ +--- pdf-dpi.cc.orig 2019-10-27 19:10:07 UTC ++++ pdf-dpi.cc +@@ -34,7 +34,7 @@ class DpiGuessDevice : public pdf::OutputDevice (prote + } + + virtual void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height, +- pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image) ++ pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image) + { + this->process_image(state, width, height); + } diff --git a/converters/pdf2djvu/files/patch-pdf-unicode.cc b/converters/pdf2djvu/files/patch-pdf-unicode.cc new file mode 100644 index 000000000000..f02c7ada514f --- /dev/null +++ b/converters/pdf2djvu/files/patch-pdf-unicode.cc @@ -0,0 +1,25 @@ +--- pdf-unicode.cc.orig 2019-10-27 19:19:18.837645000 +0000 ++++ pdf-unicode.cc 2019-10-27 19:20:31.405700000 +0000 +@@ -125,11 +125,11 @@ + * =================== + */ + +-pdf::FullNFKC::FullNFKC(Unicode *unistr, int length) ++pdf::FullNFKC::FullNFKC(const Unicode *unistr, int length) + : data(nullptr), length_(0) + { + assert(length >= 0); +- this->data = unicodeNormalizeNFKC(unistr, length, &this->length_, nullptr); ++ this->data = unicodeNormalizeNFKC(const_cast<Unicode*>(unistr), length, &this->length_, nullptr); + } + + pdf::FullNFKC::~FullNFKC() +@@ -141,7 +141,7 @@ + * ====================== + */ + +-pdf::MinimalNFKC::MinimalNFKC(Unicode *unistr, int length) ++pdf::MinimalNFKC::MinimalNFKC(const Unicode *unistr, int length) + { + this->string.append(unistr, length); + } diff --git a/converters/pdf2djvu/files/patch-pdf-unicode.hh b/converters/pdf2djvu/files/patch-pdf-unicode.hh new file mode 100644 index 000000000000..7e3f74493925 --- /dev/null +++ b/converters/pdf2djvu/files/patch-pdf-unicode.hh @@ -0,0 +1,20 @@ +--- pdf-unicode.hh.orig 2019-10-27 19:18:36.768779000 +0000 ++++ pdf-unicode.hh 2019-10-27 19:19:00.052652000 +0000 +@@ -58,7 +58,7 @@ + Unicode* data; + int length_; + public: +- explicit FullNFKC(Unicode *, int length); ++ explicit FullNFKC(const Unicode *, int length); + ~FullNFKC(); + int length() const + { +@@ -79,7 +79,7 @@ + protected: + std::basic_string<Unicode> string; + public: +- explicit MinimalNFKC(Unicode *, int length); ++ explicit MinimalNFKC(const Unicode *, int length); + int length() const; + operator const Unicode*() const; + }; diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index 5ea41b66733f..d8202f28d8c6 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -3,7 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION} diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 554e0949ceca..0628b9994f13 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile index be3ccd504f93..d69f5f598d8c 100644 --- a/deskutils/gourmet/Makefile +++ b/deskutils/gourmet/Makefile @@ -3,7 +3,7 @@ PORTNAME= gourmet PORTVERSION= 0.17.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= deskutils gnome MAINTAINER= rm@FreeBSD.org diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile index 6e46cd490d74..c1c2a9918432 100644 --- a/deskutils/lumina-pdf/Makefile +++ b/deskutils/lumina-pdf/Makefile @@ -2,7 +2,7 @@ PORTNAME= lumina-pdf DISTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MAINTAINER= ken@ixsystems.com diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile index a27209502a19..49a9c8477dd9 100644 --- a/deskutils/recoll/Makefile +++ b/deskutils/recoll/Makefile @@ -3,6 +3,7 @@ PORTNAME= recoll DISTVERSION= 1.25.22 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= https://www.lesbonscomptes.com/recoll/ diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile index 0c41d7fceb9a..fd7a2b79bb93 100644 --- a/deskutils/xfce4-tumbler/Makefile +++ b/deskutils/xfce4-tumbler/Makefile @@ -3,7 +3,7 @@ PORTNAME= tumbler PORTVERSION= 0.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils xfce MASTER_SITES= XFCE PKGNAMEPREFIX= xfce4- diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 5c1ecaf4984a..f839a01a8762 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -3,7 +3,7 @@ PORTNAME= efl DISTVERSION= 1.20.7 -PORTREVISION= 18 +PORTREVISION= 19 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 781de67dde1b..003bae3a9025 100644 --- a/devel/kf5-kfilemetadata/Makefile +++ b/devel/kf5-kfilemetadata/Makefile @@ -2,7 +2,7 @@ PORTNAME= kfilemetadata DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 701b7037368c..102b3b16cdfe 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra DISTVERSION= 3.1.0 -PORTREVISION= 26 +PORTREVISION= 28 CATEGORIES= editors kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME} @@ -69,8 +69,4 @@ CMAKE_ARGS+= -DCMAKE_CXX_FLAGS="-DKDE_NO_DEBUG_OUTPUT" PLIST_SUB+= SHLIB_VER=16.0.0 -post-patch: - # Fix with poppler 0.73 - ${REINPLACE_CMD} -e 's|Guchar|unsigned char|g' \ - ${WRKSRC}/filters/karbon/pdf/SvgOutputDev.cpp .include <bsd.port.mk> diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp index 911bedf7e936..6cba91fffbb2 100644 --- a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp +++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp @@ -101,7 +101,7 @@ { int render = state->getRender(); // check for invisible text -- this is used by Acrobat Capture -@@ -402,7 +408,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr +@@ -402,10 +408,10 @@ void SvgOutputDev::drawString(GfxState * state, GooStr QString str; @@ -109,7 +109,11 @@ + const char * p = s->c_str(); int len = s->getLength(); CharCode code; - Unicode *u = nullptr; +- Unicode *u = nullptr; ++ const Unicode *u = nullptr; + int uLen; + double dx, dy, originX, originY; + while (len > 0) { @@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr double x = state->getCurX(); double y = state->getCurY(); @@ -144,6 +148,24 @@ { ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); imgStr->reset(); +@@ -488,7 +494,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object * + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -507,7 +513,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object * + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + @@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object * return; } diff --git a/editors/calligra/files/patch-gentoo-kf5-5.61-headers b/editors/calligra/files/patch-sheets_plugins_calendar_CalendarToolWidget.cpp index 004cf6df8802..8e75ffc7f720 100644 --- a/editors/calligra/files/patch-gentoo-kf5-5.61-headers +++ b/editors/calligra/files/patch-sheets_plugins_calendar_CalendarToolWidget.cpp @@ -3,13 +3,7 @@ From: David Faure <faure@kde.org> Date: Tue, 23 Jul 2019 13:02:34 +0200 Subject: Fix compilation with Qt 5.13 (missing include) ---- - sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp -index b10b230..0c5eeb6 100644 ---- sheets/plugins/calendar/CalendarToolWidget.cpp +--- sheets/plugins/calendar/CalendarToolWidget.cpp.orig 2018-01-26 09:24:44 UTC +++ sheets/plugins/calendar/CalendarToolWidget.cpp @@ -30,6 +30,7 @@ #include <kdatepicker.h> @@ -19,5 +13,3 @@ index b10b230..0c5eeb6 100644 namespace Calligra { --- -cgit v1.1 diff --git a/editors/calligra/files/patch-git_70be8c4 b/editors/calligra/files/patch-stage_part_KPrPresentationTool.cpp index e8f74261cff9..e8f74261cff9 100644 --- a/editors/calligra/files/patch-git_70be8c4 +++ b/editors/calligra/files/patch-stage_part_KPrPresentationTool.cpp diff --git a/editors/kile/Makefile b/editors/kile/Makefile index 830a279867b2..f6f62b0386ee 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -3,6 +3,7 @@ PORTNAME= kile DISTVERSIONPREFIX= v DISTVERSION= 3.0b3 +PORTREVISION= 1 CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 4fd545fcaae5..125f469d80d9 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-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx new file mode 100644 index 000000000000..99838af2f284 --- /dev/null +++ b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.cxx @@ -0,0 +1,35 @@ +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2019-10-27 14:16:14 UTC ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -866,7 +866,7 @@ void PDFOutDev::eoClip(GfxState *state) + void PDFOutDev::drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, +- CharCode, int /*nBytes*/, Unicode *u, int uLen) ++ CharCode, int /*nBytes*/, const Unicode *u, int uLen) + { + assert(state); + +@@ -982,7 +982,7 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, + int width, int height, GfxImageColorMap* colorMap, + poppler_bool /*interpolate*/, +- int* maskColors, poppler_bool /*inlineImg*/ ) ++ const int* maskColors, poppler_bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -1004,12 +1004,12 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* + { + GfxRGB aMinRGB; + colorMap->getColorSpace()->getRGB( +- reinterpret_cast<GfxColor*>(maskColors), ++ reinterpret_cast<const GfxColor*>(maskColors), + &aMinRGB ); + + GfxRGB aMaxRGB; + colorMap->getColorSpace()->getRGB( +- reinterpret_cast<GfxColor*>(maskColors)+gfxColorMaxComps, ++ reinterpret_cast<const GfxColor*>(maskColors)+gfxColorMaxComps, + &aMaxRGB ); + + aMaskBuf.push_back( colToByte(aMinRGB.r) ); diff --git a/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx new file mode 100644 index 000000000000..24811c9d6743 --- /dev/null +++ b/editors/libreoffice/files/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev__gpl.hxx @@ -0,0 +1,39 @@ +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2019-10-27 14:16:24 UTC ++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -232,10 +232,18 @@ namespace pdfi + virtual void eoClip(GfxState *state) override; + + //----- text drawing ++#if POPPLER_CHECK_VERSION(0, 82, 0) + virtual void drawChar(GfxState *state, double x, double y, + double dx, double dy, + double originX, double originY, ++ CharCode code, int nBytes, const Unicode *u, int uLen) override; ++#else ++ virtual void drawChar(GfxState *state, double x, double y, ++ double dx, double dy, ++ double originX, double originY, + CharCode code, int nBytes, Unicode *u, int uLen) override; ++#endif ++ + #if POPPLER_CHECK_VERSION(0, 64, 0) + virtual void drawString(GfxState *state, const GooString *s) override; + #else +@@ -248,10 +256,17 @@ namespace pdfi + int width, int height, poppler_bool invert, + poppler_bool interpolate, + poppler_bool inlineImg) override; ++#if POPPLER_CHECK_VERSION(0, 82, 0) + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, + poppler_bool interpolate, ++ const int* maskColors, poppler_bool inlineImg) override; ++#else ++ virtual void drawImage(GfxState *state, Object *ref, Stream *str, ++ int width, int height, GfxImageColorMap *colorMap, ++ poppler_bool interpolate, + int* maskColors, poppler_bool inlineImg) override; ++#endif + virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index de068a723941..6e10a00cf51a 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 2 +PORTREVISION= 3 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 f8639a28f776..e03d9ed4c4f6 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -2,7 +2,7 @@ PORTNAME= texstudio DISTVERSION= 2.12.16 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= editors MAINTAINER= rigoletto@FreeBSD.org diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 27fc1c1b903b..6a5bef574220 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -4,7 +4,7 @@ PORTNAME= texworks DISTVERSIONPREFIX= release- DISTVERSION= 0.6.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= editors MAINTAINER= hrs@FreeBSD.org diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile index 9c92b175dc39..75438830586d 100644 --- a/graphics/atril/Makefile +++ b/graphics/atril/Makefile @@ -5,7 +5,7 @@ PORTNAME= atril PORTVERSION= 1.22.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics print mate MASTER_SITES= MATE DIST_SUBDIR= mate diff --git a/graphics/diff-pdf/Makefile b/graphics/diff-pdf/Makefile index c2c3c3faca67..c3bbcfa7f8d0 100644 --- a/graphics/diff-pdf/Makefile +++ b/graphics/diff-pdf/Makefile @@ -4,7 +4,7 @@ PORTNAME= diff-pdf DISTVERSIONPREFIX= v DISTVERSION= 0.2-27 DISTVERSIONSUFFIX= -gc4d6722 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MAINTAINER= uzsolt@uzsolt.hu diff --git a/graphics/diffpdf/Makefile b/graphics/diffpdf/Makefile index aa0103541700..c41910897991 100644 --- a/graphics/diffpdf/Makefile +++ b/graphics/diffpdf/Makefile @@ -2,7 +2,7 @@ PORTNAME= diffpdf PORTVERSION= 2.1.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= http://www.qtrac.eu/ diff --git a/graphics/dspdfviewer/Makefile b/graphics/dspdfviewer/Makefile index 6a406a11a9a6..ed3eba091f29 100644 --- a/graphics/dspdfviewer/Makefile +++ b/graphics/dspdfviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= dspdfviewer PORTVERSION= 1.15.1 DISTVERSIONPREFIX= v -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= graphics MAINTAINER= fox@FreeBSD.org diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile index ee26696c2770..8b4a7866f189 100644 --- a/graphics/electrix/Makefile +++ b/graphics/electrix/Makefile @@ -2,7 +2,7 @@ PORTNAME= electrix PORTVERSION= 0.2.0 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= graphics print MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION} diff --git a/graphics/engauge-digitizer/Makefile b/graphics/engauge-digitizer/Makefile index 2395b79b3e47..01590b589ac0 100644 --- a/graphics/engauge-digitizer/Makefile +++ b/graphics/engauge-digitizer/Makefile @@ -3,7 +3,7 @@ PORTNAME= engauge-digitizer DISTVERSIONPREFIX= v DISTVERSION= 12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics math science MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index a1288d8898c2..4e2f8b0c3ee0 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 23 +PORTREVISION= 24 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 2b91167d9e10..e7d89ad1a00b 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,7 +3,7 @@ PORTNAME= evince PORTVERSION= 3.28.5 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index c0377af55d6c..2cf035e438a3 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 2.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \ LOCAL/sunpoet diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index fd886f89010e..312cdfc5aeb6 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -3,7 +3,7 @@ PORTNAME= gegl PORTVERSION= 0.4.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= GIMP diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index c7626e0aed91..8408d22ec831 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ PORTNAME?= gimp-app PORTVERSION= 2.10.12 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 35537751e3a5..d03a08bb7c6c 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -3,7 +3,7 @@ PORTNAME= graphviz PORTVERSION= 2.42.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics tk MASTER_SITES= https://gitlab.com/graphviz/graphviz/-/archive/${PORTVERSION}/ diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 82d127867c9e..468ee8358175 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.92.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ diff --git a/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp new file mode 100644 index 000000000000..bc03a402d929 --- /dev/null +++ b/graphics/inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp @@ -0,0 +1,20 @@ +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2019-10-27 20:00:15.887122000 +0000 ++++ src/extension/internal/pdfinput/pdf-parser.cpp 2019-10-27 20:02:37.972576000 +0000 +@@ -2414,7 +2414,7 @@ + int wMode; + double riseX, riseY; + CharCode code; +- Unicode *u = NULL; ++ const Unicode *u = NULL; + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +@@ -2537,7 +2537,7 @@ + originY *= state->getFontSize(); + state->textTransformDelta(originX, originY, &tOriginX, &tOriginY); + builder->addChar(state, state->getCurX() + riseX, state->getCurY() + riseY, +- dx, dy, tOriginX, tOriginY, code, n, u, uLen); ++ dx, dy, tOriginX, tOriginY, code, n, const_cast<Unicode*>(u), uLen); + state->shift(tdx, tdy); + p += n; + len -= n; diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 5c8083b7f6b2..62116132b7f8 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -2,7 +2,7 @@ PORTNAME= krita DISTVERSION= 4.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} 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 9be38b36c136..960f9ab8f0ea 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= 14 +PORTREVISION= 15 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 9c8f82fc2be1..00e6692cafe6 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.5.1 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index a8f09a671ceb..31b1346f5899 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile index 69039bd48304..f6837cd66e6b 100644 --- a/graphics/pdf2svg/Makefile +++ b/graphics/pdf2svg/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdf2svg PORTVERSION= 0.2.3 -PORTREVISION= 11 +PORTREVISION= 12 DISTVERSIONPREFIX= v CATEGORIES= graphics diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile index cc0ae3b096ea..d41a52f027be 100644 --- a/graphics/pdfpc/Makefile +++ b/graphics/pdfpc/Makefile @@ -4,7 +4,7 @@ PORTNAME= pdfpc DISTVERSION= 4.3.4 CATEGORIES= graphics DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 MAINTAINER= bapt@FreeBSD.org COMMENT= Keynote-like multi-monitor presentation viewer diff --git a/graphics/poppler-data/Makefile b/graphics/poppler-data/Makefile index 03daa2d77db4..5c4af8332eea 100644 --- a/graphics/poppler-data/Makefile +++ b/graphics/poppler-data/Makefile @@ -2,6 +2,7 @@ PORTNAME= poppler-data PORTVERSION= 0.4.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://poppler.freedesktop.org/ diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index 90bce729270a..fc61a3effe42 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= GLib bindings to poppler diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist index 1472a722291c..73f517139f80 100644 --- a/graphics/poppler-glib/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -16,6 +16,6 @@ include/poppler/glib/poppler.h lib/girepository-1.0/Poppler-0.18.typelib lib/libpoppler-glib.so lib/libpoppler-glib.so.8 -lib/libpoppler-glib.so.8.14.0 +lib/libpoppler-glib.so.8.15.0 libdata/pkgconfig/poppler-glib.pc share/gir-1.0/Poppler-0.18.gir diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index 32f0fe55ef5b..f617c40a8d1a 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -qt5 COMMENT= Qt 5 bindings to poppler diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index 2a769ad4183c..9657f45fa6f2 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Poppler's xpdf-workalike command line utilities # ' diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 3cb80a5b3485..05aadf914d31 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -DISTVERSION= 0.81.0 +DISTVERSION= 0.82.0 PORTREVISION?= 1 CATEGORIES= graphics print MASTER_SITES= https://poppler.freedesktop.org/ diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 97f2bd3dcb26..bfb21b5db967 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1569211524 -SHA256 (poppler-0.81.0.tar.xz) = 212d020b035b67b36c9666bd08ac778dff3222d85c01c338787d546f0f9bfe02 -SIZE (poppler-0.81.0.tar.xz) = 1548944 +TIMESTAMP = 1572047126 +SHA256 (poppler-0.82.0.tar.xz) = 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df +SIZE (poppler-0.82.0.tar.xz) = 1553336 diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 6fa6b215a16c..220402819e2e 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -4,6 +4,9 @@ include/poppler/BuiltinFont.h include/poppler/BuiltinFontTables.h include/poppler/CMap.h include/poppler/CachedFile.h +include/poppler/CairoFontEngine.h +include/poppler/CairoOutputDev.h +include/poppler/CairoRescaleBox.h include/poppler/Catalog.h include/poppler/CertificateInfo.h include/poppler/CharCodeToUnicode.h @@ -132,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.91 -lib/libpoppler.so.91.0.0 +lib/libpoppler.so.92 +lib/libpoppler.so.92.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 ab4178df9ea9..e608453329c2 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -3,7 +3,7 @@ PORTNAME= pqiv PORTVERSION= 2.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= danilo@FreeBSD.org diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index c7aa0595d3c1..1cb08588ba7e 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= poppler PORTVERSION= 0.12.1 -PORTREVISION= 15 +PORTREVISION= 16 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 d9d81b623b9d..cb8186298644 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -3,7 +3,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 0.74.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile index ec2a266ba045..f2f53f70487d 100644 --- a/graphics/qcomicbook/Makefile +++ b/graphics/qcomicbook/Makefile @@ -3,7 +3,7 @@ PORTNAME= QComicBook PORTVERSION= 0.9.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index fbb7c5d8862a..d8f80e82002a 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -3,7 +3,7 @@ PORTNAME= vips PORTVERSION= 8.7.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/ diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile index 7b3bb80367e6..21c1fd1169e3 100644 --- a/graphics/xournal/Makefile +++ b/graphics/xournal/Makefile @@ -3,7 +3,7 @@ PORTNAME= xournal PORTVERSION= 0.4.8.2016 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile index b86fa5e6fb09..eec8dec1fbda 100644 --- a/graphics/xournalpp/Makefile +++ b/graphics/xournalpp/Makefile @@ -2,6 +2,7 @@ PORTNAME= xournalpp DISTVERSION= 1.0.15 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org diff --git a/graphics/zathura-pdf-mupdf/Makefile b/graphics/zathura-pdf-mupdf/Makefile index 867634af5c8a..2b1143c7e648 100644 --- a/graphics/zathura-pdf-mupdf/Makefile +++ b/graphics/zathura-pdf-mupdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= zathura-pdf-mupdf DISTVERSION= 0.3.5 +PORTREVISION= 1 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 225a11f6ca34..8037b88c7960 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= 8 +PORTREVISION= 9 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 9ef2db4fc708..0ab1deb81d00 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pdf_viewer -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= PDF and PostScript viewer plugin for Claws Mail diff --git a/mail/textmail/Makefile b/mail/textmail/Makefile index 5c2f7c83a4e5..cba698347f49 100644 --- a/mail/textmail/Makefile +++ b/mail/textmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= textmail PORTVERSION= 20070803 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail MASTER_SITES= http://raf.org/textmail/ diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile index 5da056e92477..ec809161277b 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= 15 +PORTREVISION= 16 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 3092749b75a8..b6bc6553c57e 100644 --- a/misc/rubygem-rabbit/Makefile +++ b/misc/rubygem-rabbit/Makefile @@ -3,7 +3,7 @@ PORTNAME= rabbit PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc rubygems MASTER_SITES= RG diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index e4b09cdcbf29..f9046b2e6caa 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico DISTVERSION= 3.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile index 5fd9ffb852a2..285353d2434c 100644 --- a/net/kitinerary/Makefile +++ b/net/kitinerary/Makefile @@ -2,7 +2,7 @@ PORTNAME= kitinerary DISTVERSION= ${KDE_APPLICATIONS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 1363e890268e..77faf9df8412 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -2,6 +2,7 @@ PORTNAME= cups-filters PORTVERSION= 1.25.11 +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 511feab514d6..c3092f2306a4 100644 --- a/print/deforaos-pdfviewer/Makefile +++ b/print/deforaos-pdfviewer/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfviewer PORTVERSION= 0.0.2 -PORTREVISION= 7 +PORTREVISION= 8 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 f7ab032b3d86..355c416da56e 100644 --- a/print/frescobaldi/Makefile +++ b/print/frescobaldi/Makefile @@ -4,7 +4,7 @@ PORTNAME= frescobaldi DISTVERSIONPREFIX= v DISTVERSION= 3.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print kde MAINTAINER= m.ne@gmx.net diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile index 47d6f8f1cf2e..a5e906e0b7d8 100644 --- a/print/ghostscript9-agpl-base/Makefile +++ b/print/ghostscript9-agpl-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.27 -PORTREVISION= 2 +PORTREVISION= 3 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 ec6a3a86fc35..8d43fe7bba19 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -4,6 +4,7 @@ PORTNAME= pdf-tools DISTVERSIONPREFIX= v DISTVERSION= 0.90-34 DISTVERSIONSUFFIX= -g29d9f4f +PORTREVISION= 1 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index 42c9c216517e..9b917dcaf422 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfcube PORTVERSION= 0.0.5 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= print MASTER_SITES= http://code.100allora.it/releases/pdfcube/ diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index c951c0811227..d11d16a7a79b 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,6 +3,7 @@ PORTNAME= qpdfview DISTVERSION= 0.4.18 +PORTREVISION= 1 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 32f22d2c33a5..454fbf8d36f5 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.5.5 -PORTREVISION= 4 +PORTREVISION= 5 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_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp new file mode 100644 index 000000000000..8f4f7d06a446 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp @@ -0,0 +1,29 @@ +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-10-27 16:14:24 UTC ++++ scribus/plugins/import/pdf/slaoutput.cpp +@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob + delete[] mbuffer; + } + +-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) ++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; +@@ -3365,7 +3365,7 @@ err1: + fontsrc->unref(); + } + +-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) ++void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) + { + double x1, y1, x2, y2; + int render; +@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, + } + } + +-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) ++GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) + { + // qDebug() << "beginType3Char"; + GfxFont *gfxFont; 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 new file mode 100644 index 000000000000..46128ebe8f14 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h @@ -0,0 +1,22 @@ +--- scribus/plugins/import/pdf/slaoutput.h.orig 2019-10-27 16:12:47 UTC ++++ scribus/plugins/import/pdf/slaoutput.h +@@ -229,7 +229,7 @@ class SlaOutputDev : public OutputDev (public) + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; +- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; ++ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, +@@ -261,8 +261,8 @@ class SlaOutputDev : public OutputDev (public) + //----- text drawing + void beginTextObject(GfxState *state) override; + void endTextObject(GfxState *state) override; +- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; +- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; ++ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override; ++ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override; + 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; diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index aeef7fefdcc0..5a840edc0102 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -2,7 +2,7 @@ PORTNAME= luatex PORTVERSION= 0.80.0 -PORTREVISION= 11 +PORTREVISION= 12 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 5d2b9c14bf78..08d30d565ac3 100644 --- a/print/tex-xetex/Makefile +++ b/print/tex-xetex/Makefile @@ -2,7 +2,7 @@ PORTNAME= xetex PORTVERSION= 0.99992 -PORTREVISION= 25 +PORTREVISION= 26 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 50de1a29c14d..1bcb5d20e3d1 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 42 +PORTREVISION= 43 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile index bb5dad3c50c1..3d9618fad179 100644 --- a/sysutils/pcbsd-utils-qt5/Makefile +++ b/sysutils/pcbsd-utils-qt5/Makefile @@ -3,7 +3,7 @@ PORTNAME= pcbsd-utils-qt5 PORTVERSION= 1444236547 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MAINTAINER= kmoore@FreeBSD.org diff --git a/sysutils/tracker-miners/Makefile b/sysutils/tracker-miners/Makefile index 82987e54f1eb..c05f589e567f 100644 --- a/sysutils/tracker-miners/Makefile +++ b/sysutils/tracker-miners/Makefile @@ -3,7 +3,7 @@ PORTNAME= tracker-miners PORTVERSION= 2.0.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils gnome MASTER_SITES= GNOME diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 20d602b6e50d..638fc8ac38a0 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdfgrep PORTVERSION= 2.1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= textproc MASTER_SITES= https://pdfgrep.org/download/ diff --git a/textproc/pdfsandwich/Makefile b/textproc/pdfsandwich/Makefile index b48b207c8898..9cdb17a78466 100644 --- a/textproc/pdfsandwich/Makefile +++ b/textproc/pdfsandwich/Makefile @@ -2,7 +2,7 @@ PORTNAME= pdfsandwich DISTVERSION= 0.1.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/pdfsandwich%20${DISTVERSION}/ diff --git a/textproc/py-pdftotext/Makefile b/textproc/py-pdftotext/Makefile index a4b3d10eb8e4..97ec99aaf724 100644 --- a/textproc/py-pdftotext/Makefile +++ b/textproc/py-pdftotext/Makefile @@ -2,6 +2,7 @@ PORTNAME= pdftotext PORTVERSION= 2.1.2 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/hotcrp/Makefile b/www/hotcrp/Makefile index 7b9a3763d65a..66326bc11037 100644 --- a/www/hotcrp/Makefile +++ b/www/hotcrp/Makefile @@ -2,7 +2,7 @@ PORTNAME= hotcrp PORTVERSION= 2.94 -PORTREVISION= 7 +PORTREVISION= 8 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 bc8caddbfd53..7026628f1d74 100644 --- a/x11-toolkits/rubygem-poppler/Makefile +++ b/x11-toolkits/rubygem-poppler/Makefile @@ -2,6 +2,7 @@ PORTNAME= poppler PORTVERSION= 3.4.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits rubygems MASTER_SITES= RG diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index af63238750fe..4b755fff8547 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -3,6 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.94.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION} |