diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-11-24 13:19:01 -0600 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-11-24 13:19:26 -0600 |
| commit | e3172f521768af3d349a22889229a0e9669de9c6 (patch) | |
| tree | 17afc461941124d9c1721e009ac6f204cdf5daca /testing/chromium/chromium-no-mit-screensaver.patch | |
| parent | 228431404d99b59b6d67e52d47fa88f3b8cdccb0 (diff) | |
| download | aports-fcolista-e3172f521768af3d349a22889229a0e9669de9c6.tar.bz2 aports-fcolista-e3172f521768af3d349a22889229a0e9669de9c6.tar.xz | |
testing/chromium: it builds (no promises other than that though)
Diffstat (limited to 'testing/chromium/chromium-no-mit-screensaver.patch')
| -rw-r--r-- | testing/chromium/chromium-no-mit-screensaver.patch | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/testing/chromium/chromium-no-mit-screensaver.patch b/testing/chromium/chromium-no-mit-screensaver.patch index e6061e26c5..25ca29ac97 100644 --- a/testing/chromium/chromium-no-mit-screensaver.patch +++ b/testing/chromium/chromium-no-mit-screensaver.patch @@ -1,11 +1,11 @@ ---- chromium-13.0.754.0.orig/chrome/browser/idle_query_linux.cc -+++ chromium-13.0.754.0/chrome/browser/idle_query_linux.cc -@@ -4,35 +4,12 @@ +--- chromium-17.0.942.0.orig/chrome/browser/idle_query_linux.cc ++++ chromium-17.0.942.0/chrome/browser/idle_query_linux.cc +@@ -4,30 +4,12 @@ #include "chrome/browser/idle_query_linux.h" --#include <X11/Xlib.h> -#include <X11/extensions/scrnsaver.h> +-#include "ui/base/x/x11_util.h" - namespace browser { @@ -14,8 +14,8 @@ - IdleData() { - int event_base; - int error_base; -- display = XOpenDisplay(NULL); -- if (XScreenSaverQueryExtension(display, &event_base, &error_base)) { +- if (XScreenSaverQueryExtension(ui::GetXDisplay(), &event_base, +- &error_base)) { - mit_info = XScreenSaverAllocInfo(); - } else { - mit_info = NULL; @@ -23,30 +23,25 @@ - } - - ~IdleData() { -- if (display) { -- XCloseDisplay(display); -- display = NULL; -- } - if (mit_info) - XFree(mit_info); - } - - XScreenSaverInfo *mit_info; -- Display *display; + IdleData() {} + ~IdleData() {} }; IdleQueryLinux::IdleQueryLinux() : idle_data_(new IdleData()) {} -@@ -40,16 +17,7 @@ +@@ -35,16 +17,7 @@ IdleQueryLinux::~IdleQueryLinux() {} int IdleQueryLinux::IdleTime() { -- if (!idle_data_->mit_info || !idle_data_->display) +- if (!idle_data_->mit_info) - return 0; - -- if (XScreenSaverQueryInfo(idle_data_->display, -- RootWindow(idle_data_->display, 0), +- if (XScreenSaverQueryInfo(ui::GetXDisplay(), +- RootWindow(ui::GetXDisplay(), 0), - idle_data_->mit_info)) { - return (idle_data_->mit_info->idle) / 1000; - } else { @@ -56,9 +51,9 @@ } } // namespace browser ---- chromium-13.0.754.0.orig/chrome/chrome.gyp -+++ chromium-13.0.754.0/chrome/chrome.gyp -@@ -673,11 +673,6 @@ +--- chromium-17.0.942.0.orig/chrome/chrome.gyp ++++ chromium-17.0.942.0/chrome/chrome.gyp +@@ -530,11 +530,6 @@ 'dependencies': [ '../build/linux/system.gyp:gtk', ], @@ -70,9 +65,9 @@ }], ['OS=="linux" and chromeos==1', { 'include_dirs': [ ---- chromium-13.0.754.0.orig/chrome/chrome_common.gypi -+++ chromium-13.0.754.0/chrome/chrome_common.gypi -@@ -262,7 +262,6 @@ +--- chromium-17.0.942.0.orig/chrome/chrome_common.gypi ++++ chromium-17.0.942.0/chrome/chrome_common.gypi +@@ -257,7 +257,6 @@ 'libraries': [ '-lX11', '-lXrender', @@ -80,3 +75,17 @@ '-lXext', ], }, +--- chromium-17.0.942.0.orig/chrome/chrome_browser.gypi ++++ chromium-17.0.942.0/chrome/chrome_browser.gypi +@@ -4260,11 +4260,6 @@ + ], + }], + ['os_posix == 1 and OS != "mac"', { +- 'link_settings': { +- 'libraries': [ +- '-lXss', +- ], +- }, + 'conditions': [ + ['linux_breakpad==1', { + 'sources': [ |