Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/
Date: Thu, 28 Sep 2017 17:18:54
Message-Id: 1506618657.5f80a5be1a768e5964f4d4f3399eb3b91912c81f.floppym@gentoo
1 commit: 5f80a5be1a768e5964f4d4f3399eb3b91912c81f
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Sep 28 15:26:19 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 28 17:10:57 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f80a5be
7
8 dev-db/sqlite: Fix csv extension on ppc/ppc64 (bug #630698).
9
10 ...ite-3.20.1-full_tarball-csv-unsigned_char.patch | 33 ++++++++++++++++++++++
11 ...qlite-3.20.1.ebuild => sqlite-3.20.1-r1.ebuild} | 1 +
12 2 files changed, 34 insertions(+)
13
14 diff --git a/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch
15 new file mode 100644
16 index 00000000000..86236c4b4bf
17 --- /dev/null
18 +++ b/dev-db/sqlite/files/sqlite-3.20.1-full_tarball-csv-unsigned_char.patch
19 @@ -0,0 +1,33 @@
20 +https://sqlite.org/src/info/42f0777555675875
21 +
22 +--- ext/misc/csv.c
23 ++++ ext/misc/csv.c
24 +@@ -78,7 +78,7 @@
25 + int nAlloc; /* Space allocated for z[] */
26 + int nLine; /* Current line number */
27 + int bNotFirst; /* True if prior text has been seen */
28 +- char cTerm; /* Character that terminated the most recent field */
29 ++ int cTerm; /* Character that terminated the most recent field */
30 + size_t iIn; /* Next unread character in the input buffer */
31 + size_t nIn; /* Number of characters in the input buffer */
32 + char *zIn; /* The input buffer */
33 +@@ -166,7 +166,7 @@
34 + if( p->in!=0 ) return csv_getc_refill(p);
35 + return EOF;
36 + }
37 +- return p->zIn[p->iIn++];
38 ++ return ((unsigned char*)p->zIn)[p->iIn++];
39 + }
40 +
41 + /* Increase the size of p->z and append character c to the end.
42 +--- test/releasetest.tcl
43 ++++ test/releasetest.tcl
44 +@@ -114,7 +114,7 @@
45 + }
46 + "Debug-One" {
47 + --disable-shared
48 +- -O2
49 ++ -O2 -funsigned-char
50 + -DSQLITE_DEBUG=1
51 + -DSQLITE_MEMDEBUG=1
52 + -DSQLITE_MUTEX_NOOP=1
53
54 diff --git a/dev-db/sqlite/sqlite-3.20.1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
55 similarity index 99%
56 rename from dev-db/sqlite/sqlite-3.20.1.ebuild
57 rename to dev-db/sqlite/sqlite-3.20.1-r1.ebuild
58 index ee52cadc0f7..7b6ce7814c0 100644
59 --- a/dev-db/sqlite/sqlite-3.20.1.ebuild
60 +++ b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
61 @@ -50,6 +50,7 @@ pkg_setup() {
62 src_prepare() {
63 if full_tarball; then
64 eapply -p0 "${FILESDIR}/${PN}-3.20.0-full_tarball-build.patch"
65 + eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-csv-unsigned_char.patch"
66
67 eapply_user