Chromium Code Reviews| Index: build/linux/system.gyp |
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp |
| index a1d6bf0a1bcdca2f442d016b102fd5b6adb6e835..7080659aadd5b26e1ecd25768817faa180a55d99 100644 |
| --- a/build/linux/system.gyp |
| +++ b/build/linux/system.gyp |
| @@ -113,15 +113,15 @@ |
| ['_toolset=="target"', { |
| 'direct_dependent_settings': { |
| 'cflags': [ |
| - '<!@(<(pkg-config) --cflags gdk-2.0)', |
|
Elliot Glaysher
2015/07/20 19:31:40
Please don't do this. We need to support both GTK
knthzh
2015/07/21 15:48:27
I can't. I'm too terrified of triggering another e
Elliot Glaysher
2015/07/28 17:54:36
(Just to be clear, I'm fine with you having this h
|
| + '<!@(<(pkg-config) --cflags gdk-3.0)', |
| ], |
| }, |
| 'link_settings': { |
| 'ldflags': [ |
| - '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-2.0)', |
| + '<!@(<(pkg-config) --libs-only-L --libs-only-other gdk-3.0)', |
| ], |
| 'libraries': [ |
| - '<!@(<(pkg-config) --libs-only-l gdk-2.0)', |
| + '<!@(<(pkg-config) --libs-only-l gdk-3.0)', |
| ], |
| }, |
| }], |
| @@ -134,7 +134,7 @@ |
| 'variables': { |
| # gtk requires gmodule, but it does not list it as a dependency |
| # in some misconfigured systems. |
| - 'gtk_packages': 'gmodule-2.0 gtk+-2.0 gthread-2.0', |
| + 'gtk_packages': 'gmodule-2.0 gtk+-3.0 gthread-2.0', |
| }, |
| 'conditions': [ |
| ['_toolset=="target"', { |
| @@ -175,15 +175,15 @@ |
| ['_toolset=="target"', { |
| 'direct_dependent_settings': { |
| 'cflags': [ |
| - '<!@(<(pkg-config) --cflags gtk+-unix-print-2.0)', |
| + '<!@(<(pkg-config) --cflags gtk+-unix-print-3.0)', |
| ], |
| }, |
| 'link_settings': { |
| 'ldflags': [ |
| - '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print-2.0)', |
| + '<!@(<(pkg-config) --libs-only-L --libs-only-other gtk+-unix-print-3.0)', |
| ], |
| 'libraries': [ |
| - '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)', |
| + '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-3.0)', |
| ], |
| }, |
| }], |