svn commit: r376609 - in head/www: webkit-gtk2 webkit-gtk3
Koop Mast
kwm at FreeBSD.org
Fri Jan 9 13:37:58 UTC 2015
Author: kwm
Date: Fri Jan 9 13:37:56 2015
New Revision: 376609
URL: https://svnweb.freebsd.org/changeset/ports/376609
QAT: https://qat.redports.org/buildarchive/r376609/
Log:
Update webkit-gtk[23] to 1.4.8.
Switch webkit-gtk3 to compiler:c++11-lib instead of homegrown clang code [2].
This unbreaks the build on 8.x.
Axe WEBGL and WEBAUDIO options and turn them on by default (like upstream
intended). Disabling them leads to wierd build failures, due to untested
build paths. [1]
Only set -Qunused-arguments if the compiler is clang [2]
Fix SSL connection issues with some websites after the POODLE vulnerability fix.
MFH: 2015Q1
PR: 196333 [1], 196031 [2], 195628 [2], 196296 [1]
Submitted by: peo at bsdlabs.com and david at catwhisker.org [1], truckman@ [2]
Security: e9ccdb28-9802-11e4-9d9c-bcaec565249c
Security: CVE-2014-1344, CVE-2014-1384, CVE-2014-1385, CVE-2014-1386
Security: CVE-2014-1387, CVE-2014-1388, CVE-2014-1389, CVE-2014-1390
Modified:
head/www/webkit-gtk2/Makefile
head/www/webkit-gtk2/distinfo
head/www/webkit-gtk2/pkg-plist
head/www/webkit-gtk3/Makefile
head/www/webkit-gtk3/distinfo
head/www/webkit-gtk3/pkg-plist
Modified: head/www/webkit-gtk2/Makefile
==============================================================================
--- head/www/webkit-gtk2/Makefile Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk2/Makefile Fri Jan 9 13:37:56 2015 (r376609)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 2.4.7
+PORTVERSION= 2.4.8
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
@@ -24,11 +24,12 @@ RUN_DEPENDS= geoclue>=0:${PORTSDIR}/net/
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 \
perl5 pkgconfig shebangfix tar:xz
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS=yes
USE_GNOME= cairo gtk20 introspection:build libxslt
+USE_GL= gl
USE_SQLITE= 3
USE_PERL5= build
USE_LDCONFIG= yes
@@ -63,16 +64,10 @@ SHEBANG_FILES= \
BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk2
#_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
+OPTIONS_DEFINE= DEBUG FULLDEBUG
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
@@ -80,7 +75,7 @@ DEBUG_CONFIGURE_OFF= --disable-debug-sym
.include <bsd.port.options.mk>
# Shutup warning spam
-#CXXFLAGS+= -Wno-c++11-extensions -Qunused-arguments
+CXXFLAGS+= -Wno-c++11-extensions
.if ${ARCH} == powerpc64
CFLAGS+= -mminimal-toc
@@ -97,6 +92,11 @@ BUILD_DEPENDS+= flex>=0:${PORTSDIR}/text
CONFIGURE_ENV+= FLEX="${LOCALBASE}/bin/flex"
.endif
+.if ${CHOSEN_COMPILER_TYPE} == clang
+CXXFLAGS+= -Qunused-arguments
+.endif
+
+
post-patch:
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
Modified: head/www/webkit-gtk2/distinfo
==============================================================================
--- head/www/webkit-gtk2/distinfo Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk2/distinfo Fri Jan 9 13:37:56 2015 (r376609)
@@ -1,2 +1,2 @@
-SHA256 (webkitgtk-2.4.7.tar.xz) = f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
-SIZE (webkitgtk-2.4.7.tar.xz) = 9826208
+SHA256 (webkitgtk-2.4.8.tar.xz) = 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
+SIZE (webkitgtk-2.4.8.tar.xz) = 9827632
Modified: head/www/webkit-gtk2/pkg-plist
==============================================================================
--- head/www/webkit-gtk2/pkg-plist Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk2/pkg-plist Fri Jan 9 13:37:56 2015 (r376609)
@@ -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.15
+lib/libjavascriptcoregtk-1.0.so.0.16.16
lib/libwebkitgtk-1.0.so
lib/libwebkitgtk-1.0.so.0
-lib/libwebkitgtk-1.0.so.0.22.13
+lib/libwebkitgtk-1.0.so.0.22.14
libdata/pkgconfig/javascriptcoregtk-1.0.pc
libdata/pkgconfig/webkit-1.0.pc
share/gir-1.0/JavaScriptCore-1.0.gir
Modified: head/www/webkit-gtk3/Makefile
==============================================================================
--- head/www/webkit-gtk3/Makefile Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk3/Makefile Fri Jan 9 13:37:56 2015 (r376609)
@@ -1,10 +1,8 @@
# Created by: Michael Johnson <ahze at FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/www/webkit-gtk3/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= webkit
-PORTVERSION= 2.4.7
-PORTREVISION= 1
+PORTVERSION= 2.4.8
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk3
@@ -26,11 +24,12 @@ RUN_DEPENDS= geoclue>=0:${PORTSDIR}/net/
USE_GSTREAMER1= yes
USE_XORG= xt xdamage xcomposite
-USES= bison gettext gmake gperf libtool perl5 \
+USES= bison compiler:c++11-lib 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_GL= gl
USE_SQLITE= 3
USE_PERL5= build
USE_LDCONFIG= yes
@@ -42,6 +41,7 @@ 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}
@@ -67,44 +67,18 @@ SHEBANG_FILES= \
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
+OPTIONS_DEFINE= DEBUG FULLDEBUG
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 <bsd.port.options.mk>
-# gtest to use <tr1/tuple,> while libc++ only has <tuple>
-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
+CXXFLAGS+= -Wno-c++11-extensions
.if ${ARCH} == powerpc64
CFLAGS+= -mminimal-toc
@@ -121,6 +95,15 @@ BUILD_DEPENDS+= flex>=0:${PORTSDIR}/text
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+= -Qunused-arguments
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \
${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
Modified: head/www/webkit-gtk3/distinfo
==============================================================================
--- head/www/webkit-gtk3/distinfo Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk3/distinfo Fri Jan 9 13:37:56 2015 (r376609)
@@ -1,2 +1,2 @@
-SHA256 (webkitgtk-2.4.7.tar.xz) = f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38
-SIZE (webkitgtk-2.4.7.tar.xz) = 9826208
+SHA256 (webkitgtk-2.4.8.tar.xz) = 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23
+SIZE (webkitgtk-2.4.8.tar.xz) = 9827632
Modified: head/www/webkit-gtk3/pkg-plist
==============================================================================
--- head/www/webkit-gtk3/pkg-plist Fri Jan 9 13:35:31 2015 (r376608)
+++ head/www/webkit-gtk3/pkg-plist Fri Jan 9 13:37:56 2015 (r376609)
@@ -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.15
+lib/libjavascriptcoregtk-3.0.so.0.16.16
lib/libwebkit2gtk-3.0.so
lib/libwebkit2gtk-3.0.so.25
-lib/libwebkit2gtk-3.0.so.25.10.10
+lib/libwebkit2gtk-3.0.so.25.10.11
lib/libwebkitgtk-3.0.so
lib/libwebkitgtk-3.0.so.0
-lib/libwebkitgtk-3.0.so.0.22.13
+lib/libwebkitgtk-3.0.so.0.22.14
lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-3.0.pc
libdata/pkgconfig/webkit2gtk-3.0.pc
More information about the svn-ports-all
mailing list