1 |
phajdan.jr 10/10/01 08:34:59 |
2 |
|
3 |
Added: chromium-system-sqlite-r0.patch |
4 |
Log: |
5 |
Version bump for dev channel release. Add an option to build with system-provided sqlite library. Re-enable tcmalloc support. Minor ebuild cleanups. Remove old versions. |
6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 www-client/chromium/files/chromium-system-sqlite-r0.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-sqlite-r0.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-system-sqlite-r0.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: chromium-system-sqlite-r0.patch |
15 |
=================================================================== |
16 |
--- third_party/sqlite/sqlite3.h.orig 2010-09-30 13:13:26.000000000 +0200 |
17 |
+++ third_party/sqlite/sqlite3.h 2010-09-30 13:13:37.000000000 +0200 |
18 |
@@ -14,7 +14,7 @@ |
19 |
|
20 |
// A no-op implementation of database preloading (not available |
21 |
// when using system sqlite). |
22 |
-int sqlite3Preload(sqlite3 *db) { return SQLITE_OK; } |
23 |
+int sqlite3Preload(sqlite3 *db); |
24 |
#else |
25 |
#include "third_party/sqlite/preprocessed/sqlite3.h" |
26 |
#endif |
27 |
--- third_party/sqlite/sqlite.gyp.orig 2010-09-30 11:49:48.000000000 +0200 |
28 |
+++ third_party/sqlite/sqlite.gyp 2010-09-30 11:51:38.000000000 +0200 |
29 |
@@ -32,7 +32,7 @@ |
30 |
}, |
31 |
}], |
32 |
['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', { |
33 |
- 'type': 'settings', |
34 |
+ 'type': '<(library)', |
35 |
'direct_dependent_settings': { |
36 |
'cflags': [ |
37 |
# This next command produces no output but it it will fail (and |
38 |
@@ -54,6 +54,9 @@ |
39 |
'<!@(pkg-config --libs-only-l sqlite3)', |
40 |
], |
41 |
}, |
42 |
+ 'sources': [ |
43 |
+ 'stubs.cc', |
44 |
+ ], |
45 |
}, { # else: OS != "linux" or ! use_system_sqlite |
46 |
'product_name': 'sqlite3', |
47 |
'type': '<(library)', |
48 |
--- /dev/null 2010-09-03 08:04:12.886666449 +0200 |
49 |
+++ third_party/sqlite/stubs.cc 2010-09-30 11:53:35.000000000 +0200 |
50 |
@@ -0,0 +1,5 @@ |
51 |
+#include <sqlite3.h> |
52 |
+ |
53 |
+int sqlite3Preload(sqlite3 *db) { |
54 |
+ return SQLITE_OK; |
55 |
+} |
56 |
--- chrome/chrome.gyp.orig 2010-10-01 06:57:23.000000000 +0200 |
57 |
+++ chrome/chrome.gyp 2010-10-01 06:58:09.000000000 +0200 |
58 |
@@ -1018,6 +1018,7 @@ |
59 |
'_USE_32BIT_TIME_T', |
60 |
], |
61 |
'dependencies': [ |
62 |
+ 'common', |
63 |
'../skia/skia.gyp:skia', |
64 |
'../third_party/libjingle/libjingle.gyp:libjingle', |
65 |
'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', |