[144738] trunk/dports/www/webkit2-gtk
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jan 16 15:06:19 PST 2016
Revision: 144738
https://trac.macports.org/changeset/144738
Author: jeremyhu at macports.org
Date: 2016-01-16 15:06:19 -0800 (Sat, 16 Jan 2016)
Log Message:
-----------
webkit2-gtk: Add support for +llvm39, remove +video variant, re-add assert/raise/abort interposition, add +minibrowser variant, use system malloc
Modified Paths:
--------------
trunk/dports/www/webkit2-gtk/Portfile
Removed Paths:
-------------
trunk/dports/www/webkit2-gtk/files/PR-152641.patch
Modified: trunk/dports/www/webkit2-gtk/Portfile
===================================================================
--- 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)
@@ -12,7 +12,7 @@
name webkit2-gtk
version 2.11.3
-revision 2
+revision 3
description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers jeremyhu devans
@@ -49,6 +49,10 @@
port:geoclue2 \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gobject-introspection \
+ port:gstreamer1 \
+ port:gstreamer1-gst-plugins-bad \
+ port:gstreamer1-gst-plugins-base \
+ port:gstreamer1-gst-plugins-good \
port:gtk3 \
port:harfbuzz-icu \
port:hyphen \
@@ -65,38 +69,45 @@
port:xorg-libXt \
port:zlib
-variant llvm37 conflicts llvm38 description {Use llvm-3.7} {
+variant llvm37 conflicts llvm38 llvm39 description {Use llvm-3.7} {
depends_lib-append port:llvm-3.7
configure.args-append -DLLVM_CONFIG_EXE=${prefix}/bin/llvm-config-mp-3.7
}
-variant llvm38 conflicts llvm37 description {Use llvm-3.8} {
+variant llvm38 conflicts llvm37 llvm39 description {Use llvm-3.8} {
depends_lib-append port:llvm-3.8
configure.args-append -DLLVM_CONFIG_EXE=${prefix}/bin/llvm-config-mp-3.8
}
-if {![variant_isset llvm37] && ![variant_isset llvm38]} {
+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]} {
default_variants-append +llvm37
}
-# PR-152641.patch: https://bugs.webkit.org/show_bug.cgi?id=152641
# PR-152720.patch: https://bugs.webkit.org/show_bug.cgi?id=152720
# PR-153117.patch: https://bugs.webkit.org/show_bug.cgi?id=153117
# PR-153120.patch: https://bugs.webkit.org/show_bug.cgi?id=153120
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
patchfiles-append \
- PR-152641.patch \
PR-152720.patch \
PR-153117.patch \
PR-153120.patch \
PR-153138.patch
-conflicts_build google-test
+# Build out-of-tree
+configure.post_args ../${worksrcdir}
+default configure.dir {${workpath}/build}
+default build.dir {${workpath}/build}
configure.args-append \
-DPORT=GTK \
-DENABLE_X11_TARGET=ON \
-DENABLE_QUARTZ_TARGET=OFF \
+ -DUSE_SYSTEM_MALLOC=ON \
+ -DENABLE_MINIBROWSER=OFF \
-DENABLE_PLUGIN_PROCESS_GTK2=OFF \
- -DENABLE_VIDEO=OFF
+ -DENABLE_VIDEO=ON
# https://bugs.webkit.org/show_bug.cgi?id=152650
configure.args-append -DENABLE_INTROSPECTION=OFF
@@ -140,10 +151,9 @@
port:xorg-libXt
}
-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
+variant minibrowser description {Build and install MiniBrowser (for testing)} {
+ configure.args-delete -DENABLE_MINIBROWSER=OFF
+ configure.args-append -DENABLE_MINIBROWSER=ON
}
variant gtk2 description {Enable support for GTK+2 plugins} {
@@ -152,14 +162,14 @@
configure.args-append -DENABLE_PLUGIN_PROCESS_GTK2=ON
}
-default_variants +video +gtk2
+default_variants +gtk2
post-destroot {
# https://bugs.webkit.org/show_bug.cgi?id=152651
- 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
+ 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
ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.37.dylib
ln -s libwebkit2gtk-4.0.37.13.0.dylib ${destroot}${prefix}/lib/libwebkit2gtk-4.0.dylib
}
Deleted: trunk/dports/www/webkit2-gtk/files/PR-152641.patch
===================================================================
--- 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)
@@ -1,27 +0,0 @@
---- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160116/14e7cf56/attachment.html>
More information about the macports-changes
mailing list