* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-libpinyin/files/, app-i18n/ibus-libpinyin/
@ 2023-03-05 15:19 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-03-05 15:19 UTC (permalink / raw
To: gentoo-commits
commit: dcc1e862ed2ee34cc89e3154e801cb9e3c6badb7
Author: Graham Ramsey <graham.ramsey <AT> gmail <DOT> com>
AuthorDate: Sun Mar 5 13:58:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 15:19:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc1e862
app-i18n/ibus-libpinyin: fix quotes to build with sqlite3.41+
sqlite has got more strict in latest version so it no longer accepts
double quotes for sqlite string values. This adds a patch to replace
double with single.
There is an upstream attempt to fix this but it is not quite right
so this doesn't copy it exactly.
I have commented on the patch with advice.
https://github.com/libpinyin/ibus-libpinyin/commit/96042887815b4700c7cafa64cf88942af438ea98
We cannot upgrade yet to this anyway, as we are dependent on older
version of libpinyin.
Closes: https://bugs.gentoo.org/898478
Signed-off-by: Graham Ramsey <graham.ramsey <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29937
Signed-off-by: Sam James <sam <AT> gentoo.org>
...us-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch | 43 +++++++++++++
.../ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild | 73 ++++++++++++++++++++++
2 files changed, 116 insertions(+)
diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
new file mode 100644
index 000000000000..e3f001d42002
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
@@ -0,0 +1,43 @@
+Fix quotes for compatibilty with sqlite3.41+
+https://bugs.gentoo.org/898478
+
+From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001
+From: graham <graham@ulsterit.com>
+Date: Sat, 4 Mar 2023 15:55:03 +0000
+Subject: [PATCH] change double quotes to single quotes to meet SQL standard
+ for strings, compatible with sqlite 3.41
+
+---
+ data/english.awk | 2 +-
+ data/table.awk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/english.awk b/data/english.awk
+index c5dc0aa..bed156d 100644
+--- a/data/english.awk
++++ b/data/english.awk
+@@ -16,7 +16,7 @@ BEGIN {
+ }
+
+ # Insert data into english table
+- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2}
++ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2}
+
+ #quit sqlite3
+ END {
+diff --git a/data/table.awk b/data/table.awk
+index 700529c..c097ec2 100644
+--- a/data/table.awk
++++ b/data/table.awk
+@@ -21,7 +21,7 @@ BEGIN {
+
+ # Insert data into phrases table
+ NF == 4 {
+- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1;
++ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1;
+ id++;
+ }
+
+--
+2.39.2
+
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..c61330975867
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2015-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LUA_COMPAT=( lua5-{1..3} )
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools gnome2-utils lua-single python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="dev-db/sqlite:3
+ virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+ >=app-i18n/libpinyin-2.2.1:=
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ virtual/libintl
+ $(python_gen_cond_dep '
+ app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ boost? ( dev-libs/boost:= )
+ lua? ( ${LUA_DEPS} )
+ opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ if use lua; then
+ lua-single_pkg_setup
+ fi
+}
+
+src_prepare() {
+ sed -i \
+ -e "/^appdatadir/s:/appdata:/metainfo:" \
+ data/Makefile.am || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-english-input-mode \
+ $(use_enable boost) \
+ $(use_enable lua lua-extension) \
+ $(use_enable opencc)
+}
+
+pkg_postinst() {
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_schemas_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-libpinyin/files/, app-i18n/ibus-libpinyin/
@ 2024-05-19 12:17 Yixun Lan
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan @ 2024-05-19 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 3ad04a80b8ac487f2d8c368c9ada53100afbdcf4
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sun May 19 12:16:02 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sun May 19 12:16:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad04a80
app-i18n/ibus-libpinyin: drop 1.13.1-r1
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-i18n/ibus-libpinyin/Manifest | 1 -
...us-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch | 43 -------------
.../ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild | 73 ----------------------
3 files changed, 117 deletions(-)
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 373863321eaa..dfab2eab8291 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,2 +1 @@
-DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a
DIST ibus-libpinyin-1.15.2.tar.gz 1728300 BLAKE2B a7699fe7f4d7360d09b8c311919630c87fcf2250929f42be2adf1b29a16e60bef2df46539e0fb75ee27700ec7262eb175e6a4d56bedeb895a6272e097a636d00 SHA512 be7525221c4a95df885d1c8c60716c32ad0cfa0a13ca5f9034d06efebf18ab1c207383b30c017da28c1078724b4d9943fc82def68c94bb4e2a0a1e6273c7ad7f
diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
deleted file mode 100644
index e3f001d42002..000000000000
--- a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix quotes for compatibilty with sqlite3.41+
-https://bugs.gentoo.org/898478
-
-From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001
-From: graham <graham@ulsterit.com>
-Date: Sat, 4 Mar 2023 15:55:03 +0000
-Subject: [PATCH] change double quotes to single quotes to meet SQL standard
- for strings, compatible with sqlite 3.41
-
----
- data/english.awk | 2 +-
- data/table.awk | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/english.awk b/data/english.awk
-index c5dc0aa..bed156d 100644
---- a/data/english.awk
-+++ b/data/english.awk
-@@ -16,7 +16,7 @@ BEGIN {
- }
-
- # Insert data into english table
-- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2}
-+ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2}
-
- #quit sqlite3
- END {
-diff --git a/data/table.awk b/data/table.awk
-index 700529c..c097ec2 100644
---- a/data/table.awk
-+++ b/data/table.awk
-@@ -21,7 +21,7 @@ BEGIN {
-
- # Insert data into phrases table
- NF == 4 {
-- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1;
-+ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1;
- id++;
- }
-
---
-2.39.2
-
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
deleted file mode 100644
index ad164200f31f..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2015-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools gnome2-utils lua-single python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- lua? ( ${LUA_REQUIRED_USE} )"
-
-BDEPEND="dev-db/sqlite:3
- virtual/pkgconfig"
-
-DEPEND="${PYTHON_DEPS}
- >=app-i18n/libpinyin-2.2.1:=
- dev-db/sqlite:3
- dev-libs/glib:2
- virtual/libintl
- $(python_gen_cond_dep '
- app-i18n/ibus[python(+),${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- boost? ( dev-libs/boost:= )
- lua? ( ${LUA_DEPS} )
- opencc? ( app-i18n/opencc:= )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
-src_prepare() {
- sed -i \
- -e "/^appdatadir/s:/appdata:/metainfo:" \
- data/Makefile.am || die
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-english-input-mode \
- $(use_enable boost) \
- $(use_enable lua lua-extension) \
- $(use_enable opencc)
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-19 12:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-19 12:17 [gentoo-commits] repo/gentoo:master commit in: app-i18n/ibus-libpinyin/files/, app-i18n/ibus-libpinyin/ Yixun Lan
-- strict thread matches above, loose matches on Subject: below --
2023-03-05 15:19 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox