summaryrefslogtreecommitdiff
path: root/kde-misc
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/Manifest.gzbin3881 -> 3882 bytes
-rw-r--r--kde-misc/basket/Manifest10
-rw-r--r--kde-misc/basket/basket-2.49b.ebuild83
-rw-r--r--kde-misc/basket/basket-2.49b_p20241215.ebuild75
-rw-r--r--kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch48
-rw-r--r--kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch25
-rw-r--r--kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch35
-rw-r--r--kde-misc/basket/metadata.xml2
8 files changed, 80 insertions, 198 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index cdc34834a5c5..d3be612150f2 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
Binary files differ
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index a7fa6cd3e0d7..7f96eab1750e 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,6 +1,4 @@
-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 2273 BLAKE2B 3850eac51455c3b37b5c3235604d7d251bf6ea5702a330dd397e5f519b224c7db933d70c9900f7c4c60b5c45c578756d46f0078aa04129146a769b5138f0a394 SHA512 cd80a9f2a86f56938557c7c6f4fe03e0c92dedcab074e869f7bcfceb61b9d529f25f3ad1f113d732d00fac6607fe08b20472892b65b202083c94266ffeffe88f
-MISC metadata.xml 378 BLAKE2B 3ec55522fdcb53e64bdc8afe6dd79e474532085895c4bbb9d263350615aea0f59ef7f192ef552f5d24d27f2499b4b9eac1a79ac3b112573176ee913a369e4e78 SHA512 549b40efe14eb21cce14d5cf1ca72bb34657ab4c017cfeaa5c2bae6c1b3fcf7b4a513dcede64f0a43e8944d526796a787662977c285ccfddf00c26c09ac3f2b1
+DIST basket-2.49b_p20241215-a9741c3e.tar.gz 5880369 BLAKE2B 565efb770f4ec30d3ba847375f63b878f5fb57b5bf2d66e550fac739d199df6940190059afb308a541e0df0c4a830374790d43fa5e90f2ab1548810b39bc4a5f SHA512 e09419a50dd2c19e6e0c54d15bb08c9ea048c3bea6cfe4bbf0c684a5337c1989d4af9f575a2a9c73413bae44c7cca7ed1a2bebee500d9f4d0b96e52bf5a9e02b
+DIST basket-2.49b_p20241215-patchset.tar.xz 7448 BLAKE2B 9a4a80acd7b9b2f71b87fb07acddebb1f9fb1e2d78db6b922c6ac5376694126ceb6ff423b12cbc0843ef0280206b85dd395a70efad2df814266f3082df8d5f78 SHA512 7e9c555af1c735dbbd2b1d095668802cc1ca63a0780eb0727ed58ef9f93cf9bdf08139f387cc23e024f9eccc931b42af0c6694728051751031bac8452692aa70
+EBUILD basket-2.49b_p20241215.ebuild 1757 BLAKE2B a456162c875a714f0ac5801764c6a129d5b125150ea1267cce6adb73da96f368b709e7aa2ac1d414a3191b94b792596bbff3812256f90914d757557ecc178ab1 SHA512 92fcd77d670a6d1633b45da2b3e68293d49d4091aadebe7d2089a9126ac5a801c0a1a8e3ff9fd5a053791eabe4e216d1303df2308c5fe9594dea743e31841387
+MISC metadata.xml 406 BLAKE2B 59b35c56960ca570ef5bf16f92ad6fe2ca2d80aae5e7f256dcd39771671068a7fd3d3c04313182fea4d3d4f5d43655918b9293985e41732b1d525dfbe504cad6 SHA512 c3d553a91cba467e0b26dba89dd24764b142b6ded35a49380a8acb945a25b553f88653f76a44f6ad7ae0bb9a6890f868f0519d799d0a7281f02058510c9d93b7
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild
deleted file mode 100644
index c25faac5562e..000000000000
--- a/kde-misc/basket/basket-2.49b.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm
-
-DESCRIPTION="Multiple information organizer - a DropDrawers clone"
-HOMEPAGE="https://userbase.kde.org/BasKet https://invent.kde.org/utilities/basket"
-SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="crypt git"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kfilemetadata-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- media-libs/phonon[qt5(+)]
- x11-libs/libX11
- crypt? ( app-crypt/gpgme:= )
- git? ( dev-libs/libgit2:= )
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtconcurrent-${QTMIN}:5
-"
-BDEPEND="git? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}/${P}-xdg_mime_install_dir.patch"
- "${FILESDIR}/${P}-libgit2-0.99-compat.patch" # bug #710832
-)
-
-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
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package crypt Gpgme)
- $(cmake_use_find_package git Libgit2)
- )
- ecm_src_configure
-}
diff --git a/kde-misc/basket/basket-2.49b_p20241215.ebuild b/kde-misc/basket/basket-2.49b_p20241215.ebuild
new file mode 100644
index 000000000000..fd275ee6f34f
--- /dev/null
+++ b/kde-misc/basket/basket-2.49b_p20241215.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+ECM_HANDBOOK="optional"
+KDE_ORG_COMMIT="a9741c3e17a9ee81331c5dab4a2d030e4e76b2fa"
+PATCHSET="${P}-patchset"
+inherit ecm kde.org
+
+DESCRIPTION="Multiple information organizer - a DropDrawers clone"
+HOMEPAGE="https://userbase.kde.org/BasKet https://invent.kde.org/utilities/basket"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="crypt git"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ kde-frameworks/karchive:5
+ kde-frameworks/kcmutils:5
+ kde-frameworks/kcodecs:5
+ kde-frameworks/kcompletion:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kconfigwidgets:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/kcrash:5
+ kde-frameworks/kdbusaddons:5
+ kde-frameworks/kfilemetadata:5
+ kde-frameworks/kglobalaccel:5
+ kde-frameworks/kguiaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kiconthemes:5
+ kde-frameworks/kio:5
+ kde-frameworks/knotifications:5
+ kde-frameworks/kparts:5
+ kde-frameworks/kservice:5
+ kde-frameworks/ktextwidgets:5
+ kde-frameworks/kwidgetsaddons:5
+ kde-frameworks/kwindowsystem:5
+ kde-frameworks/kxmlgui:5
+ x11-libs/libX11
+ crypt? ( >=app-crypt/gpgme-1.8.2:= )
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtconcurrent:5
+"
+BDEPEND="git? ( virtual/pkgconfig )"
+
+PATCHES=( "${WORKDIR}/${PATCHSET}" )
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use test; then
+ cmake_run_in src cmake_comment_add_subdirectory tests
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_PHONON=OFF
+ -DENABLE_GPG=$(usex crypt)
+ $(cmake_use_find_package git Libgit2)
+ )
+ ecm_src_configure
+}
diff --git a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
deleted file mode 100644
index d1051af86acf..000000000000
--- a/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 090ac46912025f94aca710355e51a8154df36a56 Mon Sep 17 00:00:00 2001
-From: Niccol Venerandi <niccolo@venerandi.com>
-Date: Wed, 11 Mar 2020 18:46:07 +0100
-Subject: [PATCH 1/2] Added support for libgit>=.99
-
-Summary: LIBGIT2_SOVERSION no longer returns an integer in libgit>=.99; this adds support for that version and 1.0 to come.
-
-Differential Revision: https://phabricator.kde.org/D27990
-
-
-From 9a02338bfa60336b7349ff8ac1f85793515ff0e3 Mon Sep 17 00:00:00 2001
-From: Niccol Venerandi <niccolo@venerandi.com>
-Date: Thu, 12 Mar 2020 10:53:05 +0100
-Subject: [PATCH 2/2] LIBGIT_VER_MINOR is supposed to be LIBGIT2_VER_MINOR
-
-Reviewers: ognarb
-
-Reviewed By: ognarb
-
-Differential Revision: https://phabricator.kde.org/D28001
----
- src/application.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/application.cpp b/src/application.cpp
-index c52fb57..b673848 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -56,7 +56,7 @@ Application::Application(int &argc, char **argv)
-
-
- #ifdef WITH_LIBGIT2
-- #if LIBGIT2_SOVERSION >= 22
-+ #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
- git_libgit2_init();
- #else
- git_threads_init();
-@@ -67,7 +67,7 @@ Application::Application(int &argc, char **argv)
- Application::~Application()
- {
- #ifdef WITH_LIBGIT2
-- #if LIBGIT2_SOVERSION >= 22
-+ #if LIBGIT2_VER_MAJOR > 0 || (LIBGIT2_VER_MAJOR == 0 && LIBGIT2_VER_MINOR >= 22)
- git_libgit2_shutdown();
- #else
- git_threads_shutdown();
---
-2.26.0
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
deleted file mode 100644
index 847df9a6b8f2..000000000000
--- a/kde-misc/basket/files/basket-2.49b-libgit2-1.8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
diff --git a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
deleted file mode 100644
index d118cb2baab7..000000000000
--- a/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Nov 2019 13:35:42 +0100
-Subject: [PATCH] Fix install basket.xml to XDG_MIME_INSTALL_DIR
-
-Previous code did not work at all in a sandboxed packaging build.
----
- file-integration/CMakeLists.txt | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/file-integration/CMakeLists.txt b/file-integration/CMakeLists.txt
-index c3774fe..77e4692 100644
---- a/file-integration/CMakeLists.txt
-+++ b/file-integration/CMakeLists.txt
-@@ -11,15 +11,5 @@ install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
-
- ########### install files ###############
-
--find_program(XDG-MIME_EXECUTABLE xdg-mime)
--find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
--
--install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--install(CODE "
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} install --novendor
-- ${CMAKE_CURRENT_SOURCE_DIR}/basket.xml)
--execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install
-- --novendor ${CMAKE_SOURCE_DIR}/src/basket.desktop)
--execute_process(COMMAND ${XDG-MIME_EXECUTABLE} default
-- ${CMAKE_SOURCE_DIR}/src/basket.desktop application/x-basket-item)
--")
-+install(FILES basketthumbcreator.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-+install(FILES basket.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
---
-2.24.0
-
diff --git a/kde-misc/basket/metadata.xml b/kde-misc/basket/metadata.xml
index d7b2c0aec42e..7918b57332b0 100644
--- a/kde-misc/basket/metadata.xml
+++ b/kde-misc/basket/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo KDE Project</name>
</maintainer>
<upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=basket</bugs-to>
<remote-id type="kde-invent">utilities/basket</remote-id>
</upstream>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 23:36:00 +0000