Created
February 28, 2014 13:29
-
-
Save tiagovignatti/9271138 to your computer and use it in GitHub Desktop.
that's my hack to compile Chromium Browser in a system with *zero* X11 protocol libraries.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn | |
index 470922f..f778297 100644 | |
--- a/build/config/linux/BUILD.gn | |
+++ b/build/config/linux/BUILD.gn | |
@@ -44,7 +44,7 @@ pkg_config("glib") { | |
pkg_config("gtk") { | |
# Gtk requires gmodule, but it does not list it as a dependency in some | |
# misconfigured systems. | |
- packages = [ "gmodule-2.0", "gtk+-2.0", "gthread-2.0" ] | |
+ packages = [ "gmodule-2.0", "gthread-2.0" ] | |
} | |
pkg_config("pangocairo") { | |
diff --git a/build/linux/system.gyp b/build/linux/system.gyp | |
index 7911ae9..b29d4f8 100644 | |
--- a/build/linux/system.gyp | |
+++ b/build/linux/system.gyp | |
@@ -18,7 +18,7 @@ | |
'linux_link_libbrlapi%': 0, | |
}, | |
'conditions': [ | |
- [ 'chromeos==0', { | |
+ [ 'chromeos==0 and toolkit_uses_gtk==1', { | |
# Hide GTK and related dependencies for Chrome OS, so they won't get | |
# added back to Chrome OS. Don't try to use GTK on Chrome OS. | |
'targets': [ | |
@@ -532,7 +532,7 @@ | |
'g_settings_get_boolean', | |
'g_settings_get_int', | |
'g_settings_get_strv', | |
- 'g_settings_list_schemas', | |
+ 'g_settings_schema_source_list_schemas', | |
], | |
'message': 'Generating libgio library loader', | |
'process_outputs_as_sources': 1, | |
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc | |
index 4bbe0cb..5e75fbe 100644 | |
--- a/net/proxy/proxy_config_service_linux.cc | |
+++ b/net/proxy/proxy_config_service_linux.cc | |
@@ -546,7 +546,10 @@ class SettingGetterImplGSettings | |
} | |
bool SchemaExists(const char* schema_name) { | |
- const gchar* const* schemas = libgio_loader_.g_settings_list_schemas(); | |
+ gchar **schemas; | |
+ | |
+ libgio_loader_.g_settings_schema_source_list_schemas | |
+ (g_settings_schema_source_get_default(), TRUE, &schemas, NULL); | |
while (*schemas) { | |
if (strcmp(schema_name, static_cast<const char*>(*schemas)) == 0) | |
return true; | |
diff --git a/skia/ext/bitmap_platform_device_cairo.cc b/skia/ext/bitmap_platform_device_cairo.cc | |
index f936649..56a1f8d 100644 | |
--- a/skia/ext/bitmap_platform_device_cairo.cc | |
+++ b/skia/ext/bitmap_platform_device_cairo.cc | |
@@ -8,7 +8,8 @@ | |
#if defined(OS_OPENBSD) | |
#include <cairo.h> | |
#else | |
-#include <cairo/cairo.h> | |
+// XXX #include <cairo/cairo.h> | |
+#include "/home/tiago/install/include/cairo/cairo.h" | |
#endif | |
namespace skia { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment