<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e68ee75ecaeedb221f58cbbb16a95ee270b18d40">https://github.com/macports/macports-ports/commit/e68ee75ecaeedb221f58cbbb16a95ee270b18d40</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 e68ee75ecae poppler: add boost variant
</span>e68ee75ecae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e68ee75ecaeedb221f58cbbb16a95ee270b18d40
</span>Author: Eric F <eric@iefdev.se>
AuthorDate: Thu Oct 8 15:16:45 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> poppler: add boost variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Poppler should consistently either use or not use Boost. Making a
</span><span style='display:block; white-space:pre;color:#404040;'> variant solves that.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Add patch-check-boost.diff
</span><span style='display:block; white-space:pre;color:#404040;'> - Add variant and depends_build for boost.
</span><span style='display:block; white-space:pre;color:#404040;'> - Closes: https://trac.macports.org/ticket/61290
</span>---
graphics/poppler/Portfile | 18 +++++++++++++++---
graphics/poppler/files/patch-check-boost.diff | 11 +++++++++++
2 files changed, 26 insertions(+), 3 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 c7d98dc8f7e..88d2c15003e 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;'>@@ -8,8 +8,10 @@ PortGroup cmake 1.1
</span> PortGroup legacysupport 1.0
name poppler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts xpdf-tools
</span> version 20.10.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts xpdf-tools
</span> license GPL-2+
maintainers {devans @dbevans} openmaintainer
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +19,7 @@ platforms darwin
</span> homepage https://poppler.freedesktop.org/
description Poppler is a PDF rendering library based on the xpdf-3.0 code base.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
master_sites ${homepage} \
gentoo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +63,8 @@ compiler.cxx_standard 2014
</span> configure.cxxflags-append -std=c++14
compiler.blacklist-append {clang < 800.0.38}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-check-boost.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://bugs.freedesktop.org/show_bug.cgi?id=106417
patchfiles-append patch-bug106417.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +79,15 @@ configure.args-append \
</span> -DBUILD_QT5_TESTS=OFF \
-DBUILD_QT6_TESTS=OFF \
-DBUILD_CPP_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_NSS3=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_NSS3=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_BOOST_HEADERS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant boost description "Use Boost when building the Splash graphics backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_BOOST_HEADERS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_BOOST_HEADERS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport poppler-qt5 {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-check-boost.diff b/graphics/poppler/files/patch-check-boost.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f31a9199936
</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-check-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-10-01 21:44:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-10-08 14:15:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -291,7 +291,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(SYSTEM ${LCMS2_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(ENABLE_SPLASH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_SPLASH AND USE_BOOST_HEADERS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost 1.58.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(Boost_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
</span></pre><pre style='margin:0'>
</pre>