Permalink
Browse files

poppler: update to v0.65.0

  • Loading branch information...
drkp committed May 15, 2018
1 parent a0205d2 commit d29b807e67d1bc7d696abf7b4bb58fe2049df24c
Showing with 33 additions and 44 deletions.
  1. +23 −44 graphics/poppler/Portfile
  2. +10 −0 graphics/poppler/files/patch-qt5-106118.diff
View
@@ -4,15 +4,11 @@ PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup cxx11 1.1
PortGroup gobject_introspection 1.0
-PortGroup muniversal 1.0
-
-# version 0.58.0 includes C++11 extensions that break
-# build of a number of dependents (inkscape, texlive-bin, etc)
-# hold off on update until this is sorted out
+PortGroup cmake 1.1
name poppler
conflicts xpdf-tools
-version 0.57.0
+version 0.65.0
license GPL-2+
maintainers {devans @dbevans} openmaintainer
categories graphics
@@ -26,8 +22,9 @@ master_sites ${homepage}
use_xz yes
-checksums rmd160 a535f7797241cf44b598ad8d60a05f5307afcd52 \
- sha256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
+checksums rmd160 eeb55ce5f712287eeb01bd054df0033663a255ce \
+ sha256 89c8cf73f83efda78c5a9bd37c28f4593ad0e8a51556dbe39ed81e1ae2dd8f07 \
+ size 1451720
depends_build port:pkgconfig
@@ -40,54 +37,40 @@ depends_lib port:bzip2 \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/cairo.pc:cairo \
port:lcms2 \
+ port:libiconv \
port:libpng \
port:openjpeg \
port:poppler-data \
port:tiff \
port:zlib
+configure.ldflags-append -liconv
gobject_introspection yes
-# Generate newer libtool that passes -stdlib when linking dylibs.
-use_autoreconf yes
-autoreconf.args -fvi
-
compiler.blacklist {gcc-4.0 < 5493}
-configure.args --disable-poppler-qt4 \
- --disable-poppler-qt5 \
- --disable-gtk-test \
- --disable-silent-rules \
- --disable-libnss \
- --enable-xpdf-headers \
- --enable-zlib \
- --enable-libcurl
-
-post-patch {
- # clang: error: unknown argument: '-fno-check-new'
- # Strip it out rather than --disable-compile-warnings
- reinplace "s:-fno-check-new::g" ${worksrcpath}/configure.ac
-}
-
-# TODO:
-# add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
-
-subport poppler-qt4-mac {

This comment has been minimized.

Show comment
Hide comment
@michaelld

michaelld Jun 20, 2018

Contributor

Removing poppler-qt4-mac breaks 2 ports: py*-poppler-qt4 and texworks. I think @kencu has a fix for this breakage in one of his repos, and hopefully he'll push it into main macports-ports soonish.

@michaelld

michaelld Jun 20, 2018

Contributor

Removing poppler-qt4-mac breaks 2 ports: py*-poppler-qt4 and texworks. I think @kencu has a fix for this breakage in one of his repos, and hopefully he'll push it into main macports-ports soonish.

This comment has been minimized.

Show comment
Hide comment
@pmetzger

pmetzger Jun 20, 2018

Member

We were aware that breakage would happen. Sadly we had limited choices.

@pmetzger

pmetzger Jun 20, 2018

Member

We were aware that breakage would happen. Sadly we had limited choices.

- PortGroup qt4 1.0
-
- configure.env-append MOCQT4=${qt_bins_dir}/moc
- configure.args-delete --disable-poppler-qt4
-}
+configure.args-append \
+ -DENABLE_XPDF_HEADERS=ON \
+ -DENABLE_QT5=OFF \
+ -DBUILD_GTK_TESTS=OFF \
+ -DBUILD_QT5_TESTS=OFF \
+ -DBUILD_CPP_TESTS=OFF \
+ -DWITH_NSS3=OFF
subport poppler-qt5 {
PortGroup qt5 1.0
+ patchfiles-append patch-qt5-106118.diff
configure.env-append MOCQT5=${qt_bins_dir}/moc
- configure.args-delete --disable-poppler-qt5
+ configure.args-delete -DENABLE_QT5=OFF
+ configure.args-delete -DENABLE_XPDF_HEADERS=ON
+ configure.args-append -DENABLE_UTILS=OFF
+ configure.args-append -DENABLE_CPP=OFF
+ configure.args-append -DENABLE_GLIB=OFF
- # avoid:
- # ${prefix}/libexec/qt5/include/QtCore/qbasicatomic.h:61:4: error: "Qt requires C++11 support"
- configure.cxxflags-append -std=c++11
+ post-destroot {
+ file delete ${destroot}${prefix}/lib/pkgconfig/poppler-cairo.pc
+ }
}
if {${subport} ne ${name}} {
@@ -99,10 +82,6 @@ if {${subport} ne ${name}} {
system -W ${workpath} "${prefix}/bin/git clone --depth=1 http://anongit.freedesktop.org/git/poppler/test"
}
- configure.args-append --disable-cairo-output \
- --disable-poppler-glib \
- --disable-poppler-cpp \
- --disable-utils
# currently poppler only provides unit tests for the Qt wrappers
@@ -0,0 +1,10 @@
+--- qt5/src/ArthurOutputDev.cc.orig 2018-05-15 16:27:29.000000000 -0700
++++ qt5/src/ArthurOutputDev.cc 2018-05-15 16:27:44.000000000 -0700
+@@ -60,6 +60,7 @@
+ #include <QGlyphRun>
+ #include <QtGui/QPainterPath>
+ #include <QPicture>
++#include <array>
+
+ //------------------------------------------------------------------------
+

0 comments on commit d29b807

Please sign in to comment.