diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-17 00:01:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-17 00:01:35 +0100 |
| commit | 6c9dc10e04cd513437e046ccca0e51a3d6d4dc7c (patch) | |
| tree | b7183e321a607f857cc5c62cfbd5bae7cbfb3982 /kde-misc | |
| parent | 66113e7871aede225d661473925cea4cce9e6d23 (diff) | |
gentoo auto-resync : 17:05:2024 - 00:01:35
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/Manifest.gz | bin | 4402 -> 4403 bytes | |||
| -rw-r--r-- | kde-misc/basket/Manifest | 3 | ||||
| -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 |
4 files changed, 33 insertions, 2 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz Binary files differindex 3a21ff07b097..85aa854b0ee1 100644 --- a/kde-misc/Manifest.gz +++ b/kde-misc/Manifest.gz diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest index d05f06e7c296..17e202836739 100644 --- a/kde-misc/basket/Manifest +++ b/kde-misc/basket/Manifest @@ -1,5 +1,6 @@ AUX basket-2.49b-libgit2-0.99-compat.patch 1598 BLAKE2B c8938b905715cff5e69147463d7f8c17da69b8bee2fc04e98d06da33f27fd57c6589814321c17a39c803f3f1a923d82aab084c3bbe7c45419e5b05d75e7c4f1c SHA512 756aad2a59668aa605fbb438aa859b4f4c59affe859635bd4962e47f003461df57ab500c5b7ad460f8c450f95b2da917c04ea9bf7cb1e8b3a49db47f5fd304b8 +AUX basket-2.49b-libgit2-1.8.patch 883 BLAKE2B d86b0d7bca2d56e4b21190fa84bb559f98a3c1180f4a25611ee432ebb547a9cfa2712dd295ad334149a544f947dae689ed8296a388e8ee7361971de35dd2cbac SHA512 5a7507d8ab75e0ed7e1af4b9679abba374ab9b33bcbdd125ab4f77b2e882429435dd0bedfaa4f3d7263b0802974a96fbfcee42c12734360d30605e290bf1b941 AUX basket-2.49b-xdg_mime_install_dir.patch 1429 BLAKE2B cc1177ec5d9675d2a85c81bcbee77b02ee1fcf11f9d609e7298d4b1c067c07c818fe18d2d1aaa1fc0c159fa5fc7a2d84322eddbd82eff2dddedd81b446a01879 SHA512 224c3dae19c80ae8f0826f2bee6429391998c3baadf708aac3353ca0962646de595d9498e003b1d9d87a9e321858dc43de39a9f0866e4894791a05b28fde05f6 DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134 -EBUILD basket-2.49b.ebuild 2153 BLAKE2B c5f9b2773166541f8e5c8029336f55549647222562d4077241a85406495adc5bd5779b79891500648215edf933b21c0c0f858c221f81eb5ba4e4c4e3831c5e7b SHA512 e11fcdf53bfb130d4e9b125d8cbd0b6301b517bd43ae7e827ce785719273dbd399fafdd6171bbc09b1560cc3f97d4ea0c846ff21a34d3710f26bc2696af31770 +EBUILD basket-2.49b.ebuild 2272 BLAKE2B b2931a667c379826f16d0179b8831f6ae3946994ebe0ee13932cf1a91ff764bd9075ef128005610e180de2c5b39c2f47ea6869db7639977e36caf7c820438e32 SHA512 9da42c093d48f498bb21ac7714d7ff80e3f629d4ca1ee5c5fbbebca169e5a4d871343aaddea0a916b2a26683c872e1442a4cdac567736bdd2717950539836a39 MISC metadata.xml 378 BLAKE2B 3ec55522fdcb53e64bdc8afe6dd79e474532085895c4bbb9d263350615aea0f59ef7f192ef552f5d24d27f2499b4b9eac1a79ac3b112573176ee913a369e4e78 SHA512 549b40efe14eb21cce14d5cf1ca72bb34657ab4c017cfeaa5c2bae6c1b3fcf7b4a513dcede64f0a43e8944d526796a787662977c285ccfddf00c26c09ac3f2b1 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 + |