summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-remoting__remoting.gyp
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-remoting__remoting.gyp')
-rw-r--r--www/chromium/files/patch-remoting__remoting.gyp20
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-remoting__remoting.gyp b/www/chromium/files/patch-remoting__remoting.gyp
index 248bfbd13ed7..44f4d0752507 100644
--- a/www/chromium/files/patch-remoting__remoting.gyp
+++ b/www/chromium/files/patch-remoting__remoting.gyp
@@ -1,18 +1,18 @@
---- remoting/remoting.gyp.orig 2013-02-13 20:16:24.000000000 +0200
-+++ remoting/remoting.gyp 2013-02-13 23:31:43.000000000 +0200
-@@ -44,7 +44,7 @@
+--- remoting/remoting.gyp.orig 2013-04-30 10:22:16.000000000 +0300
++++ remoting/remoting.gyp 2013-05-07 21:24:08.000000000 +0300
+@@ -56,7 +56,7 @@
'conditions': [
- # Remoting host is supported only on Windows, OSX and Linux.
-- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0)', {
-+ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0)', {
+ # Remoting host is supported only on Windows, OSX and Linux (with X11).
+- ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
++ ['OS=="win" or OS=="mac" or OS=="freebsd" or (OS=="linux" and chromeos==0 and use_x11==1)', {
'enable_remoting_host': 1,
}, {
'enable_remoting_host': 0,
-@@ -445,7 +445,7 @@
- 'host/win/window_station_and_desktop.h',
- ],
- 'conditions': [
+@@ -479,7 +479,7 @@
+ '*_gtk.cc',
+ ],
+ }],
- ['OS=="linux"', {
+ ['OS=="linux" or OS=="freebsd"', {
'link_settings': {