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, 26 Apr 2018 15:14:23
Message-Id: 1524755537.b5bd242b0ee5b96c7fe39c765caf261c1a674088.floppym@gentoo
1 commit: b5bd242b0ee5b96c7fe39c765caf261c1a674088
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Wed Apr 25 18:59:04 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 26 15:12:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bd242b
7
8 dev-db/sqlite: Fix zipfile2-2.0 test on some filesystems.
9
10 Closes: https://bugs.gentoo.org/653450
11
12 .../files/sqlite-3.23.1-full_archive-tests.patch | 27 ++++++++++++++++++++++
13 dev-db/sqlite/sqlite-3.23.1.ebuild | 1 +
14 2 files changed, 28 insertions(+)
15
16 diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
17 new file mode 100644
18 index 00000000000..7237fbfc0f3
19 --- /dev/null
20 +++ b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch
21 @@ -0,0 +1,27 @@
22 +https://sqlite.org/src/info/893e6089c875e947
23 +
24 +--- /test/zipfile2.test
25 ++++ /test/zipfile2.test
26 +@@ -52,17 +52,15 @@
27 + CREATE VIRTUAL TABLE fff USING zipfile('test''zip');
28 + }
29 +
30 +-if {$::tcl_platform(platform)=="windows"} {
31 +- set res {1 {cannot open file: testdir}}
32 +-} else {
33 +- set res {1 {error in fread()}}
34 +-}
35 + do_test 2.0 {
36 + forcedelete testdir
37 + file mkdir testdir
38 + execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') }
39 +- catchsql { SELECT * FROM hhh }
40 +-} $res
41 ++ lindex [catchsql {
42 ++ SELECT * FROM hhh;
43 ++ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data');
44 ++ }] 0
45 ++} 1
46 +
47 +
48 + set archive {
49
50 diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild
51 index 863c3cd57b6..88f7d9dfd71 100644
52 --- a/dev-db/sqlite/sqlite-3.23.1.ebuild
53 +++ b/dev-db/sqlite/sqlite-3.23.1.ebuild
54 @@ -52,6 +52,7 @@ src_prepare() {
55 if full_archive; then
56 eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch"
57 eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
58 + eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch"
59
60 eapply_user