diff --git a/atom.gyp b/atom.gyp index b2856bb852dc..63f7e711cfe9 100644 --- a/atom.gyp +++ b/atom.gyp @@ -561,6 +561,10 @@ '-rpath \$$ORIGIN', # Make native module dynamic loading work. '-rdynamic', + ' env(base::Environment::Create()); - bool is_unity = unity::IsRunning() && - base::nix::GetDesktopEnvironment(env.get()) == - base::nix::DESKTOP_ENVIRONMENT_UNITY; - std::string menu_proxy; - return is_unity && env->GetVar("UBUNTU_MENUPROXY", &menu_proxy) && - menu_proxy.length() > 1; + dbus::Bus::Options options; + scoped_refptr bus(new dbus::Bus(options)); + + dbus::ObjectProxy* object_proxy = + bus->GetObjectProxy(DBUS_SERVICE_DBUS, dbus::ObjectPath(DBUS_PATH_DBUS)); + dbus::MethodCall method_call(DBUS_INTERFACE_DBUS, "ListNames"); + scoped_ptr response(object_proxy->CallMethodAndBlock( + &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT)); + if (!response) { + bus->ShutdownAndBlock(); + return false; + } + + dbus::MessageReader reader(response.get()); + dbus::MessageReader array_reader(NULL); + if (!reader.PopArray(&array_reader)) { + bus->ShutdownAndBlock(); + return false; + } + while (array_reader.HasMoreData()) { + std::string name; + if (array_reader.PopString(&name) && + name == "com.canonical.AppMenu.Registrar") { + bus->ShutdownAndBlock(); + return true; + } + } + + bus->ShutdownAndBlock(); + return false; } #endif diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md index d5c9883d6812..bf67f1673076 100644 --- a/docs/development/build-instructions-linux.md +++ b/docs/development/build-instructions-linux.md @@ -8,7 +8,7 @@ On Ubuntu you could install the libraries via: ```bash -$ sudo apt-get install build-essential clang libgtk2.0-dev libnotify-dev gcc-multilib g++-multilib +$ sudo apt-get install build-essential clang libdbus-1-dev libgtk2.0-dev libnotify-dev gcc-multilib g++-multilib ``` Latest Node.js could be installed via ppa: diff --git a/script/cibuild b/script/cibuild index f481c2869afe..b8939775c301 100755 --- a/script/cibuild +++ b/script/cibuild @@ -10,6 +10,7 @@ from lib.util import execute, rm_rf, scoped_env SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) LINUX_DEPS = [ + 'libdbus-1-dev', 'libgnome-keyring-dev', 'libgtk2.0-dev', 'libnotify-dev', diff --git a/script/lib/config.py b/script/lib/config.py index 7b6bc574fd67..09ea75cbb8f5 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -4,7 +4,7 @@ import platform import sys BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '9f5271d31e0f32eac5a20ef6f543e3f1d43ad645' +LIBCHROMIUMCONTENT_COMMIT = '56984fa0e4c3c745652510f342c0fb2724d846c2' ARCH = { 'cygwin': '32bit',