diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-16 14:44:32 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-05-16 14:45:35 +0200 |
| commit | a6c801b8319f52a82366675a51b0b1267f61dee3 (patch) | |
| tree | 8fd91adca21fc1884aa6dcf16fd6abb44ade9c5f | |
| parent | dev-qt/qtlocation: Fix build with >=dev-libs/icu-75 (diff) | |
| download | gentoo-a6c801b8319f52a82366675a51b0b1267f61dee3.tar.gz gentoo-a6c801b8319f52a82366675a51b0b1267f61dee3.tar.bz2 gentoo-a6c801b8319f52a82366675a51b0b1267f61dee3.zip | |
kde-misc/basket: Fix build with >=dev-libs/libgit2-1.8
Closes: https://bugs.gentoo.org/928338
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-misc/basket/basket-2.49b.ebuild | 7 | ||||
| -rw-r--r-- | kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch | 25 |
2 files changed, 31 insertions, 1 deletions
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index dae7431d3b5e..4fa99dafe9a8 100644 --- a/kde-misc/basket/basket-2.49b.ebuild +++ b/kde-misc/basket/basket-2.49b.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,7 +63,12 @@ PATCHES=( ) src_prepare() { + if has_version ">=dev-libs/libgit2-1.8"; then + PATCHES+=( "${FILESDIR}/${P}-libgit2-1.8.patch" ) # bug #928338 + fi + ecm_src_prepare + if ! use test; then sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die fi diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch b/kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch new file mode 100644 index 000000000000..847df9a6b8f2 --- /dev/null +++ b/kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch @@ -0,0 +1,25 @@ +From 161d0fe545c30119a15ae5106f8cf2a4ff5a8b1d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Sun, 28 Apr 2024 12:52:34 +0200 +Subject: [PATCH] Fix build against libgit + +--- + src/gitwrapper.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gitwrapper.cpp b/src/gitwrapper.cpp +index 8015ec1f..d7399ea1 100644 +--- a/src/gitwrapper.cpp ++++ b/src/gitwrapper.cpp +@@ -340,7 +340,7 @@ bool GitWrapper::commitIndex(git_repository *repo, git_index *index, QString mes + return false; + } + +- const git_commit* parentarray[] = {commit}; ++ git_commit *parentarray[] = {commit}; + QByteArray commitmessageba = message.toUtf8(); + const char *commitmessageCString = commitmessageba.data(); + error = git_commit_create(&commit_id, repo, "HEAD", sig, sig, nullptr, commitmessageCString, tree, 1, parentarray); +-- +GitLab + |