Index: head/www/webkit-gtk2/Makefile =================================================================== --- head/www/webkit-gtk2/Makefile (revision 374912) +++ head/www/webkit-gtk2/Makefile (revision 374913) @@ -1,94 +1,94 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/trunk/www/webkit-gtk2/Makefile 20029 2014-11-02 20:54:47Z kwm $ PORTNAME= webkit PORTVERSION= 1.8.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine BUILD_DEPENDS= flex>=0:${PORTSDIR}/textproc/flex \ gtkdoc-check:${PORTSDIR}/textproc/gtk-doc LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libicutu.so:${PORTSDIR}/devel/icu \ libcurl.so:${PORTSDIR}/ftp/curl \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup USE_GSTREAMER= yes USE_XORG= xt USES= bison gettext gmake gperf libtool perl5 pkgconfig tar:xz USE_GNOME= gtk20 libxslt introspection:build USE_SQLITE= 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 INSTALL_TARGET= install-strip 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 .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif CCISCLANG!= ${CC} --version .if !empty(CCISCLANG:M*clang*) CPPFLAGS+= -Wno-c++11-extensions .endif .include .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' @${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|"${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__jit__ExecutableAllocator.h =================================================================== --- head/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h (nonexistent) +++ head/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.h (revision 374913) @@ -0,0 +1,14 @@ +--- Source/JavaScriptCore/jit/ExecutableAllocator.h.orig 2014-10-15 14:25:58 UTC ++++ Source/JavaScriptCore/jit/ExecutableAllocator.h +@@ -223,6 +223,11 @@ + UNUSED_PARAM(size); + #endif + } ++#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #else + #error "The cacheFlush support is missing on this platform." + #endif Property changes on: head/www/webkit-gtk2/files/patch-Source__JavaScriptCore__jit__ExecutableAllocator.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-gtk3/Makefile =================================================================== --- head/www/webkit-gtk3/Makefile (revision 374912) +++ head/www/webkit-gtk3/Makefile (revision 374913) @@ -1,135 +1,136 @@ # Created by: Michael Johnson # $FreeBSD$ # $MCom: ports/trunk/www/webkit-gtk3/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= webkit PORTVERSION= 2.4.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit BUILD_DEPENDS= gtkdoc-rebase:${PORTSDIR}/textproc/gtk-doc \ geoclue>=0:${PORTSDIR}/net/geoclue LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ libsecret-1.so:${PORTSDIR}/security/libsecret \ libicutu.so:${PORTSDIR}/devel/icu \ libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libwebp.so:${PORTSDIR}/graphics/webp \ libcurl.so:${PORTSDIR}/ftp/curl \ libsoup-2.4.so:${PORTSDIR}/devel/libsoup RUN_DEPENDS= geoclue>=0:${PORTSDIR}/net/geoclue USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison gettext gmake gperf libtool perl5 \ pkgconfig shebangfix tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt USE_SQLITE= 3 USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_DOLT_BASH="" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=3.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-introspection MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} #CONFIGURE_ARGS+=--disable-silent-rules CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 # --with-acceleration-backend=opengl # clutter broken? # opengl, clutter, none (clutter unsupported) SHEBANG_FILES= \ Source/JavaScriptCore/create_hash_table \ Source/JavaScriptCore/inspector/scripts/xxd.pl \ Source/WebCore/css/*.pl \ Source/WebCore/dom/*.pl \ Source/WebCore/make-hash-tools.pl \ Source/WebCore/page/make_settings.pl \ Source/WebCore/platform/text/mac/make-charset-table.pl \ Source/WebKit2/Scripts/generate-forwarding-headers.pl \ Source/WebCore/bindings/scripts/*.p[lm] \ Source/JavaScriptCore/create_hash_table BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= WEBGL WEBAUDIO DEBUG FULLDEBUG OPTIONS_DEFAULT=WEBGL WEBAUDIO WEBAUDIO_DESC= Web audio support WEBGL_DESC= Enable Web GL support DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support WEBGL_CONFIGURE_ENABLE= webgl WEBGL_USE= GL=gl WEBAUDIO_CONFIGURE_ENABLE= web-audio FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include # gtest to use while libc++ only has CPPFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE # Shutup warning spam CXXFLAGS+= -Wno-c++11-extensions -Qunused-arguments CONFIGURE_ARGS+=--enable-webkit2 # We need clang + libc++ or gcc 4.7+. gcc has libstdc++ conflict between # gcc port and base. This originates from icu .if ${OSVERSION} < 900000 BROKEN= Fails to build .endif .if ${OSVERSION}<1000019 CXXFLAGS+= -stdlib=libc++ -I${LOCALBASE}/include/c++/v1 LDFLAGS+= -stdlib=libc++ BUILD_DEPENDS+= clang34>=3.4:${PORTSDIR}/lang/clang34 \ libc++>=0:${PORTSDIR}/devel/libc++ RUN_DEPENDS+= libc++>=0:${PORTSDIR}/devel/libc++ CC= clang34 CXX= clang++34 CPP= clang-cpp34 CONFIGURE_ENV+= CC=${CC} CXX=${CXX} CPP=${CPP} .endif .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${PERL_LEVEL} >= 501400 BUILD_DEPENDS+= p5-Switch>0:${PORTSDIR}/lang/p5-Switch .endif .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp @${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-3 ${INSTALL_PROGRAM} ${WRKSRC}/Programs/MiniBrowser \ ${STAGEDIR}${PREFIX}/bin/MiniBrowser-3 .include Index: head/www/webkit-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h =================================================================== --- head/www/webkit-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h (nonexistent) +++ head/www/webkit-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h (revision 374913) @@ -0,0 +1,11 @@ +--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2014-12-15 04:13:43.336068961 +0000 ++++ Source/JavaScriptCore/assembler/ARMAssembler.h 2014-12-15 04:13:49.213068201 +0000 +@@ -1121,6 +1121,8 @@ + linuxPageFlush(current, end); + #elif OS(WINCE) + CacheRangeFlush(code, size, CACHE_SYNC_ALL); ++#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif Property changes on: head/www/webkit-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.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