Attachment 169540 Details for Bug 208961 – Patch to update www/webkit-gtk2

[patch] Patch to update www/webkit-gtk2

webkit-gtk2.diff (text/plain), 4.92 KB, created by Olivier Duchateau on 2016-04-21 19:07:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2016-04-21 19:07:44 UTC

Size: 4.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 413751)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	webkit
>-PORTVERSION=	2.4.9
>-PORTREVISION=	2
>+PORTVERSION=	2.4.11
> CATEGORIES=	www
> MASTER_SITES=	http://webkitgtk.org/releases/
> PKGNAMESUFFIX=	-gtk2
>@@ -28,8 +27,8 @@
> 
> USE_GSTREAMER1=	yes
> USE_XORG=	xt xdamage xcomposite
>-USES=		bison compiler:c++11-lib gettext gmake gperf libtool \
>-		perl5 pkgconfig shebangfix sqlite tar:xz
>+USES=		bison compiler:c++11-lib gettext gmake gperf localbase \
>+		libtool perl5 pkgconfig python shebangfix sqlite tar:xz
> USE_RUBY=	yes
> RUBY_NO_RUN_DEPENDS=yes
> USE_GNOME=	cairo gtk20 introspection:build libxslt
>@@ -38,8 +37,6 @@
> 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 \
>@@ -97,6 +94,9 @@
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
> 		${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
>+	@${REINPLACE_CMD} -e 's|ruby|${RUBY_NAME}|g' \
>+		${WRKSRC}/configure
>+#		${WRKSRC}/Source/autotools/CheckSystemAndBasicDependencies.m4
> 	@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
> 		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 413751)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (webkitgtk-2.4.9.tar.xz) = afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564
>-SIZE (webkitgtk-2.4.9.tar.xz) = 9840740
>+SHA256 (webkitgtk-2.4.11.tar.xz) = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
>+SIZE (webkitgtk-2.4.11.tar.xz) = 9869100
>Index: files/patch-CVE-2014-1748
>===================================================================
>--- files/patch-CVE-2014-1748	(revision 413751)
>+++ files/patch-CVE-2014-1748	(nonexistent)
>@@ -1,10 +0,0 @@
>---- ./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: files/patch-CVE-2014-1748
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 413751)
>+++ pkg-plist	(working copy)
>@@ -255,10 +255,10 @@
> lib/girepository-1.0/WebKit-1.0.typelib
> lib/libjavascriptcoregtk-1.0.so
> lib/libjavascriptcoregtk-1.0.so.0
>-lib/libjavascriptcoregtk-1.0.so.0.16.17
>+lib/libjavascriptcoregtk-1.0.so.0.16.19
> lib/libwebkitgtk-1.0.so
> lib/libwebkitgtk-1.0.so.0
>-lib/libwebkitgtk-1.0.so.0.22.15
>+lib/libwebkitgtk-1.0.so.0.22.17
> libdata/pkgconfig/javascriptcoregtk-1.0.pc
> libdata/pkgconfig/webkit-1.0.pc
> share/gir-1.0/JavaScriptCore-1.0.gir
>@@ -426,7 +426,6 @@
> share/gtk-doc/html/webkit1/webkitdomgtk/home.png
> share/gtk-doc/html/webkit1/webkitdomgtk/index-all.html
> share/gtk-doc/html/webkit1/webkitdomgtk/index.html
>-share/gtk-doc/html/webkit1/webkitdomgtk/index.sgml
> share/gtk-doc/html/webkit1/webkitdomgtk/left-insensitive.png
> share/gtk-doc/html/webkit1/webkitdomgtk/left.png
> share/gtk-doc/html/webkit1/webkitdomgtk/right-insensitive.png
>@@ -499,7 +498,6 @@
> share/gtk-doc/html/webkit1/webkitgtk/index-all.html
> share/gtk-doc/html/webkit1/webkitgtk/index-deprecated.html
> share/gtk-doc/html/webkit1/webkitgtk/index.html
>-share/gtk-doc/html/webkit1/webkitgtk/index.sgml
> share/gtk-doc/html/webkit1/webkitgtk/left-insensitive.png
> share/gtk-doc/html/webkit1/webkitgtk/left.png
> share/gtk-doc/html/webkit1/webkitgtk/right-insensitive.png
>@@ -532,6 +530,7 @@
> share/locale/hu/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/id/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/it/LC_MESSAGES/WebKitGTK-2.0.mo
>+share/locale/ja/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/kn/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/ko/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/lt/LC_MESSAGES/WebKitGTK-2.0.mo
>@@ -556,6 +555,7 @@
> share/locale/uk/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/vi/LC_MESSAGES/WebKitGTK-2.0.mo
> share/locale/zh_CN/LC_MESSAGES/WebKitGTK-2.0.mo
>+share/locale/zh_TW/LC_MESSAGES/WebKitGTK-2.0.mo
> share/webkitgtk-1.0/images/deleteButton.png
> share/webkitgtk-1.0/images/inputSpeech.png
> share/webkitgtk-1.0/images/missingImage.png

Actions: View | Diff

Attachments on bug 208961: 169540 | 169541 | 169542 | 169543