| 1 |
phajdan.jr 11/01/28 09:52:27 |
| 2 |
|
| 3 |
Modified: ChangeLog chromium-9999.ebuild |
| 4 |
Log: |
| 5 |
Remove system-sqlite USE flag, it's broken upstream. Bug #352892 by fkhp <fkhp101@×××.com>. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.269 www-client/chromium/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.269&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.269&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.268&r2=1.269 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
| 19 |
retrieving revision 1.268 |
| 20 |
retrieving revision 1.269 |
| 21 |
diff -u -r1.268 -r1.269 |
| 22 |
--- ChangeLog 27 Jan 2011 10:46:25 -0000 1.268 |
| 23 |
+++ ChangeLog 28 Jan 2011 09:52:27 -0000 1.269 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for www-client/chromium |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.268 2011/01/27 10:46:25 phajdan.jr Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.269 2011/01/28 09:52:27 phajdan.jr Exp $ |
| 29 |
+ |
| 30 |
+ 28 Jan 2011; Pawel Hajdan jr <phajdan.jr@g.o> chromium-9999.ebuild: |
| 31 |
+ Remove system-sqlite USE flag, it's broken upstream. Bug #352892 by fkhp |
| 32 |
+ <fkhp101@×××.com>. |
| 33 |
|
| 34 |
*chromium-10.0.648.6 (27 Jan 2011) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.129 www-client/chromium/chromium-9999.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.129&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.129&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.128&r2=1.129 |
| 44 |
|
| 45 |
Index: chromium-9999.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
| 48 |
retrieving revision 1.128 |
| 49 |
retrieving revision 1.129 |
| 50 |
diff -u -r1.128 -r1.129 |
| 51 |
--- chromium-9999.ebuild 22 Jan 2011 16:18:21 -0000 1.128 |
| 52 |
+++ chromium-9999.ebuild 28 Jan 2011 09:52:27 -0000 1.129 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.128 2011/01/22 16:18:21 phajdan.jr Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.129 2011/01/28 09:52:27 phajdan.jr Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
PYTHON_DEPEND="2:2.6" |
| 61 |
@@ -17,12 +17,9 @@ |
| 62 |
LICENSE="BSD" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="" |
| 65 |
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite" |
| 66 |
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring" |
| 67 |
|
| 68 |
RDEPEND="app-arch/bzip2 |
| 69 |
- system-sqlite? ( |
| 70 |
- >=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] |
| 71 |
- ) |
| 72 |
dev-lang/v8 |
| 73 |
dev-libs/dbus-glib |
| 74 |
>=dev-libs/icu-4.4.1 |
| 75 |
@@ -198,13 +195,6 @@ |
| 76 |
rmdir v8/include || die |
| 77 |
ln -s /usr/include v8/include || die |
| 78 |
|
| 79 |
- if use system-sqlite; then |
| 80 |
- # Remove bundled sqlite, preserving the shim header. |
| 81 |
- find third_party/sqlite -type f \! -iname '*.gyp*' \ |
| 82 |
- \! -path 'third_party/sqlite/sqlite3.h' \ |
| 83 |
- -delete || die |
| 84 |
- fi |
| 85 |
- |
| 86 |
# Make sure the build system will use the right python, bug #344367. |
| 87 |
# Only convert directories that need it, to save time. |
| 88 |
python_convert_shebangs -q -r 2 build tools |
| 89 |
@@ -220,6 +210,7 @@ |
| 90 |
# Use system-provided libraries. |
| 91 |
# TODO: use_system_hunspell (upstream changes needed). |
| 92 |
# TODO: use_system_ssl (need to consult upstream). |
| 93 |
+ # TODO: use_system_sqlite (http://crbug.com/22208). |
| 94 |
myconf+=" |
| 95 |
-Duse_system_bzip2=1 |
| 96 |
-Duse_system_ffmpeg=1 |
| 97 |
@@ -234,10 +225,6 @@ |
| 98 |
-Duse_system_xdg_utils=1 |
| 99 |
-Duse_system_zlib=1" |
| 100 |
|
| 101 |
- if use system-sqlite; then |
| 102 |
- myconf+=" -Duse_system_sqlite=1" |
| 103 |
- fi |
| 104 |
- |
| 105 |
# The dependency on cups is optional, see bug #324105. |
| 106 |
if use cups; then |
| 107 |
myconf+=" -Duse_cups=1" |
Archives