aboutsummaryrefslogtreecommitdiffstats
path: root/www/chromium/files/patch-build__common.gypi
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2014-05-21 04:47:17 +0800
committerrene <rene@FreeBSD.org>2014-05-21 04:47:17 +0800
commita43372856890f380363a5be76395bf9d212cb1ba (patch)
tree2dd8ccc48e698b7993db731cd111168b9f3e16d7 /www/chromium/files/patch-build__common.gypi
parente67e68949163e459bb5f2afd4b0c52d4ad4c663b (diff)
downloadfreebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.tar.gz
freebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.tar.zst
freebsd-ports-gnome-a43372856890f380363a5be76395bf9d212cb1ba.zip
Update to 35.0.1916.114
Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance MFH: 2014Q2 Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-build__common.gypi')
-rw-r--r--www/chromium/files/patch-build__common.gypi29
1 files changed, 14 insertions, 15 deletions
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
index 1f43a64d8a63..992009dc1b0b 100644
--- a/www/chromium/files/patch-build__common.gypi
+++ b/www/chromium/files/patch-build__common.gypi
@@ -1,6 +1,6 @@
---- ./build/common.gypi.orig 2014-04-24 22:36:09.000000000 +0200
-+++ ./build/common.gypi 2014-04-24 23:23:42.000000000 +0200
-@@ -565,7 +565,7 @@
+--- ./build/common.gypi.orig 2014-04-30 22:43:21.000000000 +0200
++++ ./build/common.gypi 2014-05-04 14:43:03.000000000 +0200
+@@ -615,7 +615,7 @@
}],
# DBus usage.
@@ -9,27 +9,26 @@
'use_dbus%': 1,
}, {
'use_dbus%': 0,
-@@ -1002,6 +1002,10 @@
+@@ -878,7 +878,7 @@
+ # By default, use ICU data file (icudtl.dat) on all platforms
+ # except when building Android WebView.
+ # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium).
+- ['android_webview_build==0', {
++ ['android_webview_build==0 and OS!="freebsd" and OS!="openbsd"', {
+ 'icu_use_data_file_flag%' : 1,
+ }, {
+ 'icu_use_data_file_flag%' : 0,
+@@ -1076,6 +1076,9 @@
# able to turn it off for various reasons.
'linux_disable_pie%': 0,
+ 'os_ver%': 0,
-+ 'prefix_dir%': '/usr',
+ 'use_system_libjpeg%': 0,
+
# The release channel that this build targets. This is used to restrict
# channel-specific build options, like which installer packages to create.
# The default is 'all', which does no channel-specific filtering.
-@@ -1322,7 +1326,7 @@
- # TODO(jungshik): Turn this on on Android.
- # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
- # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
-- ['OS!="android"', {
-+ ['OS!="android" and os_bsd!=1', {
- 'icu_use_data_file_flag%': 1,
- }],
- ],
-@@ -3701,6 +3705,13 @@
+@@ -3894,6 +3897,13 @@
'ldflags': [
'-Wl,--no-keep-memory',
],