Date: Wed, 19 Aug 2015 08:14:20 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394759 - in head/www/webkit2-gtk3: . files Message-ID: <201508190814.t7J8EK5u017406@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Wed Aug 19 08:14:19 2015 New Revision: 394759 URL: https://svnweb.freebsd.org/changeset/ports/394759 Log: Add patch so we can start using USES=cmake instead of custom code. Thanks go to rakuco@ for helping to dig into webkit cmake stuff and Ting-Wei_Lan for digging deeper and figuring out the patch [1]. Obtained from: webkit upstream [1] Added: head/www/webkit2-gtk3/files/patch-bug147816 (contents, props changed) Modified: head/www/webkit2-gtk3/Makefile Modified: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Wed Aug 19 08:13:15 2015 (r394758) +++ head/www/webkit2-gtk3/Makefile Wed Aug 19 08:14:19 2015 (r394759) @@ -27,8 +27,7 @@ PORTSCOUT= limitw:1,even USE_GSTREAMER1= yes USE_XORG= x11 xext ice -# when it USES=cmake safe -USES= bison compiler:c++11-lib gettext gmake gperf jpeg perl5 \ +USES= bison cmake compiler:c++11-lib gettext gmake gperf jpeg perl5 \ pkgconfig python:2 tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes @@ -40,24 +39,9 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake -#USES=cmake is not used because it triggers: -#Linking CXX executable ../../../bin/jsc -#../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::inherits(JSC::ClassInfo const*) const' -#../../../lib/libjavascriptcoregtk-4.0.so.18.0.8: undefined reference to `JSC::JSCell::structure() const' -#c++: error: linker command failed with exit code 1 (use -v to see invocation) -#Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/build.make:94: recipe for target 'bin/jsc' failed -# there is something in CONFIGURE_ENV that cause this ... but what. - -CMAKE_ARGS+= -DPORT=GTK -CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="${CC}" CXX="${CXX}" CPP="${CPP}" - -#CMAKE_ARGS+= -GNinja -DUSE_LD_GOLD:BOOL=0 -#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=1 -#MAKE_ARGS+= V=1 VERBOSE=1 +CMAKE_ARGS+= -DPORT=GTK \ + -DUSE_LD_GOLD:BOOL=0 +CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", @@ -90,10 +74,6 @@ pre-configure: @${FALSE} .endif -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \ - ${CONFIGURE_ENV} cmake -DPORT=GTK ${CMAKE_ARGS} - post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/jsc \ ${STAGEDIR}/${PREFIX}/bin/jsc-4 Added: head/www/webkit2-gtk3/files/patch-bug147816 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/webkit2-gtk3/files/patch-bug147816 Wed Aug 19 08:14:19 2015 (r394759) @@ -0,0 +1,32 @@ +https://bugs.webkit.org/show_bug.cgi?id=147816 + +--- Source/JavaScriptCore/llint/LLIntEntrypoint.cpp ++++ Source/JavaScriptCore/llint/LLIntEntrypoint.cpp +@@ -28,6 +28,7 @@ + #include "CodeBlock.h" + #include "HeapInlines.h" + #include "JITCode.h" ++#include "JSCellInlines.h" + #include "JSObject.h" + #include "LLIntThunks.h" + #include "LowLevelInterpreter.h" +--- Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp ++++ Source/JavaScriptCore/runtime/FunctionExecutableDump.cpp +@@ -25,6 +25,7 @@ + + #include "config.h" + #include "FunctionExecutableDump.h" ++#include "JSCellInlines.h" + + #include "CodeBlock.h" + +--- Source/WebCore/editing/InsertNodeBeforeCommand.cpp.orig 2015-08-06 10:21:28.000000000 +0200 ++++ Source/WebCore/editing/InsertNodeBeforeCommand.cpp 2015-08-18 16:48:41.950995000 +0200 +@@ -29,6 +29,7 @@ + #include "AXObjectCache.h" + #include "Document.h" + #include "ExceptionCodePlaceholder.h" ++#include "RenderElement.h" + #include "htmlediting.h" + + namespace WebCore {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508190814.t7J8EK5u017406>