Fix bug #293405 so that fts3 support compiles when tcl is not installed. The patch is applied only when tcl is not installed because otherwise the build breaks. Because mozilla needs the support doing it like this so that we get the fix in tree faster. Patch originally from anarchy.

Package-Manager: portage-2.2_rc49/cvs/Linux i686

4 files changed, 92 insertions, 4 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 3ea7a86554cb..67aa6e611379 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.294 2009/11/17 19:48:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.295 2009/11/22 09:09:37 betelgeuse Exp $
+
+  22 Nov 2009; Petteri Räty <betelgeuse@gentoo.org>
+  sqlite-3.6.20-r1.ebuild, +files/sqlite-3.6.20-fts3.patch:
+  Fix bug #293405 so that fts3 support compiles when tcl is not installed.
+  The patch is applied only when tcl is not installed because otherwise the
+  build breaks. Because mozilla needs the support doing it like this so that
+  we get the fix in tree faster. Patch originally from anarchy.
 
   17 Nov 2009; Brent Baude <ranger@gentoo.org> sqlite-3.6.19.ebuild:
   Marking sqlite-3.6.19 ppc64 for bug 291913
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index b013db5e67e4..c8c6f3712509 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX maketcllib.sh 879 RMD160 6d9a0e79a79d5a2efd6074e6b439d4634600980e SHA1 d5bb6054d3c9a4132c92bd8c172a547bf2cc9d85 SHA256 e101ed11d908bfb7f57519a99674160b0273d6500d191f758f8a0d1e6ed78120
 AUX sandbox-fix2.patch 432 RMD160 778fe532561642dbae6d1a3f572f6703828af42b SHA1 1b0eee83c7d6d2e36ffdf0265c8bdd14d1574a61 SHA256 21552219c14daad788380ae7e1ba6c665bb1ef9eadb611f676bd6249e3bde02d
 AUX sqlite-2.8.15-alignement-fix.patch 538 RMD160 12407bbe5f1bcae243d4247b43bf63ce0e8becea SHA1 d67a8bb2de26b1d6b7222175bd7f69d28afffb1e SHA256 f61f2f36fed61438d13dbb09902078ef11f0c3e8c8a119f84030689a2f2add8f
@@ -6,6 +9,7 @@ AUX sqlite-3.6.14.2-fix_alignment.patch 870 RMD160 754a1c9b00ff204e99e11acbdddcf
 AUX sqlite-3.6.16-tkt3922.test.patch 549 RMD160 711f26307a1df64813035831aad3053794a8bf7b SHA1 0a4a633816c89d119db206a0e78a406ca5bf053b SHA256 8be8c9f765a191366abca0c856f6635ffddaccafad95861646052d99c476c3eb
 AUX sqlite-3.6.17-fix_installation.patch 3635 RMD160 8ab60122e4b1fdc64182d7fc86a7516a8cb36a36 SHA1 b6848c7f5fa1787e8d938a7c2bf450d0deefc166 SHA256 ee5f675fecbb392ca13a9fc7bf8ae489d9497951ebacd28d71205e8eb9fce175
 AUX sqlite-3.6.19-icu.test.patch 421 RMD160 a0eb98660981853c0e46c34935cb75721a712c59 SHA1 a01106d425106a02721c15cf314db825f2bb7ca6 SHA256 532f8bbb0366a3f51975c3d2a719b9e4b101b30da07df75f107f87f42d260c59
+AUX sqlite-3.6.20-fts3.patch 1962 RMD160 2a772fccbbc5ad9f9fef65dbc86b83bb686976a9 SHA1 58818059424bc083e9c6604835990e7e2d1614b9 SHA256 b34f443de69deded1f849f0b74f8cacff74ae173be320f44c0c5b89fcbf445a8
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.6.14.2.tar.gz 2896850 RMD160 219833d61a2e0bf5fde136528b9725c0589d2491 SHA1 19206a419e39bb2de01ed12c2d95c928e97e7252 SHA256 94a5b9dcc841baeb000971b15c6b66f50add7bc160030de5aea8622db3e7060e
 DIST sqlite-3.6.17.tar.gz 2926671 RMD160 401e09545bf335aca38a749ec54115b9220e232a SHA1 fa71b93563809ce666c3d6ccd7b6bcaaafc433b3 SHA256 490385689cf8113499a9f66bd96f64824b597ba77be54dd7a0fdf744483a2ef8
@@ -26,7 +30,14 @@ EBUILD sqlite-3.6.14.2.ebuild 2299 RMD160 29d0105f277cfbe7e88b5185eb94b4f8947a40
 EBUILD sqlite-3.6.17.ebuild 2469 RMD160 bba4a89557f718396e862caf501cd2e83473215a SHA1 107d40626bd4b6d79238b993e718fa4ff61d6c10 SHA256 10a190c56a35015a52081e9b2c37996b5dbf2ed75d3ce369d5ca9e8c3b492168
 EBUILD sqlite-3.6.18.ebuild 2925 RMD160 f6bfcc2e618b89d6e4fb41e4f999d885d655b353 SHA1 8103e492adce067431e209ccf196dfd4125a3f80 SHA256 7336cda27e0a0af5139b9b2483f91795633b706bf36805538cc1b4fa224a7a8e
 EBUILD sqlite-3.6.19.ebuild 2972 RMD160 3d376ba551bac70318bdc69fa867b89246fee27e SHA1 d4837c3dc234d95ac26f85cab34359aabd79ad76 SHA256 06b4c5e951ccbd5775ea265b07365fca10933f70cc257f5916bb7e7c2889d243
