Update chromium to 49.0.2623.112

while here, unbreak build on FreeBSD 9

Approved by:	rene (mentor)
MFH:		2016Q2

5 files changed, 98 insertions, 8 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 828344f79a11..b004c95816e7 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	49.0.2623.110
-PORTREVISION=	1
+PORTVERSION=	49.0.2623.112
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -57,8 +56,19 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
 		xdg-open:devel/xdg-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		bison compiler:c++14-lang cpe desktop-file-utils execinfo jpeg \
+USES=		bison cpe desktop-file-utils execinfo jpeg \
 		ninja perl5 pkgconfig python:2,build shebangfix tar:xz
+# chromium requires a recent compiler (C++11 capable, but clang 3.4 is
+# not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build
+# chromium as the libc++ includes are not up to the task. USES flags
+# have to be set before bsd.ports.pre.mk and thereby cannot depend on
+# bsd.ports.pre.mk's variables, so I'm using a hack here.
+.if exists(/usr/lib/libc++.a)
+USES+=	compiler:c++14-lang
+.else
+USES+=	compiler:c++11-lib
+.endif
+
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_PERL5=	build
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 5a28a26c467b..4d9ef2f3a53d 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-49.0.2623.110.tar.xz) = 41840925d3769555ce4ebd780ee0dc6789ffae27b1684006c9b543bcaa35bbd2
-SIZE (chromium-49.0.2623.110.tar.xz) = 520407796
-SHA256 (chromium-49.0.2623.110-testdata.tar.xz) = 5a3d3a920a780caa685e6667a41489a756f3847095bcaf202b9d0b1bec566328
-SIZE (chromium-49.0.2623.110-testdata.tar.xz) = 117576612
+SHA256 (chromium-49.0.2623.112.tar.xz) = 443b6d5f0d07f336783e700edc4ecae96769e105d0f8553e98fefae747302cf0
+SIZE (chromium-49.0.2623.112.tar.xz) = 520397552
+SHA256 (chromium-49.0.2623.112-testdata.tar.xz) = 2822d6ebfdab23b018aeba78bfb448be68c3ac6de3fed7fe649500c4341abe49
+SIZE (chromium-49.0.2623.112-testdata.tar.xz) = 117571488
diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc
index df30aa08673c..9c7e17f07dee 100644
--- a/www/chromium/files/extra-patch-gcc
+++ b/www/chromium/files/extra-patch-gcc
@@ -157,3 +157,71 @@
  #include <sstream>
  #include <math.h>
  #include <stdlib.h>
+--- ui/gfx/color_utils.cc.orig	2016-04-06 20:35:19.306577518 +0200
++++ ui/gfx/color_utils.cc	2016-04-06 20:35:49.282575724 +0200
+@@ -235,9 +235,9 @@
+     b += (255.0 - b) * ((shift.l - 0.5) * 2.0);
+   }
+   return SkColorSetARGB(alpha,
+-                        static_cast<int>(std::round(r)),
+-                        static_cast<int>(std::round(g)),
+-                        static_cast<int>(std::round(b)));
++                        static_cast<int>(round(r)),
++                        static_cast<int>(round(g)),
++                        static_cast<int>(round(b)));
+ }
+ 
+ void BuildLumaHistogram(const SkBitmap& bitmap, int histogram[256]) {
+--- media/filters/audio_clock.cc.orig	2016-04-07 11:55:00.678817033 +0200
++++ media/filters/audio_clock.cc	2016-04-07 11:55:28.152814716 +0200
+@@ -121,7 +121,7 @@
+   }
+ 
+   return base::TimeDelta::FromMicroseconds(
+-      std::round(frames_until_timestamp * microseconds_per_frame_));
++      round(frames_until_timestamp * microseconds_per_frame_));
+ }
+ 
+ void AudioClock::ContiguousAudioDataBufferedForTesting(
+--- media/filters/audio_clock.h.orig	2016-04-08 14:22:02.833940146 +0200
++++ media/filters/audio_clock.h	2016-04-08 14:22:14.433876920 +0200
+@@ -92,11 +92,11 @@
+   //                                             1000 + 500 + 250 = 1750 ms.
+   base::TimeDelta front_timestamp() const {
+     return base::TimeDelta::FromMicroseconds(
+-        std::round(front_timestamp_micros_));
++        round(front_timestamp_micros_));
+   }
+   base::TimeDelta back_timestamp() const {
+     return base::TimeDelta::FromMicroseconds(
+-        std::round(back_timestamp_micros_));
++        round(back_timestamp_micros_));
+   }
+ 
+   // Returns the amount of wall time until |timestamp| will be played by the
+--- content/browser/web_contents/web_contents_impl.cc.orig	2016-04-08 15:44:21.989537858 +0200
++++ content/browser/web_contents/web_contents_impl.cc	2016-04-08 15:44:44.574535099 +0200
+@@ -1597,7 +1597,7 @@
+     // Count only integer cumulative scrolls as zoom events; this handles
+     // smooth scroll and regular scroll device behavior.
+     zoom_scroll_remainder_ += event.wheelTicksY;
+-    int whole_zoom_scroll_remainder_ = std::lround(zoom_scroll_remainder_);
++    int whole_zoom_scroll_remainder_ = lround(zoom_scroll_remainder_);
+     zoom_scroll_remainder_ -= whole_zoom_scroll_remainder_;
+     if (whole_zoom_scroll_remainder_ != 0) {
+       delegate_->ContentsZoomChange(whole_zoom_scroll_remainder_ > 0);
+--- chrome/browser/ui/views/frame/browser_root_view.cc.orig	2016-04-08 17:23:19.749128496 +0200
++++ chrome/browser/ui/views/frame/browser_root_view.cc	2016-04-08 17:23:30.609126494 +0200
+@@ -139,10 +139,10 @@
+ 
+       // Number of integer scroll events that have passed in each direction.
+       int whole_scroll_amount_x =
+-          std::lround(static_cast<double>(scroll_remainder_x_) /
++          lround(static_cast<double>(scroll_remainder_x_) /
+                       ui::MouseWheelEvent::kWheelDelta);
+       int whole_scroll_amount_y =
+-          std::lround(static_cast<double>(scroll_remainder_y_) /
++          lround(static_cast<double>(scroll_remainder_y_) /
+                       ui::MouseWheelEvent::kWheelDelta);
+ 
+       // Adjust the remainder such that any whole scrolls we have taken action
diff --git a/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h b/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h
new file mode 100644
index 000000000000..2d4ded68baa9
--- /dev/null
+++ b/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/base/ifaddrs_converter.h.orig	2016-04-02 20:56:46.173477407 +0200
++++ third_party/webrtc/base/ifaddrs_converter.h	2016-04-02 20:57:11.910537987 +0200
+@@ -14,6 +14,8 @@
+ #if defined(WEBRTC_ANDROID)
+ #include "webrtc/base/ifaddrs-android.h"
+ #else
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
+ #endif  // WEBRTC_ANDROID
+ 
diff --git a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
index 7f66fa6e0ccb..bbf9a58fdd0e 100644
--- a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
+++ b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
@@ -1,10 +1,11 @@
 --- third_party/webrtc/base/ipaddress.h.orig	2014-10-10 09:16:13 UTC
 +++ third_party/webrtc/base/ipaddress.h
-@@ -17,6 +17,9 @@
+@@ -17,6 +17,10 @@
  #include <arpa/inet.h>
  #include <netdb.h>
  #endif
 +#if defined(WEBRTC_BSD)
++#include <sys/types.h>
 +#include <sys/socket.h>
 +#endif
  #if defined(WEBRTC_WIN)