1 |
commit: 460a53098432a7c7a2dfd4d9f703ec631ca9f1a6 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 24 19:13:11 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 24 19:13:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460a5309 |
7 |
|
8 |
dev-vcs/subversion: fix test wc-queries-test test |
9 |
|
10 |
Thanks to Branko Čibej (upstream) for the patch! |
11 |
|
12 |
Closes: https://bugs.gentoo.org/605438 |
13 |
Package-Manager: Portage-2.3.56, Repoman-2.3.12 |
14 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
15 |
|
16 |
...subversion-1.9.7-fix-wc-queries-test-test.patch | 26 ++++++++++++++++++++++ |
17 |
dev-vcs/subversion/subversion-1.10.3.ebuild | 1 + |
18 |
dev-vcs/subversion/subversion-1.10.4.ebuild | 1 + |
19 |
dev-vcs/subversion/subversion-1.11.0.ebuild | 3 ++- |
20 |
dev-vcs/subversion/subversion-1.11.1.ebuild | 1 + |
21 |
dev-vcs/subversion/subversion-1.9.7-r1.ebuild | 3 ++- |
22 |
6 files changed, 33 insertions(+), 2 deletions(-) |
23 |
|
24 |
diff --git a/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch |
25 |
new file mode 100644 |
26 |
index 00000000000..6658bd683e7 |
27 |
--- /dev/null |
28 |
+++ b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch |
29 |
@@ -0,0 +1,26 @@ |
30 |
+https://bugs.gentoo.org/605438 |
31 |
+ |
32 |
+--- a/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:33:42 1852012 |
33 |
++++ b/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:58:23 1852013 |
34 |
+@@ -670,7 +670,20 @@ |
35 |
+ || (item->expression_vars < 1)) |
36 |
+ && !is_result_table(item->table)) |
37 |
+ { |
38 |
+- if (in_list(primary_key_statements, i)) |
39 |
++ if (MATCH_TOKEN(item->table, "sqlite_master")) |
40 |
++ { |
41 |
++ /* The sqlite_master table does not have an index. |
42 |
++ Query explanations that say 'SCAN TABLE sqlite_master' |
43 |
++ will appear if SQLite was compiled with the option |
44 |
++ SQLITE_ENABLE_STMT_SCANSTATUS, for queries such |
45 |
++ as 'DROP TABLE foo', but the performance of such |
46 |
++ statements is not our concern here. */ |
47 |
++ |
48 |
++ /* "Slow" statements do expect too see a warning, however. */ |
49 |
++ if (is_slow_statement(i)) |
50 |
++ warned = TRUE; |
51 |
++ } |
52 |
++ else if (in_list(primary_key_statements, i)) |
53 |
+ { |
54 |
+ /* Reported as primary key index usage in Sqlite 3.7, |
55 |
+ as table scan in 3.8+, while the execution plan is |
56 |
|
57 |
diff --git a/dev-vcs/subversion/subversion-1.10.3.ebuild b/dev-vcs/subversion/subversion-1.10.3.ebuild |
58 |
index 633b624d554..b13dd328ecf 100644 |
59 |
--- a/dev-vcs/subversion/subversion-1.10.3.ebuild |
60 |
+++ b/dev-vcs/subversion/subversion-1.10.3.ebuild |
61 |
@@ -151,6 +151,7 @@ pkg_setup() { |
62 |
|
63 |
src_prepare() { |
64 |
eapply "${WORKDIR}/patches" |
65 |
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
66 |
eapply_user |
67 |
|
68 |
fperms +x build/transform_libtool_scripts.sh |
69 |
|
70 |
diff --git a/dev-vcs/subversion/subversion-1.10.4.ebuild b/dev-vcs/subversion/subversion-1.10.4.ebuild |
71 |
index e21f5be59ff..ef55999b2c5 100644 |
72 |
--- a/dev-vcs/subversion/subversion-1.10.4.ebuild |
73 |
+++ b/dev-vcs/subversion/subversion-1.10.4.ebuild |
74 |
@@ -151,6 +151,7 @@ pkg_setup() { |
75 |
|
76 |
src_prepare() { |
77 |
eapply "${WORKDIR}/patches" |
78 |
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
79 |
eapply_user |
80 |
|
81 |
fperms +x build/transform_libtool_scripts.sh |
82 |
|
83 |
diff --git a/dev-vcs/subversion/subversion-1.11.0.ebuild b/dev-vcs/subversion/subversion-1.11.0.ebuild |
84 |
index df2a5c65a4c..a4a22eed915 100644 |
85 |
--- a/dev-vcs/subversion/subversion-1.11.0.ebuild |
86 |
+++ b/dev-vcs/subversion/subversion-1.11.0.ebuild |
87 |
@@ -1,4 +1,4 @@ |
88 |
-# Copyright 1999-2018 Gentoo Authors |
89 |
+# Copyright 1999-2019 Gentoo Authors |
90 |
# Distributed under the terms of the GNU General Public License v2 |
91 |
|
92 |
EAPI=6 |
93 |
@@ -151,6 +151,7 @@ pkg_setup() { |
94 |
|
95 |
src_prepare() { |
96 |
eapply "${WORKDIR}/patches" |
97 |
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
98 |
eapply_user |
99 |
|
100 |
fperms +x build/transform_libtool_scripts.sh |
101 |
|
102 |
diff --git a/dev-vcs/subversion/subversion-1.11.1.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild |
103 |
index 5b17d2b2a8c..a4a22eed915 100644 |
104 |
--- a/dev-vcs/subversion/subversion-1.11.1.ebuild |
105 |
+++ b/dev-vcs/subversion/subversion-1.11.1.ebuild |
106 |
@@ -151,6 +151,7 @@ pkg_setup() { |
107 |
|
108 |
src_prepare() { |
109 |
eapply "${WORKDIR}/patches" |
110 |
+ eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
111 |
eapply_user |
112 |
|
113 |
fperms +x build/transform_libtool_scripts.sh |
114 |
|
115 |
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
116 |
index c135b20995f..b9444c0aaa8 100644 |
117 |
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
118 |
+++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild |
119 |
@@ -1,4 +1,4 @@ |
120 |
-# Copyright 1999-2018 Gentoo Foundation |
121 |
+# Copyright 1999-2019 Gentoo Authors |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
|
124 |
EAPI=6 |
125 |
@@ -88,6 +88,7 @@ PATCHES=( |
126 |
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch |
127 |
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch |
128 |
"${FILESDIR}"/${P}-kf5.patch |
129 |
+ "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch |
130 |
) |
131 |
|
132 |
want_apache |