svn commit: r414650 - in branches/2016Q2/www: webkit-gtk2 webkit-gtk2/files webkit-gtk3 webkit-gtk3/files
Ruslan Makhmatkhanov
rm at FreeBSD.org
Thu May 5 16:42:58 UTC 2016
Author: rm
Date: Thu May 5 16:42:56 2016
New Revision: 414650
URL: https://svnweb.freebsd.org/changeset/ports/414650
Log:
MFH: r414478 r414649
www/webkit-gtk[23]: update to 2.4.10
Merged from freebsd-ports-gnome development repo.
Reviewed by: kwm
With hat: gnome
www/webkit-gtk[23]: update to 2.4.11
- update to 2.4.11
- fix build with Ruby 2.2 default version (ruby symlink doesn't exist anymore)
- replace CPPFLAGS and LDFLAGS by USES= localbase
- fix couple of whitespace bugs
PR: 208961
PR: 208192
Submitted by: olivierd
Reviewed by: kwm
With hat: gnome
- fix build of webkit-gtk2 on ARM platforms
PR: 208569
Reported by: otacilio.neto at bsd.com.br
Submitted by: mikael.urankar at gmail.com
- fix build of webkit-gtk[23] when GNU binutils is installed
PR: 195500
PR: 196333
Submitted by: Christoph Moench-Tegeder <cmt at burggraben.net>
Approved by: ports-secteam (feld)
Added:
branches/2016Q2/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
- copied unchanged from r414649, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h
Deleted:
branches/2016Q2/www/webkit-gtk2/files/patch-CVE-2014-1748
branches/2016Q2/www/webkit-gtk3/files/patch-CVE-2014-1748
Modified:
branches/2016Q2/www/webkit-gtk2/Makefile
branches/2016Q2/www/webkit-gtk2/distinfo
branches/2016Q2/www/webkit-gtk2/pkg-plist
branches/2016Q2/www/webkit-gtk3/Makefile
branches/2016Q2/www/webkit-gtk3/distinfo
branches/2016Q2/www/webkit-gtk3/pkg-plist
Directory Properties:
branches/2016Q2/ (props changed)
Modified: branches/2016Q2/www/webkit-gtk2/Makefile
==============================================================================
--- branches/2016Q2/www/webkit-gtk2/Makefile Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk2/Makefile Thu May 5 16:42:56 2016 (r414650)
@@ -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,7 +27,7 @@ PORTSCOUT= limit:1.4.*$$
USE_GSTREAMER1= yes
USE_XORG= xt xdamage xcomposite
-USES= bison compiler:c++11-lib gettext gmake gperf libtool \
+USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
perl5 pkgconfig shebangfix sqlite tar:xz
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS=yes
@@ -37,9 +36,8 @@ 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
+CONFIGURE_ENV= AR=/usr/bin/ar \
+ ac_cv_path_DOLT_BASH=""
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --with-gtk=2.0 \
--enable-svg-fonts \
@@ -52,7 +50,7 @@ MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
CONFIGURE_ARGS+=--disable-egl \
--disable-gles2
-SHEBANG_FILES= \
+SHEBANG_FILES= \
Source/JavaScriptCore/create_hash_table \
Source/JavaScriptCore/inspector/scripts/xxd.pl \
Source/WebCore/css/*.pl \
@@ -64,7 +62,7 @@ SHEBANG_FILES= \
Source/WebCore/bindings/scripts/*.p[lm] \
Source/JavaScriptCore/create_hash_table
-BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
+BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
#_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}",
OPTIONS_DEFINE= DEBUG FULLDEBUG
@@ -93,10 +91,12 @@ CXXFLAGS+= -Wno-c++11-extensions # Shutu
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
@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
Modified: branches/2016Q2/www/webkit-gtk2/distinfo
==============================================================================
--- branches/2016Q2/www/webkit-gtk2/distinfo Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk2/distinfo Thu May 5 16:42:56 2016 (r414650)
@@ -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
Copied: branches/2016Q2/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h (from r414649, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q2/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h Thu May 5 16:42:56 2016 (r414650, copy of r414649, head/www/webkit-gtk2/files/patch-Source_WTF_wtf_Platform.h)
@@ -0,0 +1,12 @@
+This patch reportedly fixes build for ARM. See PR 208569
+
+--- Source/WTF/wtf/Platform.h.orig 2016-04-10 06:48:36 UTC
++++ Source/WTF/wtf/Platform.h
+@@ -218,6 +218,7 @@
+ #elif defined(__ARM_ARCH_6__) \
+ || defined(__ARM_ARCH_6J__) \
+ || defined(__ARM_ARCH_6K__) \
++ || defined(__ARM_ARCH_6KZ__) \
+ || defined(__ARM_ARCH_6Z__) \
+ || defined(__ARM_ARCH_6ZK__) \
+ || defined(__ARM_ARCH_6T2__) \
Modified: branches/2016Q2/www/webkit-gtk2/pkg-plist
==============================================================================
--- branches/2016Q2/www/webkit-gtk2/pkg-plist Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk2/pkg-plist Thu May 5 16:42:56 2016 (r414650)
@@ -255,10 +255,10 @@ lib/girepository-1.0/JavaScriptCore-1.0.
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/
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/ind
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/hi/LC_MESSAGES/WebKitGTK-2.
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/te/LC_MESSAGES/WebKitGTK-2.
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
Modified: branches/2016Q2/www/webkit-gtk3/Makefile
==============================================================================
--- branches/2016Q2/www/webkit-gtk3/Makefile Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk3/Makefile Thu May 5 16:42:56 2016 (r414650)
@@ -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= -gtk3
@@ -28,8 +27,8 @@ 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
+USES= bison compiler:c++11-lib gettext gmake gperf libtool localbase \
+ perl5 pkgconfig shebangfix sqlite tar:xz
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS=yes
USE_GNOME= cairo gtk20 gtk30 introspection:build libxslt
@@ -37,9 +36,8 @@ 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
+CONFIGURE_ENV= AR=/usr/bin/ar \
+ ac_cv_path_DOLT_BASH=""
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --with-gtk=3.0 \
--enable-svg-fonts \
@@ -104,6 +102,9 @@ CXXFLAGS+= -Qunused-arguments
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
@${FIND} ${WRKSRC} -name GNUmakefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
Modified: branches/2016Q2/www/webkit-gtk3/distinfo
==============================================================================
--- branches/2016Q2/www/webkit-gtk3/distinfo Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk3/distinfo Thu May 5 16:42:56 2016 (r414650)
@@ -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
Modified: branches/2016Q2/www/webkit-gtk3/pkg-plist
==============================================================================
--- branches/2016Q2/www/webkit-gtk3/pkg-plist Thu May 5 16:08:08 2016 (r414649)
+++ branches/2016Q2/www/webkit-gtk3/pkg-plist Thu May 5 16:42:56 2016 (r414650)
@@ -258,13 +258,13 @@ lib/girepository-1.0/WebKit2-3.0.typelib
lib/girepository-1.0/WebKit2WebExtension-3.0.typelib
lib/libjavascriptcoregtk-3.0.so
lib/libjavascriptcoregtk-3.0.so.0
-lib/libjavascriptcoregtk-3.0.so.0.16.17
+lib/libjavascriptcoregtk-3.0.so.0.16.19
lib/libwebkit2gtk-3.0.so
lib/libwebkit2gtk-3.0.so.25
-lib/libwebkit2gtk-3.0.so.25.10.12
+lib/libwebkit2gtk-3.0.so.25.10.14
lib/libwebkitgtk-3.0.so
lib/libwebkitgtk-3.0.so.0
-lib/libwebkitgtk-3.0.so.0.22.15
+lib/libwebkitgtk-3.0.so.0.22.17
lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-3.0.pc
libdata/pkgconfig/webkit2gtk-3.0.pc
@@ -320,7 +320,6 @@ share/gtk-doc/html/webkit2gtk/ch02.html
share/gtk-doc/html/webkit2gtk/home.png
share/gtk-doc/html/webkit2gtk/index-all.html
share/gtk-doc/html/webkit2gtk/index.html
-share/gtk-doc/html/webkit2gtk/index.sgml
share/gtk-doc/html/webkit2gtk/left-insensitive.png
share/gtk-doc/html/webkit2gtk/left.png
share/gtk-doc/html/webkit2gtk/right-insensitive.png
@@ -494,7 +493,6 @@ share/gtk-doc/html/webkitdomgtk/ch01.htm
share/gtk-doc/html/webkitdomgtk/home.png
share/gtk-doc/html/webkitdomgtk/index-all.html
share/gtk-doc/html/webkitdomgtk/index.html
-share/gtk-doc/html/webkitdomgtk/index.sgml
share/gtk-doc/html/webkitdomgtk/left-insensitive.png
share/gtk-doc/html/webkitdomgtk/left.png
share/gtk-doc/html/webkitdomgtk/right-insensitive.png
@@ -567,7 +565,6 @@ share/gtk-doc/html/webkitgtk/index-1.3.8
share/gtk-doc/html/webkitgtk/index-all.html
share/gtk-doc/html/webkitgtk/index-deprecated.html
share/gtk-doc/html/webkitgtk/index.html
-share/gtk-doc/html/webkitgtk/index.sgml
share/gtk-doc/html/webkitgtk/left-insensitive.png
share/gtk-doc/html/webkitgtk/left.png
share/gtk-doc/html/webkitgtk/right-insensitive.png
@@ -600,6 +597,7 @@ share/locale/hi/LC_MESSAGES/WebKitGTK-3.
share/locale/hu/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/id/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/it/LC_MESSAGES/WebKitGTK-3.0.mo
+share/locale/ja/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/kn/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/ko/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/lt/LC_MESSAGES/WebKitGTK-3.0.mo
@@ -624,6 +622,7 @@ share/locale/te/LC_MESSAGES/WebKitGTK-3.
share/locale/uk/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/vi/LC_MESSAGES/WebKitGTK-3.0.mo
share/locale/zh_CN/LC_MESSAGES/WebKitGTK-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/WebKitGTK-3.0.mo
share/webkitgtk-3.0/images/deleteButton.png
share/webkitgtk-3.0/images/inputSpeech.png
share/webkitgtk-3.0/images/missingImage.png
More information about the svn-ports-all
mailing list