<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/b5fa3bef8531be945b4521308aad8996b66bedf5">https://github.com/macports/macports-ports/commit/b5fa3bef8531be945b4521308aad8996b66bedf5</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 b5fa3bef853 poppler-devel: new port for testing
</span>b5fa3bef853 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b5fa3bef8531be945b4521308aad8996b66bedf5
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 6 17:41:04 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> poppler-devel: new port for testing
</span>---
graphics/poppler-devel/Portfile | 160 +++++++++++++++++++++
.../poppler-devel/files/patch-check-boost.diff | 21 +++
.../patch-cmake_modules_PopplerMacros.cmake.diff | 11 ++
...h-glib_CMakeFiles.txt-fix-include-ordering.diff | 40 ++++++
.../files/patch-poppler-gcc7-noexcept.diff | 55 +++++++
5 files changed, 287 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/Portfile b/graphics/poppler-devel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cc1e314fe8c
</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-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,160 @@
</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 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 legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name poppler-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts poppler xpdf-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 22.05.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} 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;'>+ gentoo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</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 d267b053ed236745ac4989708734b40983854cc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a969ced458e050d6202367bd7427054e2bd19bae39e8f969910d3b9151abf958 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1828628
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append 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;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</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:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nss \
</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;'>+# remove top-level paths, such that internal headers and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libraries are used instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete -I${prefix}/include
</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;'>+gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix Boost checking to be optional
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+# match clang, not strequal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake_modules_PopplerMacros.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix header include path ordering for gobject-introspection call to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# be source / build first, then system, as best can be determined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.compiler} eq "macports-gcc-7"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-poppler-gcc7-noexcept.diff
</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;'>+configure.args-append \
</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;'>+ -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;'>+ -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_QT6_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;'>+ -DBUILD_MANUAL_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_NSS3=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DRUN_GPERF_IF_PRESENT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLIB2_MKENUMS_PYTHON=${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Poppler cmake doesn't understand build type "MacPorts"; use release unless +debug is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</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;'>+variant boost description "Use Boost when building the Splash graphics backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost.version 1.76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_BOOST=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_BOOST=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-qt5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append MOCQT5=${qt_bins_dir}/moc
</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:#e0ffe0;'>+
</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><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;'>+if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract-append port:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# currently poppler only provides unit tests for the Qt wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.dir test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete $dot_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach libpoppler [glob -nocomplain ${destroot}${prefix}/lib/libpoppler.*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${libpoppler}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/include/poppler/fofi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/poppler/goo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/poppler/splash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/pkgconfig/poppler-splash.pc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/pkgconfig/poppler.pc
</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;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}releases.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/files/patch-check-boost.diff b/graphics/poppler-devel/files/patch-check-boost.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9077cc2d69b
</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-devel/files/patch-check-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,11 +195,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for Cairo rendering backend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+- set(USE_BOOST_HEADERS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(ENABLE_BOOST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "-- Boost recommended for Splash. Use ENABLE_BOOST=OFF to skip.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(ENABLE_BOOST)
</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;'>++ set(USE_BOOST_HEADERS ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "-- Boost enabled for Splash but not found.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</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(CAIRO_FOUND)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/files/patch-cmake_modules_PopplerMacros.cmake.diff b/graphics/poppler-devel/files/patch-cmake_modules_PopplerMacros.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a5a0898629
</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-devel/files/patch-cmake_modules_PopplerMacros.cmake.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;'>+--- cmake/modules/PopplerMacros.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/PopplerMacros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_compiler_flags_changed 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set the default compile warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_warn "-Wall -Wextra -Wpedantic")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_warn "${_warn} -Wno-unused-parameter")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff b/graphics/poppler-devel/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e44d89a8233
</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-devel/files/patch-glib_CMakeFiles.txt-fix-include-ordering.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- glib/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ glib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +116,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # General gir: Reset object-list for introspection & load tool args
</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;'>++ list(APPEND INTROSPECTION_SCANNER_ARGS "--library-path=${CMAKE_CURRENT_BINARY_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(INTROSPECTION_COMPILER_ARGS ${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;'>+ # Poppler: Assign package to gir & export keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,9 +128,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Format list of include directories as compiler flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_directory_property(_tmp_includes INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _gir_list_prefix(_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _gir_list_prefix(_tmp2_includes _tmp_includes "-I")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # reorder includes to be interal to build or source first, then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # external, as best we can determine which is which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(_includes "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(_includes_last "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ foreach(_item IN LISTS _tmp2_includes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string(FIND "${_item}" "${CMAKE_BINARY_DIR}" _is_in_build)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT ${_is_in_build} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND _includes "${_item}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string(FIND "${_item}" "${CMAKE_SOURCE_DIR}" _is_in_source)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT ${_is_in_source} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND _includes "${_item}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND _includes_last "${_item}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND _includes ${_includes_last})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # And set flags for gir compiler and scanner
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(Poppler_0_18_gir_CFLAGS ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(Poppler_0_18_gir_CFLAGS -v ${_includes} -L${CMAKE_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(Poppler_0_18_gir_SCANNERFLAGS "--c-include=poppler.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Load temporary source-file lists, including a few generated at build
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler-devel/files/patch-poppler-gcc7-noexcept.diff b/graphics/poppler-devel/files/patch-poppler-gcc7-noexcept.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2e6d8730186
</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-devel/files/patch-poppler-gcc7-noexcept.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GCC7 fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: function 'GfxFontLoc& GfxFontLoc::operator=(GfxFontLoc&&)' defaulted on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+its redeclaration with an exception-specification that differs from the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implicit exception-specification ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: function 'X509CertificateInfo::EntityInfo&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo&&)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+defaulted on its redeclaration with an exception-specification that differs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+from the implicit exception-specification ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- poppler/GfxFont.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ poppler/GfxFont.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxFontLoc::GfxFontLoc(GfxFontLoc &&other) noexcept = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) noexcept = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GfxFontLoc &GfxFontLoc::operator=(GfxFontLoc &&other) = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void GfxFontLoc::setPath(GooString *pathA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- poppler/GfxFont.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ poppler/GfxFont.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +122,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxFontLoc(const GfxFontLoc &) = delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxFontLoc(GfxFontLoc &&) noexcept;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxFontLoc &operator=(const GfxFontLoc &) = delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GfxFontLoc &operator=(GfxFontLoc &&other) noexcept;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GfxFontLoc &operator=(GfxFontLoc &&other);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Set the 'path' string from a GooString on the heap.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Ownership of the object is taken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- poppler/CertificateInfo.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ poppler/CertificateInfo.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509CertificateInfo::EntityInfo::EntityInfo(X509CertificateInfo::EntityInfo &&other) noexcept = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) noexcept = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++X509CertificateInfo::EntityInfo &X509CertificateInfo::EntityInfo::operator=(X509CertificateInfo::EntityInfo &&other) = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X509CertificateInfo::X509CertificateInfo() : ku_extensions(KU_NONE), cert_version(-1), is_self_signed(false) { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- poppler/CertificateInfo.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ poppler/CertificateInfo.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~EntityInfo();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EntityInfo(EntityInfo &&) noexcept;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EntityInfo &operator=(EntityInfo &&) noexcept;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EntityInfo &operator=(EntityInfo &&);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EntityInfo(const EntityInfo &) = delete;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EntityInfo &operator=(const EntityInfo &) = delete;
</span></pre><pre style='margin:0'>
</pre>