Gentoo Archives: gentoo-commits

From: Yixun Lan <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-pinyin/files/, app-i18n/ibus-pinyin/
Date: Mon, 27 Feb 2023 04:31:23
Message-Id: 1677472270.8f4d2ebbb6d06762e2e75eb896283731c69fe6ea.dlan@gentoo
1 commit: 8f4d2ebbb6d06762e2e75eb896283731c69fe6ea
2 Author: jinqiang zhang <peeweep <AT> 0x0 <DOT> ee>
3 AuthorDate: Mon Feb 27 04:05:11 2023 +0000
4 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 04:31:10 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4d2ebb
7
8 app-i18n/ibus-pinyin: fix sqlite 3.41.0 build failure
9
10 Closes: https://bugs.gentoo.org/896366
11 Closes: https://github.com/gentoo/gentoo/pull/29822
12 Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee>
13 Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
14
15 .../files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch | 23 ++++++++++++++++++++++
16 app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild | 1 +
17 2 files changed, 24 insertions(+)
18
19 diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
20 new file mode 100644
21 index 000000000000..0faa622e3230
22 --- /dev/null
23 +++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch
24 @@ -0,0 +1,23 @@
25 +UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12
26 +BUG: https://bugs.gentoo.org/896366
27 +AUTHOR: jinqiang zhang <peeweep@×××.ee>
28 +
29 +As sqlite 3.41.0 release note say:
30 +
31 + The double-quoted string misfeature is now disabled by default for CLI
32 + builds. Legacy use cases can reenable the misfeature at run-time using
33 + the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands.
34 +
35 +We should change this double quote to single quote
36 +
37 +--- a/data/db/english/english.awk
38 ++++ b/data/db/english/english.awk
39 +@@ -16,7 +16,7 @@ BEGIN {
40 + }
41 +
42 + # Insert data into english table
43 +- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2}
44 ++ { printf "INSERT INTO english (word, freq) VALUES (\'%s\', %f);\n", $1, $2}
45 +
46 + #quit sqlite3
47 + END {
48
49 diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
50 index 3524ba6ebedb..2df80c6b265c 100644
51 --- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
52 +++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild
53 @@ -39,6 +39,7 @@ PATCHES=(
54 "${FILESDIR}"/${PN}-boost.patch
55 "${FILESDIR}"/${P}-content-type-method.patch
56 "${FILESDIR}"/${P}-python3.patch
57 + "${FILESDIR}"/${P}-sqlite-3.41.0.patch
58 )
59
60 pkg_setup() {