summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2015-05-25 09:35:20 +0000
committerRene Ladan <rene@FreeBSD.org>2015-05-25 09:35:20 +0000
commitf93a363e54b78a9523f6937e6b816a861621e3a2 (patch)
treefbdc44ba875a2bf33de2d7fd8407575e6da74e01 /www/chromium/files/patch-chrome__chrome_browser_ui.gypi
parent- Update to 2.1.0 (diff)
www/chromium: update to 43.0.2357.65
There are some rough edges, e.g. gmail.com crashes with the EFF Privacy Badger plugin installed. Submitted by: LeFroid Obtained from: https://github.com/Lefrid/chromium MFH: 2015Q2 Security: http://vuxml.freebsd.org/freebsd/a9d456b4-fe4c-11e4-ad15-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-chrome__chrome_browser_ui.gypi')
-rw-r--r--www/chromium/files/patch-chrome__chrome_browser_ui.gypi16
1 files changed, 10 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
index 8e0b4e1517fe..4022001d3352 100644
--- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
+++ b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
@@ -1,6 +1,6 @@
--- chrome/chrome_browser_ui.gypi.orig 2014-10-10 09:15:30 UTC
+++ chrome/chrome_browser_ui.gypi
-@@ -2743,7 +2743,7 @@
+@@ -2875,7 +2875,7 @@
}],
],
}],
@@ -9,7 +9,7 @@
'dependencies': [
# gtk2 is the only component that can interact with gtk2 in our new
# world.
-@@ -2751,7 +2751,7 @@
+@@ -2883,7 +2883,7 @@
'../build/linux/system.gyp:gio',
],
}],
@@ -18,8 +18,8 @@
'sources': [ '<@(chrome_browser_ui_desktop_sources)' ],
}],
['use_aura==1', {
-@@ -2788,7 +2788,7 @@
- ['enable_printing==1', {
+@@ -2918,7 +2918,7 @@
+ ['enable_print_preview==1', {
'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
}],
- ['OS=="linux" or OS=="android"', {
@@ -27,8 +27,12 @@
'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
}],
['OS=="android"', {
-@@ -2907,7 +2907,7 @@
- ['desktop_linux==1', {
+@@ -3030,10 +3030,10 @@
+ }],
+ ],
+ }],
+- ['desktop_linux==1', {
++ ['desktop_linux==1 or os_bsd==1', {
'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
}],
- ['OS=="linux"', { # Both desktop Linux and ChromeOS.