<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/5a727c78e7d535808da920a4682b4ceca797a81e">https://github.com/macports/macports-ports/commit/5a727c78e7d535808da920a4682b4ceca797a81e</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 5a727c78e7d poppler: fix build with GCC7
</span>5a727c78e7d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5a727c78e7d535808da920a4682b4ceca797a81e
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sat Apr 9 09:30:58 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> poppler: fix build with GCC7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63539
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64652
</span>---
graphics/poppler/Portfile | 4 ++
.../poppler/files/patch-poppler-gcc7-noexcept.diff | 55 ++++++++++++++++++++++
2 files changed, 59 insertions(+)
<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 964583d2715..ea35da35f5f 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;'>@@ -71,6 +71,10 @@ patchfiles-append patch-cmake_modules_PopplerMacros.cmake.diff
</span> # be source / build first, then system, as best can be determined
patchfiles-append patch-glib_CMakeFiles.txt-fix-include-ordering.diff
<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> configure.args-append \
-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
-DENABLE_QT5=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/files/patch-poppler-gcc7-noexcept.diff b/graphics/poppler/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/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>