Index: head/www/webkit-gtk2/Makefile =================================================================== --- head/www/webkit-gtk2/Makefile (revision 435960) +++ head/www/webkit-gtk2/Makefile (revision 435961) @@ -1,105 +1,113 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.11 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= -gtk2 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 2 toolkit BUILD_DEPENDS= gtkdoc-rebase:textproc/gtk-doc \ p5-Switch>0:lang/p5-Switch \ python:lang/python \ geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ + libpng16.so:graphics/png \ libwebp.so:graphics/webp \ libcurl.so:ftp/curl \ - libsoup-2.4.so:devel/libsoup + libsoup-2.4.so:devel/libsoup \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgstbase-1.0.so:multimedia/gstreamer1 \ + libgstreamer-1.0.so:multimedia/gstreamer1 RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limit:^2\.4\. USE_GSTREAMER1= yes -USE_XORG= xt xdamage xcomposite -USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \ - pathfix perl5 pkgconfig shebangfix sqlite tar:xz +USE_XORG= x11 xcomposite xdamage xfixes xrender xt +USES= bison compiler:c++11-lib gettext gmake gperf jpeg libtool \ + localbase pathfix perl5 pkgconfig shebangfix sqlite tar:xz PATHFIX_MAKEFILEIN= GNUmakefile.in USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes -USE_GNOME= cairo gtk20 introspection:build libxslt +USE_GNOME= cairo gdkpixbuf2 gtk20 introspection:build libxslt USE_GL= gl USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= AR=/usr/bin/ar \ ac_cv_path_DOLT_BASH="" INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-gtk=2.0 \ --enable-svg-fonts \ --enable-geolocation \ --enable-introspection \ --disable-webkit2 \ --with-html-dir=${PREFIX}/share/gtk-doc/html/webkit1 MAKEFILE= GNUmakefile MAKE_ENV= XDG_CACHE_HOME=${WRKDIR} -BROKEN_sparc64= attempts to use x86 assembler - CONFIGURE_ARGS+=--disable-egl \ --disable-gles2 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-gtk2 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_ON= --enable-debug-symbols=yes DEBUG_CONFIGURE_OFF= --disable-debug-symbols .include + +.if ${ARCH} == powerpc64 || ${ARCH} == powerpc || ${ARCH} == sparc64 +CONFIGURE_ARGS+= --disable-jit +CFLAGS+= -DENABLE_YARR_JIT=0 +.endif .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .include .if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-extensions # Shutup warning spam CXXFLAGS+= -Qunused-arguments .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp # Since ruby 2.2 there is no ruby symlink @${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \ ${WRKSRC}/configure post-install: ${INSTALL_PROGRAM} ${WRKSRC}/Programs/GtkLauncher \ ${STAGEDIR}${PREFIX}/bin/GtkLauncher-1 .include Index: head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h =================================================================== --- head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h (revision 435960) +++ head/www/webkit-gtk2/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h (revision 435961) @@ -1,11 +1,11 @@ ---- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2015-01-19 21:25:28.000000000 +0000 -+++ Source/JavaScriptCore/assembler/ARMAssembler.h 2015-01-19 21:25:57.000000000 +0000 +--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2016-04-10 06:48:36 UTC ++++ Source/JavaScriptCore/assembler/ARMAssembler.h @@ -1121,6 +1121,8 @@ namespace JSC { 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 Index: head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp =================================================================== --- head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (nonexistent) +++ head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp (revision 435961) @@ -0,0 +1,11 @@ +--- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2016-04-10 06:48:37 UTC ++++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL + "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL + "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL + "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL +- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL ++ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL + // The color values are stored in-place. + "strb r2, [" PIXELS_R ", #-11]" NL + "strb r3, [" PIXELS_R ", #-10]" NL Property changes on: head/www/webkit-gtk2/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.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-Source_WebCore_plugins_PluginDatabase.cpp =================================================================== --- head/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp (revision 435960) +++ head/www/webkit-gtk2/files/patch-Source_WebCore_plugins_PluginDatabase.cpp (revision 435961) @@ -1,10 +1,10 @@ ---- Source/WebCore/plugins/PluginDatabase.cpp.orig 2011-01-11 16:24:29.000000000 +0000 -+++ Source/WebCore/plugins/PluginDatabase.cpp 2011-01-11 16:24:54.000000000 +0000 -@@ -375,6 +375,7 @@ Vector PluginDatabase::defaultPl +--- Source/WebCore/plugins/PluginDatabase.cpp.orig 2016-04-10 06:48:37 UTC ++++ Source/WebCore/plugins/PluginDatabase.cpp +@@ -394,6 +394,7 @@ Vector PluginDatabase::defaultPl userPluginPath.append(String("/.netscape/plugins")); paths.append(userPluginPath); + paths.append("%%BROWSER_PLUGINS_DIR%%"); paths.append("/usr/lib/browser/plugins"); paths.append("/usr/local/lib/mozilla/plugins"); paths.append("/usr/lib/firefox/plugins");