Index: head/www/webkit-gtk2/Makefile =================================================================== --- head/www/webkit-gtk2/Makefile (revision 408023) +++ head/www/webkit-gtk2/Makefile (revision 408024) @@ -1,106 +1,107 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.9 +PORTREVISION= 1 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:${PORTSDIR}/textproc/gtk-doc \ p5-Switch>0:${PORTSDIR}/lang/p5-Switch \ 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 PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool \ perl5 pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 introspection:build libxslt USE_GL= gl 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=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} 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 CFLAGS+= -mminimal-toc .endif .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" .endif .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 @${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-1 .include Index: head/www/webkit-gtk2/files/patch-CVE-2014-1748 =================================================================== --- head/www/webkit-gtk2/files/patch-CVE-2014-1748 (nonexistent) +++ head/www/webkit-gtk2/files/patch-CVE-2014-1748 (revision 408024) @@ -0,0 +1,10 @@ +--- ./Source/WebCore/platform/ScrollView.cpp.orig 2016-01-05 21:53:38.202759000 +0100 ++++ ./Source/WebCore/platform/ScrollView.cpp 2016-01-05 21:55:50.429266000 +0100 +@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* + scrollViewDirtyRect.intersect(visibleAreaWithScrollbars); + context->translate(x(), y()); + scrollViewDirtyRect.moveBy(-location()); ++ context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size())); + + paintScrollbars(context, scrollViewDirtyRect); + } Property changes on: head/www/webkit-gtk2/files/patch-CVE-2014-1748 ___________________________________________________________________ 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 408023) +++ head/www/webkit-gtk3/Makefile (revision 408024) @@ -1,115 +1,116 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.4.9 +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 \ p5-Switch>0:${PORTSDIR}/lang/p5-Switch \ 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 PORTSCOUT= limit:1.4.*$$ USE_GSTREAMER1= yes USE_XORG= xt xdamage xcomposite USES= bison compiler:c++11-lib gettext gmake gperf libtool perl5 \ pkgconfig shebangfix sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt USE_GL= gl 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-webkit2 \ --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= 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 CFLAGS+= -mminimal-toc .endif .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:${PORTSDIR}/textproc/flex CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex" .endif .if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 CFLAGS+= -march=i586 .endif .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 @${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-CVE-2014-1748 =================================================================== --- head/www/webkit-gtk3/files/patch-CVE-2014-1748 (nonexistent) +++ head/www/webkit-gtk3/files/patch-CVE-2014-1748 (revision 408024) @@ -0,0 +1,10 @@ +--- ./Source/WebCore/platform/ScrollView.cpp.orig 2016-01-05 21:53:38.202759000 +0100 ++++ ./Source/WebCore/platform/ScrollView.cpp 2016-01-05 21:55:50.429266000 +0100 +@@ -1177,6 +1177,7 @@ void ScrollView::paint(GraphicsContext* + scrollViewDirtyRect.intersect(visibleAreaWithScrollbars); + context->translate(x(), y()); + scrollViewDirtyRect.moveBy(-location()); ++ context->clip(IntRect(IntPoint(), visibleAreaWithScrollbars.size())); + + paintScrollbars(context, scrollViewDirtyRect); + } Property changes on: head/www/webkit-gtk3/files/patch-CVE-2014-1748 ___________________________________________________________________ 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