-EBUILD sqlite-3.6.20-r1.ebuild 3049 RMD160 1871a2784c1d2bca4e9356d0604607a4ad607cd8 SHA1 1d3658c9fdbdd7e213419b92e641e24f4bd4069b SHA256 0097dd6a20c493208c7a1854dcb36b8bf8fb417d189c5debab3ed0465344df3a
+EBUILD sqlite-3.6.20-r1.ebuild 3276 RMD160 60be12a735688fd47b052a1a7290c1e5e8c087d8 SHA1 aac8dd9c6793e792d7a31608c685d67429700b63 SHA256 b169b1fb8bf10f8426cd732d2e7f501e7185e717caef71cb472f75df774b01bf
 EBUILD sqlite-3.6.20.ebuild 2937 RMD160 479da23a696b1d2048fbe58db687198c5806bcf2 SHA1 a17d2a7f25ec11f0192cf970ed90cbab182c3f6f SHA256 723397d073859ca4027a22175d8d16c8789d9275797b444fc966e7267d59617b
-MISC ChangeLog 39941 RMD160 d92055665066729941eab847fd3ae285dd640ac2 SHA1 4c12ed62d55b66f420014d720c62d5f56aa6e67d SHA256 daae8c86137468745b60952cf5b64c527fc65903df2ed4e0273e5d744915c40e
+MISC ChangeLog 40351 RMD160 7b616bf3476024926b94e6f9adc4062c3610bab0 SHA1 8e70cb8c0f0372661f19cff6935de350c83cb391 SHA256 b83099e4b2f9f8783a2e97bd5aed711116155cf7cbbdf0180fc183f0f20b70a1
 MISC metadata.xml 643 RMD160 ea04328f1133181b162ab919c6c221fbbf85c808 SHA1 76bc55999b5481e28cfe13c97eac54f039e0ea0c SHA256 edbc4a70b6504db4a408c5081439ab5055af567e1f222216bd52560fe92487de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksI//wACgkQcxLzpIGCsLTCfACeJdrPJI3cMMh8LV6xIKvfRWtY
+rOkAoJVBUdb7idkEVMM9iTKlAd02ccns
+=nCwN
+-----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/sqlite-3.6.20-fts3.patch b/dev-db/sqlite/files/sqlite-3.6.20-fts3.patch
new file mode 100644
index 000000000000..3c7cb811b56c
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.6.20-fts3.patch
@@ -0,0 +1,65 @@
+diff -urN sqlite-3.6.20-orig/Makefile.in sqlite-3.6.20/Makefile.in
+--- sqlite-3.6.20-orig/Makefile.in	2009-11-13 20:10:50.617845091 -0600
++++ sqlite-3.6.20/Makefile.in	2009-11-13 20:10:54.994843274 -0600
+@@ -150,6 +150,11 @@
+ LIBTOOL = ./libtool
+ ALLOWRELEASE = @ALLOWRELEASE@
+ 
++# FTS3
++#
++TCC += -DSQLITE_CORE
++TCC += -DSQLITE_ENABLE_FTS3=1
++
+ # libtool compile/link/install
+ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC) $(LTCOMPILE_EXTRAS)
+ LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LTCOMPILE_EXTRAS) @LDFLAGS@ $(LTLINK_EXTRAS)
+@@ -187,7 +192,11 @@
+ USE_AMALGAMATION = @USE_AMALGAMATION@
+ LIBOBJ = $(OBJS$(USE_AMALGAMATION))
+ 
+-
++# Object files for FTS
++#
++LIBOBJ += \
++	fts3.lo fts3_expr.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer.lo fts3_tokenizer1.lo
++ 
+ # All of the source code files.
+ #
+ SRC = \
+@@ -832,3 +841,24 @@
+ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
+ 	$(TCC) -shared -o $@ sqlite3.def \
+ 		-Wl,"--strip-all" $(REAL_LIBOBJ)
++
++#
++# FTS3
++#
++fts3.lo: $(TOP)/ext/fts3/fts3.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
++ 
++fts3_expr.lo: $(TOP)/ext/fts3/fts3_expr.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c
++ 
++fts3_hash.lo: $(TOP)/ext/fts3/fts3_hash.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
++ 
++fts3_porter.lo: $(TOP)/ext/fts3/fts3_porter.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
++ 
++fts3_tokenizer.lo: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
++ 
++fts3_tokenizer1.lo: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
+diff -urN sqlite-3.6.20-orig/src/main.c sqlite-3.6.20/src/main.c
+--- sqlite-3.6.20-orig/src/main.c	2009-11-13 20:10:50.674843345 -0600
++++ sqlite-3.6.20/src/main.c	2009-11-13 20:11:30.403822462 -0600
+@@ -17,7 +17,7 @@
+ #include "sqliteInt.h"
+ 
+ #ifdef SQLITE_ENABLE_FTS3
+-# include "fts3.h"
++# include "../ext/fts3/fts3.h"
+ #endif
+ #ifdef SQLITE_ENABLE_RTREE
+ # include "rtree.h"
diff --git a/dev-db/sqlite/sqlite-3.6.20-r1.ebuild b/dev-db/sqlite/sqlite-3.6.20-r1.ebuild
index b8784e5143a1..dbfcd811c9ac 100644
--- a/dev-db/sqlite/sqlite-3.6.20-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.20-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.20-r1.ebuild,v 1.1 2009/11/15 09:13:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.20-r1.ebuild,v 1.2 2009/11/22 09:09:37 betelgeuse Exp $
 
 EAPI="2"
 
@@ -43,6 +43,11 @@ src_prepare() {
 		rm -f test/like.test
 	fi
 
+	# http://bugs.gentoo.org/show_bug.cgi?id=293405
+	# Needed to compile without tcl installed but fails to compile when it
+	# it installed
+	use fts3 && ! has_version dev-lang/tcl && epatch "${FILESDIR}/sqlite-3.6.20-fts3.patch"
+
 	epunt_cxx
 }