<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[144738] trunk/dports/www/webkit2-gtk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/144738">144738</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-01-16 15:06:19 -0800 (Sat, 16 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit2-gtk: Add support for +llvm39, remove +video variant, re-add assert/raise/abort interposition, add +minibrowser variant, use system malloc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkPortfile">trunk/dports/www/webkit2-gtk/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportswwwwebkit2gtkfilesPR152641patch">trunk/dports/www/webkit2-gtk/files/PR-152641.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwwebkit2gtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/webkit2-gtk/Portfile (144737 => 144738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/Portfile 2016-01-16 22:39:51 UTC (rev 144737)
+++ trunk/dports/www/webkit2-gtk/Portfile 2016-01-16 23:06:19 UTC (rev 144738)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> name webkit2-gtk
</span><span class="cx"> version 2.11.3
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
</span><span class="cx"> long_description ${description}
</span><span class="cx"> maintainers jeremyhu devans
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> port:geoclue2 \
</span><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> port:gobject-introspection \
</span><ins>+ port:gstreamer1 \
+ port:gstreamer1-gst-plugins-bad \
+ port:gstreamer1-gst-plugins-base \
+ port:gstreamer1-gst-plugins-good \
</ins><span class="cx"> port:gtk3 \
</span><span class="cx"> port:harfbuzz-icu \
</span><span class="cx"> port:hyphen \
</span><span class="lines">@@ -65,38 +69,45 @@
</span><span class="cx"> port:xorg-libXt \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-variant llvm37 conflicts llvm38 description {Use llvm-3.7} {
</del><ins>+variant llvm37 conflicts llvm38 llvm39 description {Use llvm-3.7} {
</ins><span class="cx"> depends_lib-append port:llvm-3.7
</span><span class="cx"> configure.args-append -DLLVM_CONFIG_EXE=${prefix}/bin/llvm-config-mp-3.7
</span><span class="cx"> }
</span><del>-variant llvm38 conflicts llvm37 description {Use llvm-3.8} {
</del><ins>+variant llvm38 conflicts llvm37 llvm39 description {Use llvm-3.8} {
</ins><span class="cx"> depends_lib-append port:llvm-3.8
</span><span class="cx"> configure.args-append -DLLVM_CONFIG_EXE=${prefix}/bin/llvm-config-mp-3.8
</span><span class="cx"> }
</span><del>-if {![variant_isset llvm37] && ![variant_isset llvm38]} {
</del><ins>+variant llvm39 conflicts llvm37 llvm38 description {Use llvm-3.9} {
+ depends_lib-append port:llvm-3.9
+ configure.args-append -DLLVM_CONFIG_EXE=${prefix}/bin/llvm-config-mp-3.9
+}
+if {![variant_isset llvm37] && ![variant_isset llvm38] && ![variant_isset llvm39]} {
</ins><span class="cx"> default_variants-append +llvm37
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# PR-152641.patch: https://bugs.webkit.org/show_bug.cgi?id=152641
</del><span class="cx"> # PR-152720.patch: https://bugs.webkit.org/show_bug.cgi?id=152720
</span><span class="cx"> # PR-153117.patch: https://bugs.webkit.org/show_bug.cgi?id=153117
</span><span class="cx"> # PR-153120.patch: https://bugs.webkit.org/show_bug.cgi?id=153120
</span><span class="cx"> # PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><span class="cx"> patchfiles-append \
</span><del>- PR-152641.patch \
</del><span class="cx"> PR-152720.patch \
</span><span class="cx"> PR-153117.patch \
</span><span class="cx"> PR-153120.patch \
</span><span class="cx"> PR-153138.patch
</span><span class="cx">
</span><del>-conflicts_build google-test
</del><ins>+# Build out-of-tree
+configure.post_args ../${worksrcdir}
+default configure.dir {${workpath}/build}
+default build.dir {${workpath}/build}
</ins><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DPORT=GTK \
</span><span class="cx"> -DENABLE_X11_TARGET=ON \
</span><span class="cx"> -DENABLE_QUARTZ_TARGET=OFF \
</span><ins>+ -DUSE_SYSTEM_MALLOC=ON \
+ -DENABLE_MINIBROWSER=OFF \
</ins><span class="cx"> -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
</span><del>- -DENABLE_VIDEO=OFF
</del><ins>+ -DENABLE_VIDEO=ON
</ins><span class="cx">
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=152650
</span><span class="cx"> configure.args-append -DENABLE_INTROSPECTION=OFF
</span><span class="lines">@@ -140,10 +151,9 @@
</span><span class="cx"> port:xorg-libXt
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant video description {Enable HTML5 video support using gstreamer} {
- depends_lib-append port:gstreamer1-gst-plugins-base
- configure.args-delete -DENABLE_VIDEO=OFF
- configure.args-append -DENABLE_VIDEO=ON
</del><ins>+variant minibrowser description {Build and install MiniBrowser (for testing)} {
+ configure.args-delete -DENABLE_MINIBROWSER=OFF
+ configure.args-append -DENABLE_MINIBROWSER=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant gtk2 description {Enable support for GTK+2 plugins} {
</span><span class="lines">@@ -152,14 +162,14 @@
</span><span class="cx"> configure.args-append -DENABLE_PLUGIN_PROCESS_GTK2=ON
</span><span class="cx"> }
</span><span class="cx">
</span><del>-default_variants +video +gtk2
</del><ins>+default_variants +gtk2
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> # https://bugs.webkit.org/show_bug.cgi?id=152651
</span><del>- xinstall -m 755 ${worksrcpath}/bin/LLIntOffsetsExtractor ${destroot}${prefix}/libexec/webkit2gtk-4.0
- xinstall -m 755 ${worksrcpath}/bin/WebKitWebProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
- xinstall -m 755 ${worksrcpath}/bin/WebKitNetworkProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
- xinstall -m 755 ${worksrcpath}/lib/libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib
</del><ins>+ xinstall -m 755 ${build.dir}/bin/LLIntOffsetsExtractor ${destroot}${prefix}/libexec/webkit2gtk-4.0
+ xinstall -m 755 ${build.dir}/bin/WebKitWebProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
+ xinstall -m 755 ${build.dir}/bin/WebKitNetworkProcess ${destroot}${prefix}/libexec/webkit2gtk-4.0
+ xinstall -m 755 ${build.dir}/lib/libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib
</ins><span class="cx"> ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
</span><span class="cx"> ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportswwwwebkit2gtkfilesPR152641patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/www/webkit2-gtk/files/PR-152641.patch (144737 => 144738)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/webkit2-gtk/files/PR-152641.patch 2016-01-16 22:39:51 UTC (rev 144737)
+++ trunk/dports/www/webkit2-gtk/files/PR-152641.patch 2016-01-16 23:06:19 UTC (rev 144738)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>---- Source/JavaScriptCore/llvm/library/LLVMOverrides.cpp.orig 2015-10-27 03:17:11.000000000 -0700
-+++ Source/JavaScriptCore/llvm/library/LLVMOverrides.cpp 2016-01-01 14:56:49.000000000 -0800
-@@ -36,24 +36,5 @@ void (*g_llvmTrapCallback)(const char* m
-
- // If LLVM tries to raise signals, abort, or fail an assertion, then let
- // WebKit handle it instead of trapping.
--extern "C" int raise(int signal);
--extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression) NO_RETURN;
--extern "C" void abort(void) NO_RETURN;
--
--extern "C" int raise(int signal)
--{
-- g_llvmTrapCallback("raise(%d) called.", signal);
-- return 0;
--}
--extern "C" void __assert_rtn(const char* function, const char* filename, int lineNumber, const char* expression)
--{
-- if (function)
-- g_llvmTrapCallback("Assertion failed: (%s), function %s, file %s, line %d.", expression, function, filename, lineNumber);
-- g_llvmTrapCallback("Assertion failed: (%s), file %s, line %d.", expression, filename, lineNumber);
--}
--extern "C" void abort(void)
--{
-- g_llvmTrapCallback("abort() called.");
--}
-
- #endif // HAVE(LLVM)
</del></span></pre>
</div>
</div>
</body>
</html>