Index: head/www/webkit-gtk2/Makefile =================================================================== --- head/www/webkit-gtk2/Makefile (revision 326960) +++ head/www/webkit-gtk2/Makefile (revision 326961) @@ -1,97 +1,103 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/www/webkit-gtk2/Makefile,v 1.92 2013/03/09 09:12:39 kwm Exp $ PORTNAME= webkit PORTVERSION= 1.8.3 PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 MAINTAINER= gnome@FreeBSD.org COMMENT= An opensource browser engine BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ icutu:${PORTSDIR}/devel/icu \ curl:${PORTSDIR}/ftp/curl \ soup-2.4:${PORTSDIR}/devel/libsoup USE_XZ= yes USE_PYTHON_BUILD= yes USE_GSTREAMER= yes USE_XORG= xt USES= bison pkgconfig gettext USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_GNOME= gtk20 libxslt ltverhack USE_SQLITE= yes USE_PERL5= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_FLEX="${LOCALBASE}/bin/flex" \ ZLIB_CFLAGS="-I/usr/include" \ ZLIB_LIBS="-L/usr/lib -lz" \ ac_cv_path_DOLT_BASH="" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-gtk=2.0 \ --enable-svg-fonts \ --disable-geolocation \ --enable-introspection MAKEFILE= GNUmakefile BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= WEBGL DEBUG OPTIONS_DEFAULT=WEBGL WEBGL_DESC= Enable Web GL support .include .if ${PORT_OPTIONS:MWEBGL} USE_GL= gl CONFIGURE_ARGS+=--enable-webgl .else CONFIGURE_ARGS+=--disable-webgl .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .else CONFIGURE_ARGS+=--disable-debug .endif +CCISCLANG!= ${CC} --version + +.if !empty(CCISCLANG:M*clang*) +CPPFLAGS+= -Wno-c++11-extensions +.endif + .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .if ${PERL_LEVEL} >= 501400 BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp @${FIND} ${WRKSRC} -name GNUmakefile.* | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' # disable static library. @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|' \ ${WRKDIR}/gnome-libtool @${REINPLACE_CMD} -e 's|/usr/bin/gcc|${CC}|' \ ${WRKSRC}/Source/WebCore/dom/make_names.pl \ ${WRKSRC}/Source/WebCore/css/make-css-file-arrays.pl \ ${WRKSRC}/Source/WebCore/bindings/scripts/IDLParser.pm @${REINPLACE_CMD} -e 's|"gperf|"${LOCALBASE}/bin/gperf|g' \ ${WRKSRC}/Source/WebCore/css/makevalues.pl \ ${WRKSRC}/Source/WebCore/css/makeprop.pl \ ${WRKSRC}/Source/WebCore/make-hash-tools.pl .include Index: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h =================================================================== --- head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h (nonexistent) +++ head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h (revision 326961) @@ -0,0 +1,45 @@ +--- Source/JavaScriptCore/wtf/Atomics.h.orig 2013-09-06 13:54:07.000000000 +0200 ++++ Source/JavaScriptCore/wtf/Atomics.h 2013-09-06 13:55:58.000000000 +0200 +@@ -65,18 +65,10 @@ + + #if OS(WINDOWS) + #include +-#elif OS(DARWIN) +-#include + #elif OS(QNX) + #include + #elif OS(ANDROID) + #include +-#elif COMPILER(GCC) +-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) +-#include +-#else +-#include +-#endif + #endif + + namespace WTF { +@@ -92,12 +84,6 @@ inline int atomicIncrement(int volatile* + inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(reinterpret_cast(addend)); } + #endif + +-#elif OS(DARWIN) +-#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 +- +-inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast(addend)); } +-inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast(addend)); } +- + #elif OS(QNX) + #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 + +@@ -113,8 +99,8 @@ inline int atomicDecrement(int volatile* + #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc + #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 + +-inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; } +-inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; } ++inline int atomicIncrement(int volatile* addend) { return __sync_add_and_fetch(addend, 1); } ++inline int atomicDecrement(int volatile* addend) { return __sync_sub_and_fetch(addend, 1); } + + #endif + Property changes on: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_Atomics.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h =================================================================== --- head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h (nonexistent) +++ head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h (revision 326961) @@ -0,0 +1,16 @@ +--- Source/JavaScriptCore/wtf/DisallowCType.h.orig 2012-08-20 18:26:04.000000000 +0200 ++++ Source/JavaScriptCore/wtf/DisallowCType.h 2013-09-11 12:41:07.000000000 +0200 +@@ -35,6 +35,13 @@ + // ASCII-specific functions instead. This header makes sure we get a compile-time + // error if we use one of the functions by accident. + ++// Include inlined functions using first to avoid compilation errors ++#ifdef __cplusplus ++#include ++#include ++#include ++#endif ++ + #include + + #undef isalnum Property changes on: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_wtf_DisallowCType.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp =================================================================== --- head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp (nonexistent) +++ head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp (revision 326961) @@ -0,0 +1,10 @@ +--- Tools/DumpRenderTree/gtk/DumpRenderTree.cpp.orig 2012-08-20 18:26:18.000000000 +0200 ++++ Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2013-09-11 12:28:29.000000000 +0200 +@@ -48,6 +48,7 @@ + #include "WorkQueueItem.h" + #include + #include ++#include + #include + #include + #include Property changes on: head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp =================================================================== --- head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp (nonexistent) +++ head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp (revision 326961) @@ -0,0 +1,10 @@ +--- Tools/DumpRenderTree/gtk/ImageDiff.cpp.orig 2013-09-11 12:29:19.000000000 +0200 ++++ Tools/DumpRenderTree/gtk/ImageDiff.cpp 2013-09-11 12:29:38.000000000 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + Property changes on: head/www/webkit-gtk2/files/patch-Tools_DumpRenderTree_gtk_ImageDiff.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property