<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/92fca5b526a7ff65bbff5763b5d7737712abef69">https://github.com/macports/macports-ports/commit/92fca5b526a7ff65bbff5763b5d7737712abef69</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 92fca5b webkit2-gtk: fix bad_optional_access build error
</span>92fca5b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92fca5b526a7ff65bbff5763b5d7737712abef69
</span>Author: Jonathan Stickel <jjstickel@gmail.com>
AuthorDate: Wed Jul 3 15:29:39 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: fix bad_optional_access build error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * apply upstream patch
</span>---
www/webkit2-gtk/Portfile | 4 +++-
www/webkit2-gtk/files/patch_bad_optional_access.diff | 15 +++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d50331a..01ec202 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,6 +13,7 @@ PortGroup cxx11 1.1
</span> name webkit2-gtk
conflicts webkit2-gtk-devel
version 2.20.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +81,8 @@ patchfiles-append \
</span> PR-157574.patch \
patch-bundle-link-webcore.diff \
patch-enable-plugin-architecture-unix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-name-conflicts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-name-conflicts.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch_bad_optional_access.diff
</span>
# Source/WTF/wtf/RAMSize.cpp has changed, and the Darwin parts were
# stripped out. Replace it with the previous version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch_bad_optional_access.diff b/www/webkit2-gtk/files/patch_bad_optional_access.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..508b5fd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch_bad_optional_access.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/Optional.h (revision 235660)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/Optional.h (revision 235661)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,12 +278,4 @@
</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;'>+-// 20.5.8, class bad_optional_access
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class bad_optional_access : public std::logic_error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
</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;'>+ template <class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union storage_t
</span></pre><pre style='margin:0'>
</pre>