aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/chromium/Makefile2
-rw-r--r--www/chromium/distinfo8
-rw-r--r--www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc20
-rw-r--r--www/chromium/files/patch-content__browser__time_zone_monitor.cc11
-rw-r--r--www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc20
5 files changed, 56 insertions, 5 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index dd55749fbc46..0244f4c5aebb 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 44.0.2403.125
+PORTVERSION= 44.0.2403.130
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
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index f0eba858d51f..d6801008cf60 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,4 @@
-SHA256 (chromium-44.0.2403.125.tar.xz) = 78568ec613443b5b7be83216f2c86cb4e64e7398eee9bbc0a35d1c0cef402452
-SIZE (chromium-44.0.2403.125.tar.xz) = 292968928
-SHA256 (chromium-44.0.2403.125-testdata.tar.xz) = 29bcdbfbb7356f3699e0ede49561251fbc66ad96fbfe5ff94878703799419edc
-SIZE (chromium-44.0.2403.125-testdata.tar.xz) = 128645864
+SHA256 (chromium-44.0.2403.130.tar.xz) = 37779b2f4844e1a6ac75d69897031955541ad97f3dd1d4ad641c371c1d63b414
+SIZE (chromium-44.0.2403.130.tar.xz) = 293332128
+SHA256 (chromium-44.0.2403.130-testdata.tar.xz) = 47a0e7808f7c98ea02fb4aaaedf83fcbd78901da134de3cf1d53312a56710f49
+SIZE (chromium-44.0.2403.130-testdata.tar.xz) = 128611776
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc
new file mode 100644
index 000000000000..de6ed315e11d
--- /dev/null
+++ b/www/chromium/files/patch-chrome__browser__extensions__api__tabs__tabs_api.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/tabs/tabs_api.cc.orig 2015-08-02 00:29:44.653703000 -0400
++++ chrome/browser/extensions/api/tabs/tabs_api.cc 2015-08-02 00:32:45.945039000 -0400
+@@ -659,7 +659,7 @@
+
+ WindowController* controller = new_window->extension_window_controller();
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ // On Desktop Linux, window managers may ignore hints until the X11 window is
+ // mapped, which happens in the blocking call to Show() above.
+ // DesktopWindowTreeHostX11 currently only checks for an attempt to maximize
+@@ -669,7 +669,7 @@
+ if (create_params.initial_show_state == ui::SHOW_STATE_MINIMIZED)
+ new_window->window()->Minimize();
+ #endif
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_WIN)
+ // On Desktop Linux and Windows, managers don't handle fullscreen state to
+ // create window for now.
+ if (create_params.initial_show_state == ui::SHOW_STATE_FULLSCREEN)
diff --git a/www/chromium/files/patch-content__browser__time_zone_monitor.cc b/www/chromium/files/patch-content__browser__time_zone_monitor.cc
new file mode 100644
index 000000000000..9f5e75284a38
--- /dev/null
+++ b/www/chromium/files/patch-content__browser__time_zone_monitor.cc
@@ -0,0 +1,11 @@
+--- content/browser/time_zone_monitor.cc.orig 2015-08-02 12:15:31.521732000 -0400
++++ content/browser/time_zone_monitor.cc 2015-08-02 12:16:05.094405000 -0400
+@@ -28,7 +28,7 @@
+ scoped_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
+ #else
+ icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // We get here multiple times on Linux per a single tz change, but
+ // want to update the ICU default zone and notify renderer only once.
+ scoped_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc b/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc
new file mode 100644
index 000000000000..d0fb0e7b24d5
--- /dev/null
+++ b/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc
@@ -0,0 +1,20 @@
+--- ui/base/user_activity/user_activity_detector.cc.orig 2015-08-02 12:18:35.398386000 -0400
++++ ui/base/user_activity/user_activity_detector.cc 2015-08-02 12:19:07.874736000 -0400
+@@ -52,7 +52,7 @@
+
+ ui::PlatformEventSource* platform_event_source =
+ ui::PlatformEventSource::GetInstance();
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ CHECK(platform_event_source);
+ #endif
+ if (platform_event_source)
+@@ -62,7 +62,7 @@
+ UserActivityDetector::~UserActivityDetector() {
+ ui::PlatformEventSource* platform_event_source =
+ ui::PlatformEventSource::GetInstance();
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ CHECK(platform_event_source);
+ #endif
+ if (platform_event_source)