commit: 65482b263b4894a1714d2fac7a789534f1070f5d
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 27 13:38:33 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Aug 27 13:53:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65482b26
sys-apps/dnf5: fix build for >=dev-cpp/toml11-4
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
sys-apps/dnf5/Manifest | 4 ++++
...{dnf5-5.2.5.0-r1.ebuild => dnf5-5.2.5.0-r2.ebuild} | 19 +++++++++++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest
index 626508bd3..df918dcba 100644
--- a/sys-apps/dnf5/Manifest
+++ b/sys-apps/dnf5/Manifest
@@ -1 +1,5 @@
+DIST dnf5-5.2.5.0-toml11-1.patch 19355 BLAKE2B
6de22ffcee99ab9eff5926b3d255af0f5be59524b4804048be900905a4750a740736454f56b0162af1f43a536495f1e1f644642c7902593c114ee4bbea859eb5
SHA512
f94103259e6b47ed41b97090a47c7a9978c82711c34c984285cbf704344147947c62f6f506c70bdfe9f678feda564da88fbbc8da2dfdb08a3e7abbf2fdce4bbf
+DIST dnf5-5.2.5.0-toml11-2.patch 1245 BLAKE2B
8396ff3028462f91ea97174d43d511ebfe6b13fda0c8f419f590961a4207e62a2b0301ad8bab8d1a02050fd8124561ba1f29c880d04833ff96283d8d5c7b61a9
SHA512
2a56125d84024236d789797f6ede473f29367b4ca0a6fa64c2fa6f93909dbda7bae7fe8de34ab791bed148995cb44a99c6f8cd767186b086b0d15fb29d19d28a
+DIST dnf5-5.2.5.0-toml11-3.patch 4223 BLAKE2B
2b1afd2188e7ca4a72208227d3f081041eef651299ea7242dff9273a23df7e0592777c3007af3ba3c581dc6737150d28212b94370d40d16567bfefa33bf5df96
SHA512
8f9abf420845c0240da4c2d776c933722af3858bfe638206390c62dbf3748ad5d4c6bf8482b864e2b43c74ba3b49bab5b2ac15d90a8d815a6e7f42069bd09ec4
+DIST dnf5-5.2.5.0-toml11-4.patch 11747 BLAKE2B
83a6cd0f54bcb471b0009e204d10d2eeafc9bf1ad7af1e0a07c0294cb76ebcd728ce43403be8ae5428313adcfd0839886681273f75caefe915496f5e166d7468
SHA512
eb67693605cf6d401393fb11e5d8508f374bc92d10815a881890cbf73c70e057d3d0cfa9e48f888edbde07f24f7741f50162a60c7adbb6e94e84876be6061215
DIST dnf5-5.2.5.0.tar.gz 1303914 BLAKE2B
c9fd30aaa74e7e063b1ffbce645a839ba1b82aad92bae70299254a6a62e087246d006af58205f46720f57c1f1eb193eaabe323b6b8d67b31b4ce763b98e573f5
SHA512
9339bdb39a2b55006941909bd9c5e2ebba01258a15952952c346d88bb270cf51b2db91d1938b2bb8ace3c20c58dab3ec11b25454394d270de76580ea6ee49980
diff --git a/sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild
b/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
similarity index 66%
rename from sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild
rename to sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
index ce9db4292..9d1230127 100644
--- a/sys-apps/dnf5/dnf5-5.2.5.0-r1.ebuild
+++ b/sys-apps/dnf5/dnf5-5.2.5.0-r2.ebuild
@@ -7,7 +7,17 @@ inherit cmake
DESCRIPTION="Command-line package manager"
HOMEPAGE="https://github.com/rpm-software-management/dnf5";
-SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz"
+SRC_URI="
+
https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz
-> ${P}.tar.gz
+
https://github.com/rpm-software-management/dnf5/commit/f2f730229d10431272ee8991b600a17607c40f36.patch
+ -> ${P}-toml11-1.patch
+
https://github.com/rpm-software-management/dnf5/commit/87b11dc2fd152bc662bc97ff2340a6e4d10b0dc8.patch
+ -> ${P}-toml11-2.patch
+
https://github.com/rpm-software-management/dnf5/commit/7b2a6e58b103e1100bcff06e097bb94b34bde22e.patch
+ -> ${P}-toml11-3.patch
+
https://github.com/rpm-software-management/dnf5/commit/1746eabb865bc3882956128adef5f228323855a0.patch
+ -> ${P}-toml11-4.patch
+"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
@@ -19,7 +29,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=app-arch/rpm-4.17.0
dev-cpp/sdbus-c++:=
- <dev-cpp/toml11-4.0.0
+ dev-cpp/toml11
>=dev-db/sqlite-3.35.0:3
>=dev-libs/glib-2.46.0:2
dev-libs/json-c:=
@@ -48,6 +58,11 @@ PATCHES=(
"${FILESDIR}/${P}-remove-empty-dir.patch"
# Prevent test suite from writing to system files.
"${FILESDIR}/${P}-sandbox-test.patch"
+ # toml11-4 support
+ "${DISTDIR}/${P}-toml11-1.patch"
+ "${DISTDIR}/${P}-toml11-2.patch"
+ "${DISTDIR}/${P}-toml11-3.patch"
+ "${DISTDIR}/${P}-toml11-4.patch"
)
src_prepare() {
