diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-05-11 19:28:56 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-05-11 19:28:56 +0000 |
| commit | 72efc090962cd7ab489bf4dd2d3eb6ca13041b58 (patch) | |
| tree | 2539bfc19f7193e5ac995b96ff359d56408fa155 /www/chromium/files/patch-net__net.gyp | |
| parent | - Update to 0.4.2 [1] (diff) | |
- Update to 11.0.696.65
- Fix build when ffmpeg-devel is installed [1] [2]
- Bring back proxy configuration detection [1]
- Minor enhancements [1]
Submitted by: George Liaskos [geo.liaskos gmail.com] [1]
Reported by: Mickael Maillot [mickael.maillot gmail.com] [2]
Obtained from: freebsd-chromium development repository
Committed at: FreeBSD Developer Summit 2011
Notes
Notes:
svn path=/head/; revision=273975
Diffstat (limited to 'www/chromium/files/patch-net__net.gyp')
| -rw-r--r-- | www/chromium/files/patch-net__net.gyp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp index de645d79ace6..891bc5068a57 100644 --- a/www/chromium/files/patch-net__net.gyp +++ b/www/chromium/files/patch-net__net.gyp @@ -1,6 +1,6 @@ ---- net/net.gyp.orig 2011-03-20 22:02:04.177736414 +0200 -+++ net/net.gyp 2011-03-20 22:02:04.391765571 +0200 -@@ -137,8 +137,8 @@ +--- net/net.gyp.orig 2011-04-26 11:01:16.000000000 +0300 ++++ net/net.gyp 2011-05-03 21:16:49.479149025 +0300 +@@ -138,8 +138,8 @@ 'base/network_change_notifier_linux.h', 'base/network_change_notifier_mac.cc', 'base/network_change_notifier_mac.h', @@ -11,7 +11,7 @@ 'base/network_change_notifier_win.cc', 'base/network_change_notifier_win.h', 'base/network_config_watcher_mac.cc', -@@ -242,7 +242,7 @@ +@@ -245,7 +245,7 @@ 'dependencies': [ '../build/linux/system.gyp:gconf', '../build/linux/system.gyp:gdk', @@ -20,18 +20,7 @@ ], 'conditions': [ ['use_openssl==1', { -@@ -548,8 +548,8 @@ - 'proxy/proxy_config_service.h', - 'proxy/proxy_config_service_fixed.cc', - 'proxy/proxy_config_service_fixed.h', -- 'proxy/proxy_config_service_linux.cc', -- 'proxy/proxy_config_service_linux.h', -+ #'proxy/proxy_config_service_linux.cc', -+ #'proxy/proxy_config_service_linux.h', - 'proxy/proxy_config_service_mac.cc', - 'proxy/proxy_config_service_mac.h', - 'proxy/proxy_config_service_win.cc', -@@ -1029,7 +1029,7 @@ +@@ -1023,7 +1023,7 @@ ], } ], @@ -40,7 +29,7 @@ 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ -@@ -1194,7 +1194,7 @@ +@@ -1196,7 +1196,7 @@ }], ], }], |