diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-05-06 08:18:45 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-05-06 08:19:15 -0500 |
| commit | b6c00fd50fb0e2166f1856e9813c512d6f20714f (patch) | |
| tree | f656096a3b02cb41efa5504e2b8e66239cae96d6 /testing/chromium/chromium-no-mit-screensaver.patch | |
| parent | fab2389fa813a1d3d7441d733fd8adb2144d1cac (diff) | |
| download | aports-b6c00fd50fb0e2166f1856e9813c512d6f20714f.tar.bz2 aports-b6c00fd50fb0e2166f1856e9813c512d6f20714f.tar.xz | |
testing/chromium: new aport, not actually enabled on any architectures yet
Diffstat (limited to 'testing/chromium/chromium-no-mit-screensaver.patch')
| -rw-r--r-- | testing/chromium/chromium-no-mit-screensaver.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/testing/chromium/chromium-no-mit-screensaver.patch b/testing/chromium/chromium-no-mit-screensaver.patch new file mode 100644 index 0000000000..e6061e26c5 --- /dev/null +++ b/testing/chromium/chromium-no-mit-screensaver.patch @@ -0,0 +1,82 @@ +--- 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 @@ + + #include "chrome/browser/idle_query_linux.h" + +-#include <X11/Xlib.h> +-#include <X11/extensions/scrnsaver.h> +- + namespace browser { + + class IdleData { + public: +- IdleData() { +- int event_base; +- int error_base; +- display = XOpenDisplay(NULL); +- if (XScreenSaverQueryExtension(display, &event_base, &error_base)) { +- mit_info = XScreenSaverAllocInfo(); +- } else { +- mit_info = NULL; +- } +- } +- +- ~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 @@ + IdleQueryLinux::~IdleQueryLinux() {} + + int IdleQueryLinux::IdleTime() { +- if (!idle_data_->mit_info || !idle_data_->display) +- return 0; +- +- if (XScreenSaverQueryInfo(idle_data_->display, +- RootWindow(idle_data_->display, 0), +- idle_data_->mit_info)) { +- return (idle_data_->mit_info->idle) / 1000; +- } else { +- return 0; +- } ++ return 0; + } + + } // namespace browser +--- chromium-13.0.754.0.orig/chrome/chrome.gyp ++++ chromium-13.0.754.0/chrome/chrome.gyp +@@ -673,11 +673,6 @@ + 'dependencies': [ + '../build/linux/system.gyp:gtk', + ], +- 'link_settings': { +- 'libraries': [ +- '-lXss', +- ], +- }, + }], + ['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 @@ + 'libraries': [ + '-lX11', + '-lXrender', +- '-lXss', + '-lXext', + ], + }, |