<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/850f8dffd27f4adf8f32092b87774a4fa292b4c4">https://github.com/macports/macports-ports/commit/850f8dffd27f4adf8f32092b87774a4fa292b4c4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 850f8dffd27f4adf8f32092b87774a4fa292b4c4
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 6 22:03:25 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> poppler: cleanup
</span>---
graphics/poppler/Portfile | 84 ++++++++++++++++++++++++++---------------------
1 file changed, 47 insertions(+), 37 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 8837a3cc337..fb54acedf9e 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;'>@@ -11,26 +11,24 @@ set my_name poppler
</span> version 23.05.0
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f62a276c00eb8ad1606f21e51b0eb323f49b69dc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1856488
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories graphics
</span> license GPL-2+
maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://poppler.freedesktop.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Poppler is a PDF rendering library based on the xpdf-3.0 code base.
long_description {*}${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://poppler.freedesktop.org/
</span>
master_sites ${homepage} \
gentoo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distname ${my_name}-${version}
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_xz yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f62a276c00eb8ad1606f21e51b0eb323f49b69dc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 38294de7149ebe458191a6e6d0e2837da7dba8683900a635252f6d0ee235f990 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1856488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set py_ver 3.11
set py_ver_nodot [string map {. {}} ${py_ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,16 +36,17 @@ depends_build-append \
</span> port:pkgconfig \
port:python${py_ver_nodot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairo.pc:cairo \
</span> port:curl \
port:expat \
port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cairo.pc:cairo \
</span> port:lcms2 \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span> port:libpng \
port:nss \
port:openjpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,14 +56,17 @@ depends_lib-append port:bzip2 \
</span>
# remove top-level paths, such that internal headers and
# libraries are used instead of any already-installed ones.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -liconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -liconv
</span> gobject_introspection yes
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span> compiler.thread_local_storage yes
# match clang, not strequal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,22 +77,23 @@ patchfiles-append patch-cmake_modules_PopplerMacros.cmake.diff
</span> patchfiles-append patch-glib_CMakeFiles.txt-fix-include-ordering.diff
if {${configure.compiler} eq "macports-gcc-7"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-poppler-gcc7-noexcept.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-poppler-gcc7-noexcept.diff
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_QT5=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_QT6=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_CPP_TESTS=OFF \
</span> -DBUILD_GTK_TESTS=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_MANUAL_TESTS=OFF \
</span> -DBUILD_QT5_TESTS=OFF \
-DBUILD_QT6_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_CPP_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_MANUAL_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_NSS3=ON \
</span> -DENABLE_BOOST=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT6=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLIB2_MKENUMS_PYTHON=${prefix}/bin/python${py_ver} \
</span> -DRUN_GPERF_IF_PRESENT=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGLIB2_MKENUMS_PYTHON=${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_NSS3=ON
</span>
# Poppler cmake doesn't understand build type "MacPorts"; use release unless +debug is set
if {[variant_isset debug]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,22 +106,26 @@ variant boost description "Use Boost when building the Splash graphics backend"
</span> PortGroup boost 1.0
boost.version 1.76
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_BOOST=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=ON
</span> }
default_variants-append +boost
subport ${name}-qt5 {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.min_version 5.5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.min_version 5.5.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append MOCQT5=${qt_bins_dir}/moc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_QT5=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_XPDF_HEADERS=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_UTILS=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_CPP=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GLIB=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOCQT5=${qt_bins_dir}/moc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QT5=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_XPDF_HEADERS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CPP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GLIB=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_UTILS=OFF
</span>
post-destroot {
file delete ${destroot}${prefix}/lib/pkgconfig/poppler-cairo.pc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,12 +133,15 @@ subport ${name}-qt5 {
</span> }
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract-append port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:git
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${workpath} "${prefix}/bin/git clone --depth=1 https://anongit.freedesktop.org/git/poppler/test"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${prefix}/bin/git clone --depth=1 https://anongit.freedesktop.org/git/poppler/test"
</span> }
# currently poppler only provides unit tests for the Qt wrappers
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,7 +152,7 @@ if {${subport} ne ${name}} {
</span>
post-destroot {
foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete $dot_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${dot_h}
</span> }
foreach libpoppler [glob -nocomplain ${destroot}${prefix}/lib/libpoppler.*] {
delete ${libpoppler}
</pre><pre style='margin:0'>
</pre>