* [gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/files/, kde-misc/basket/
@ 2017-02-18 19:05 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 19:05 UTC (permalink / raw
To: gentoo-commits
commit: c1632e5741f84abda83a89256f22bdf7eddee489
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 18:24:24 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 19:05:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1632e57
kde-misc/basket: Fix build dependencies
Gentoo-bug: 609228
Reported-by: Michael Rokicki <roki942 <AT> hotmail.com>
Package-Manager: portage-2.3.3
kde-misc/basket/basket-2.49a.ebuild | 2 +
kde-misc/basket/files/basket-2.49a-deps.patch | 72 +++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/kde-misc/basket/basket-2.49a.ebuild b/kde-misc/basket/basket-2.49a.ebuild
index 1d9710dc00..9ce92828c1 100644
--- a/kde-misc/basket/basket-2.49a.ebuild
+++ b/kde-misc/basket/basket-2.49a.ebuild
@@ -54,6 +54,8 @@ DEPEND="${RDEPEND}
$(add_qt_dep qtconcurrent)
"
+PATCHES=( "${FILESDIR}"/${P}-deps.patch )
+
src_prepare() {
kde5_src_prepare
if ! use test; then
diff --git a/kde-misc/basket/files/basket-2.49a-deps.patch b/kde-misc/basket/files/basket-2.49a-deps.patch
new file mode 100644
index 0000000000..225d484c40
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49a-deps.patch
@@ -0,0 +1,72 @@
+commit 1372381456ceb4d3d15f6c78df6ba8bf0a3388a2
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Feb 18 19:02:21 2017 +0100
+
+ Fix dependencies
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50858f6..2997365 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,8 +33,10 @@ endif (BUILD_KPARTS)
+ find_package(Qt5 REQUIRED COMPONENTS
+ Concurrent
+ Core
+- Gui
+ DBus
++ Gui
++ Widgets
++ Xml
+ )
+
+ include(KDECompilerSettings)
+@@ -44,6 +46,7 @@ include(KDECMakeSettings)
+
+ find_package(KF5 REQUIRED COMPONENTS
+ Archive
++ Completion
+ Config
+ ConfigWidgets #KCM
+ CoreAddons
+@@ -51,7 +54,6 @@ find_package(KF5 REQUIRED COMPONENTS
+ DBusAddons
+ DocTools
+ FileMetaData
+- FrameworkIntegration
+ GlobalAccel
+ GuiAddons
+ I18n
+@@ -60,7 +62,9 @@ find_package(KF5 REQUIRED COMPONENTS
+ KIO
+ Notifications
+ Parts
++ Service
+ TextWidgets
++ WidgetsAddons
+ WindowSystem
+ XmlGui
+ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f08dbe0..b394573 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -83,7 +83,6 @@ target_link_libraries(basketcommon
+ KF5::KIOWidgets
+ KF5::Notifications
+ KF5::Parts
+- KF5::Style
+ KF5::TextWidgets
+ KF5::WindowSystem
+ KF5::XmlGui
+diff --git a/src/basketscene.cpp b/src/basketscene.cpp
+index 638199c..55b2f09 100644
+--- a/src/basketscene.cpp
++++ b/src/basketscene.cpp
+@@ -62,7 +62,6 @@
+ #include <QMenu>
+
+ #include <KTextEdit>
+-#include <KStyle>
+
+ #include <KColorScheme> // for KStatefulBrush
+ #include <KOpenWithDialog>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/files/, kde-misc/basket/
@ 2020-03-01 22:02 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-03-01 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 34f8f2b233bcf437aa08a2d48838645b50e77d16
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 22:01:05 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 22:02:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f8f2b2
kde-misc/basket: Fix build against >=dev-libs/libgit2-0.99
Thanks-to: Dan Goodliffe <gentoo <AT> randomdan.homeip.net>
Closes: https://bugs.gentoo.org/710832
Package-Manager: Portage-2.3.90, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/basket/basket-2.49b.ebuild | 5 +++-
.../files/basket-2.49b-libgit2-0.99-compat.patch | 32 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild
index 6a9fcbf3e6a..bbcfe4d1009 100644
--- a/kde-misc/basket/basket-2.49b.ebuild
+++ b/kde-misc/basket/basket-2.49b.ebuild
@@ -57,7 +57,10 @@ DEPEND="${RDEPEND}
>=dev-qt/qtconcurrent-${QTMIN}:5
"
-PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-xdg_mime_install_dir.patch"
+ "${FILESDIR}/${P}-libgit2-0.99-compat.patch" # bug #710832
+)
src_prepare() {
ecm_src_prepare
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
new file mode 100644
index 00000000000..94793a090f1
--- /dev/null
+++ b/kde-misc/basket/files/basket-2.49b-libgit2-0.99-compat.patch
@@ -0,0 +1,32 @@
+From 094580f207b5ba9f44e9af00834f9c93f06fb440 Mon Sep 17 00:00:00 2001
+From: Dan Goodliffe <dan@randomdan.homeip.net>
+Date: Thu, 27 Feb 2020 18:04:21 +0000
+Subject: [PATCH] Use LIBGIT2_VER_MINOR for version test
+
+Addresses compatibility with libgit2-0.99
+---
+ src/application.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/application.cpp b/src/application.cpp
+index c52fb574..81fcd121 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_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_MINOR >= 22
+ git_libgit2_shutdown();
+ #else
+ git_threads_shutdown();
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/files/, kde-misc/basket/
@ 2025-03-16 23:20 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2025-03-16 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 4ea2514f211efb731ea94d87fde1160b998c3223
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 21:01:45 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 23:19:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ea2514f
kde-misc/basket: drop 2.49b, destabilising for ~amd64
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/basket/Manifest | 1 -
kde-misc/basket/basket-2.49b.ebuild | 83 ----------------------
.../files/basket-2.49b-libgit2-0.99-compat.patch | 48 -------------
.../basket/files/basket-2.49b-libgit2-1.8.patch | 25 -------
.../files/basket-2.49b-xdg_mime_install_dir.patch | 35 ---------
5 files changed, 192 deletions(-)
diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest
index 83e87c1850d8..8155de402367 100644
--- a/kde-misc/basket/Manifest
+++ b/kde-misc/basket/Manifest
@@ -1,3 +1,2 @@
-DIST basket-2.49b.tar.gz 4686990 BLAKE2B 6915d673abae6902bd2a0073a88cdf5bc497a7e7eec47dc87dbafcce68915e55bb02505c81a24cc00ed081e60b4c135afd337c6c4d08843182175f42c39e9119 SHA512 70d4241928712a7366cbc592e414864896cfb27bea251e5e4d3606b34534a932d7c208f98a8f48b49c11234c52f78d9003ca00af979e61112dbe139627e6f134
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
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/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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-16 23:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-16 23:20 [gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/files/, kde-misc/basket/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-03-01 22:02 Andreas Sturmlechner
2017-02-18 19:05 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox