<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3b023687e2ae696f6d2011dd22371928a12f1639">https://github.com/macports/macports-ports/commit/3b023687e2ae696f6d2011dd22371928a12f1639</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 3b02368 poppler-qt4-mac: version 0.61.1
</span>3b02368 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3b023687e2ae696f6d2011dd22371928a12f1639
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Wed Jun 20 18:01:05 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> poppler-qt4-mac: version 0.61.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> pegged last version of poppler that supports the qt4
</span><span style='display:block; white-space:pre;color:#404040;'> interfaces. See the port notes.
</span>---
graphics/poppler-qt4-mac/Portfile | 88 ++++++++++++++++++++++
.../files/patch-CVE-2017-18267.diff | 42 +++++++++++
.../poppler-qt4-mac/files/patch-bug106417.diff | 12 +++
3 files changed, 142 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/Portfile b/graphics/poppler-qt4-mac/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..72b1b0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,88 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name poppler-qt4-mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xpdf-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.61.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kencu @kencu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://poppler.freedesktop.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Poppler is a PDF rendering library based on the xpdf-3.0 code base.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname poppler-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 62fa0f917e31e0c733228ea9289b4493a0fc29a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1433696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fontconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler-data \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -liconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append MOCQT4=${qt_bins_dir}/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_rpath ${destroot}${prefix}/libexec/${name}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake_share_module_dir ${prefix}/libexec/${name}/share/cmake/Modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_XPDF_HEADERS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT4=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_GTK_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_QT5_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_CPP_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_NSS3=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CVE-2017-18267.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix library not found during gir introspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.freedesktop.org/show_bug.cgi?id=106417
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-bug106417.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This port is based on the last version of poppler (0.61.1) that supported qt4. It will be kept \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+as up-to-date as possible with security updates, but is not expected to be as up-to-date as the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+official poppler port (that no longer supports qt4). You should consider this when deciding when \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and whether it is appropriate to use this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use this port to build poppler-based ports that require qt4, you will need to pass in the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+directions to the pkgconfig files or otherwise direct the build to find these headers and libraries. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For example, these lines may be useful:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PKG_CONFIG_PATH="${prefix}/libexec/poppler-qt4-mac/lib/pkgconfig:${prefix}/lib/pkgconfig"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/files/patch-CVE-2017-18267.diff b/graphics/poppler-qt4-mac/files/patch-CVE-2017-18267.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..af09246
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/files/patch-CVE-2017-18267.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 60b4fe65bc9dc9b82bbadf0be2e3781be796a13d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Albert Astals Cid <aacid@kde.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 1 May 2018 02:46:17 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: FoFiType1C::cvtGlyph: Fix infinite recursion on malformed documents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bugs #104942, #103238
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fofi/FoFiType1C.cc | 7 ++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git fofi/FoFiType1C.cc fofi/FoFiType1C.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 03e7799..b14561f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- fofi/FoFiType1C.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ fofi/FoFiType1C.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "goo/gmem.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "goo/gstrtod.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "goo/GooLikely.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "goo/GooString.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "poppler/Error.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "FoFiEncodings.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1361,7 +1362,7 @@ void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --nOps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ok = gTrue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ getIndexVal(subrIdx, k, &val, &ok);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ok) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (likely(ok && val.pos != offset)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cvtGlyph(val.pos, val.len, charBuf, subrIdx, pDict, gFalse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1596,7 +1597,7 @@ void FoFiType1C::cvtGlyph(int offset, int nBytes, GooString *charBuf,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --nOps;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ok = gTrue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ getIndexVal(&gsubrIdx, k, &val, &ok);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ok) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (likely(ok && val.pos != offset)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cvtGlyph(val.pos, val.len, charBuf, subrIdx, pDict, gFalse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v1.1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-qt4-mac/files/patch-bug106417.diff b/graphics/poppler-qt4-mac/files/patch-bug106417.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fa24096
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler-qt4-mac/files/patch-bug106417.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git glib/CMakeLists.txt glib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 33c66082..53c47ce7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,6 +119,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GObjectIntrospectionMacros)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTROSPECTION_GIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR} --warn-all")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(introspection_files ${poppler_glib_SRCS} ${poppler_glib_public_headers})
</span></pre><pre style='margin:0'>
</pre>