commit: 0d686c653b1eb6df7bcc597728ad7ed8d6566a08 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Tue Jan 9 05:43:42 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jan 21 10:00:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d686c65
app-misc/anki: unbundle sqlite correctly Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Signed-off-by: Sam James <sam <AT> gentoo.org> app-misc/anki/anki-23.12.1.ebuild | 2 +- app-misc/anki/files/23.12.1/unbundle-sqlite.patch | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/app-misc/anki/anki-23.12.1.ebuild b/app-misc/anki/anki-23.12.1.ebuild index 13e6cf187381..b79e79196831 100644 --- a/app-misc/anki/anki-23.12.1.ebuild +++ b/app-misc/anki/anki-23.12.1.ebuild @@ -683,7 +683,6 @@ PATCHES=( "${FILESDIR}"/${PV}/ninja-gentoo-setup.patch "${FILESDIR}"/${PV}/no-git-submodule-sync.patch "${FILESDIR}"/${PV}/pseudo-venv.patch - "${FILESDIR}"/${PV}/unbundle-sqlite.patch "${FILESDIR}"/${PV}/use-system-nextest.patch "${FILESDIR}"/${PV}/remove-formatter-dep.patch "${FILESDIR}"/${PV}/remove-yarn-dep.patch @@ -820,6 +819,7 @@ https://addon-docs.ankiweb.net/ pkg_setup() { export PROTOC_BINARY="${BROOT}"/usr/bin/protoc + export LIBSQLITE3_SYS_USE_PKG_CONFIG=1 export ZSTD_SYS_USE_PKG_CONFIG=1 if use gui; then diff --git a/app-misc/anki/files/23.12.1/unbundle-sqlite.patch b/app-misc/anki/files/23.12.1/unbundle-sqlite.patch deleted file mode 100644 index 496c4fad47a6..000000000000 --- a/app-misc/anki/files/23.12.1/unbundle-sqlite.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use system dev-db/sqlite:3 instead of a bundled version. - -From: Lucio Sauer <watermanpa...@posteo.net> ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -108,7 +108,7 @@ pyo3 = { version = "0.20.0", features = ["extension-module", "abi3", "abi3-py39" - rand = "0.8.5" - regex = "1.10.2" - reqwest = { version = "0.11.22", default-features = false, features = ["json", "socks", "stream", "multipart"] } --rusqlite = { version = "0.30.0", features = ["trace", "functions", "collation", "bundled"] } -+rusqlite = { version = "0.30.0", features = ["trace", "functions", "collation"] } - scopeguard = "1.2.0" - serde = { version = "1.0.193", features = ["derive"] } - serde-aux = "4.2.0"