| 1 |
phajdan.jr 10/09/07 17:19:25 |
| 2 |
|
| 3 |
Added: chromium-gnome-keyring-r0.patch |
| 4 |
Log: |
| 5 |
Fix dependencies, bug #332411 by Patrizio Bassi <hetfield666@×××××.com> and comment by Yuri Arabadji <yuri@××××××××.net>. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 www-client/chromium/files/chromium-gnome-keyring-r0.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gnome-keyring-r0.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-gnome-keyring-r0.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: chromium-gnome-keyring-r0.patch |
| 15 |
=================================================================== |
| 16 |
--- build/linux/system.gyp.orig 2010-09-07 01:22:40.000000000 +0200 |
| 17 |
+++ build/linux/system.gyp 2010-09-07 01:31:23.000000000 +0200 |
| 18 |
@@ -3,6 +3,10 @@ |
| 19 |
# found in the LICENSE file. |
| 20 |
|
| 21 |
{ |
| 22 |
+ 'variables': { |
| 23 |
+ 'use_gnome_keyring%': 1, |
| 24 |
+ }, |
| 25 |
+ |
| 26 |
'conditions': [ |
| 27 |
['sysroot!=""', { |
| 28 |
'variables': { |
| 29 |
@@ -259,11 +263,14 @@ |
| 30 |
'target_name': 'gnome-keyring', |
| 31 |
'type': 'settings', |
| 32 |
'conditions': [ |
| 33 |
- ['chromeos==0', { |
| 34 |
+ ['chromeos==0 and use_gnome_keyring==1', { |
| 35 |
'direct_dependent_settings': { |
| 36 |
'cflags': [ |
| 37 |
'<!@(<(pkg-config) --cflags gnome-keyring-1)', |
| 38 |
], |
| 39 |
+ 'defines': [ |
| 40 |
+ 'USE_GNOME_KEYRING', |
| 41 |
+ ], |
| 42 |
'conditions': [ |
| 43 |
['linux_link_gnome_keyring==0', { |
| 44 |
'defines': ['DLOPEN_GNOME_KEYRING'], |
| 45 |
--- chrome/chrome_browser.gypi.orig 2010-09-07 02:57:21.000000000 +0200 |
| 46 |
+++ chrome/chrome_browser.gypi 2010-09-07 02:58:23.000000000 +0200 |
| 47 |
@@ -3062,6 +3062,12 @@ |
| 48 |
], |
| 49 |
}, |
| 50 |
}], |
| 51 |
+ ['chromeos==1 or use_gnome_keyring==0', { |
| 52 |
+ 'sources!': [ |
| 53 |
+ 'browser/password_manager/native_backend_gnome_x.h', |
| 54 |
+ 'browser/password_manager/native_backend_gnome_x.cc', |
| 55 |
+ ], |
| 56 |
+ }], |
| 57 |
['touchui==0', { |
| 58 |
'sources!': [ |
| 59 |
# Nothing yet. |
| 60 |
@@ -3096,7 +3102,7 @@ |
| 61 |
'third_party/mozilla_security_manager/nsUsageArrayHelper.h', |
| 62 |
], |
| 63 |
'conditions': [ |
| 64 |
- ['chromeos==0', { |
| 65 |
+ ['chromeos==0 and use_gnome_keyring==1', { |
| 66 |
'dependencies': [ |
| 67 |
'../build/linux/system.gyp:gnome-keyring', |
| 68 |
], |
| 69 |
--- chrome/browser/profile_impl.cc.orig 2010-09-07 01:35:40.000000000 +0200 |
| 70 |
+++ chrome/browser/profile_impl.cc 2010-09-07 01:36:26.000000000 +0200 |
| 71 |
@@ -89,7 +89,9 @@ |
| 72 |
#include "chrome/browser/password_manager/password_store_mac.h" |
| 73 |
#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) |
| 74 |
#include "base/xdg_util.h" |
| 75 |
+#if defined(USE_GNOME_KEYRING) |
| 76 |
#include "chrome/browser/password_manager/native_backend_gnome_x.h" |
| 77 |
+#endif |
| 78 |
#include "chrome/browser/password_manager/native_backend_kwallet_x.h" |
| 79 |
#include "chrome/browser/password_manager/password_store_x.h" |
| 80 |
#endif |
| 81 |
@@ -923,12 +925,14 @@ |
| 82 |
backend.reset(); |
| 83 |
} else if (desktop_env == base::DESKTOP_ENVIRONMENT_GNOME || |
| 84 |
desktop_env == base::DESKTOP_ENVIRONMENT_XFCE) { |
| 85 |
+#if defined(USE_GNOME_KEYRING) |
| 86 |
LOG(INFO) << "Trying GNOME keyring for password storage."; |
| 87 |
backend.reset(new NativeBackendGnome()); |
| 88 |
if (backend->Init()) |
| 89 |
LOG(INFO) << "Using GNOME keyring for password storage."; |
| 90 |
else |
| 91 |
backend.reset(); |
| 92 |
+#endif // defined(USE_GNOME_KEYRING) |
| 93 |
} |
| 94 |
// TODO(mdm): this can change to a WARNING when we detect by default. |
| 95 |
if (!backend.get()) |
Archives