From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34817158528 for ; Sun, 21 Jan 2024 10:01:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10DB5E29B5; Sun, 21 Jan 2024 10:00:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA2A2E29B5 for ; Sun, 21 Jan 2024 10:00:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1883B3432A8 for ; Sun, 21 Jan 2024 10:00:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EEFB13A0 for ; Sun, 21 Jan 2024 10:00:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705831225.0d686c653b1eb6df7bcc597728ad7ed8d6566a08.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/anki/, app-misc/anki/files/23.12.1/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/anki/anki-23.12.1.ebuild app-misc/anki/files/23.12.1/unbundle-sqlite.patch X-VCS-Directories: app-misc/anki/files/23.12.1/ app-misc/anki/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0d686c653b1eb6df7bcc597728ad7ed8d6566a08 X-VCS-Branch: master Date: Sun, 21 Jan 2024 10:00:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 007dd343-ba00-4aeb-9e21-f5c424beb846 X-Archives-Hash: d56768aa33fa63387a6a1000540f730d commit: 0d686c653b1eb6df7bcc597728ad7ed8d6566a08 Author: Lucio Sauer posteo net> AuthorDate: Tue Jan 9 05:43:42 2024 +0000 Commit: Sam James gentoo 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 posteo.net> Signed-off-by: Sam James 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 ---- 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"