commit: 2d69fd13e8bd0a2bd5dab3bbf225d3db6d775846 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 8 12:25:25 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 8 12:25:25 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2d69fd13
kde-misc/basket: Project moved (back) to kde.org https://cgit.kde.org/sysadmin/repo-metadata.git/commit/?id=44c76e85b18f55ec24986aad45bf390dc7b414b3 Package-Manager: Portage-2.3.92, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-misc/basket/basket-9999.ebuild | 82 ++++++++++++++++++++++ .../files/basket-2.49b-libgit2-0.99-compat.patch | 32 +++++++++ .../files/basket-2.49b-xdg_mime_install_dir.patch | 35 +++++++++ kde-misc/basket/metadata.xml | 8 +++ 4 files changed, 157 insertions(+) diff --git a/kde-misc/basket/basket-9999.ebuild b/kde-misc/basket/basket-9999.ebuild new file mode 100644 index 0000000000..0a5c8dfa20 --- /dev/null +++ b/kde-misc/basket/basket-9999.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Multiple information organizer - a DropDrawers clone" +HOMEPAGE="https://userbase.kde.org/BasKet https://github.com/basket-notepads/basket"; + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="5" +IUSE="crypt git" + +BDEPEND="git? ( virtual/pkgconfig )" +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 +" + +PATCHES=( + # TODO: upstream + "${FILESDIR}/${PN}-2.49b-xdg_mime_install_dir.patch" + "${FILESDIR}/${PN}-2.49b-libgit2-0.99-compat.patch" # bug #710832 +) + +src_prepare() { + 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 new file mode 100644 index 0000000000..94793a090f --- /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 <[email protected]> +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(); 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 new file mode 100644 index 0000000000..d118cb2baa --- /dev/null +++ b/kde-misc/basket/files/basket-2.49b-xdg_mime_install_dir.patch @@ -0,0 +1,35 @@ +From 4c80df2dd6aeb7a90677d983a292e4f9a95f2a70 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +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 new file mode 100644 index 0000000000..5f4d9f3f7c --- /dev/null +++ b/kde-misc/basket/metadata.xml @@ -0,0 +1,8 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo KDE Project</name> + </maintainer> +</pkgmetadata>
