<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d29b807e67d1bc7d696abf7b4bb58fe2049df24c">https://github.com/macports/macports-ports/commit/d29b807e67d1bc7d696abf7b4bb58fe2049df24c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d29b807e67d1bc7d696abf7b4bb58fe2049df24c
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Tue May 15 15:00:16 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> poppler: update to v0.65.0
</span>---
graphics/poppler/Portfile | 67 ++++++++++------------------
graphics/poppler/files/patch-qt5-106118.diff | 10 +++++
2 files changed, 33 insertions(+), 44 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/Portfile b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22185d8..e160681 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,15 +4,11 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup cxx11 1.1
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# version 0.58.0 includes C++11 extensions that break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build of a number of dependents (inkscape, texlive-bin, etc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# hold off on update until this is sorted out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name poppler
conflicts xpdf-tools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.57.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.65.0
</span> license GPL-2+
maintainers {devans @dbevans} openmaintainer
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +22,9 @@ master_sites ${homepage}
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a535f7797241cf44b598ad8d60a05f5307afcd52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 eeb55ce5f712287eeb01bd054df0033663a255ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 89c8cf73f83efda78c5a9bd37c28f4593ad0e8a51556dbe39ed81e1ae2dd8f07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1451720
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,54 +37,40 @@ depends_lib port:bzip2 \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/cairo.pc:cairo \
port:lcms2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libiconv \
</span> port:libpng \
port:openjpeg \
port:poppler-data \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -liconv
</span> gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Generate newer libtool that passes -stdlib when linking dylibs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.blacklist {gcc-4.0 < 5493}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-poppler-qt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-poppler-qt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gtk-test \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-libnss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-xpdf-headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libcurl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang: error: unknown argument: '-fno-check-new'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Strip it out rather than --disable-compile-warnings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:-fno-check-new::g" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport poppler-qt4-mac {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MOCQT4=${qt_bins_dir}/moc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-poppler-qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</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_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>
subport poppler-qt5 {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt5-106118.diff
</span> configure.env-append MOCQT5=${qt_bins_dir}/moc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-poppler-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_QT5=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_XPDF_HEADERS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_UTILS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_CPP=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_GLIB=OFF
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${prefix}/libexec/qt5/include/QtCore/qbasicatomic.h:61:4: error: "Qt requires C++11 support"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${prefix}/lib/pkgconfig/poppler-cairo.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,10 +82,6 @@ if {${subport} ne ${name}} {
</span> system -W ${workpath} "${prefix}/bin/git clone --depth=1 http://anongit.freedesktop.org/git/poppler/test"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-cairo-output \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-poppler-glib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-poppler-cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-utils
</span>
# currently poppler only provides unit tests for the Qt wrappers
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-qt5-106118.diff b/graphics/poppler/files/patch-qt5-106118.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..923948a
</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/files/patch-qt5-106118.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qt5/src/ArthurOutputDev.cc.orig 2018-05-15 16:27:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qt5/src/ArthurOutputDev.cc 2018-05-15 16:27:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,6 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QGlyphRun>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtGui/QPainterPath>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QPicture>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <array>
</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></pre><pre style='margin:0'>
</pre>