[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
commit: a6c801b8319f52a82366675a51b0b1267f61dee3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 16 12:44:32 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 16 12:45:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c801b8 kde-misc/basket: Fix build with >=dev-libs/libgit2-1.8 Closes: https://bugs.gentoo.org/928338 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/basket/basket-2.49b.ebuild| 7 +- .../basket/files/basket-2.49b-libgit2-1.8.patch| 25 ++ 2 files changed, 31 insertions(+), 1 deletion(-) 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 ..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 +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 +
[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
commit: d58bb6648edca6865687237dd1a6d779056fe274 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 14 12:40:11 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 14 12:40:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58bb664 kde-misc/basket: Fix xdg-mime file installation and drop bogus code Bug: https://bugs.gentoo.org/699960 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/basket/basket-2.49b.ebuild| 2 ++ .../files/basket-2.49b-xdg_mime_install_dir.patch | 35 ++ 2 files changed, 37 insertions(+) diff --git a/kde-misc/basket/basket-2.49b.ebuild b/kde-misc/basket/basket-2.49b.ebuild index cb8a10b757e..7a67ebb6fc1 100644 --- a/kde-misc/basket/basket-2.49b.ebuild +++ b/kde-misc/basket/basket-2.49b.ebuild @@ -54,6 +54,8 @@ DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) " +PATCHES=( "${FILESDIR}/${P}-xdg_mime_install_dir.patch" ) + src_prepare() { kde5_src_prepare if ! use test; then 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 000..d118cb2baab --- /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 +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 +
[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
commit: 6784986b6ef90624a8cf0f1b7008d2aabebc885b Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 30 23:34:23 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 30 23:56:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6784986b kde-misc/basket: Drop 2.49a_p20170225-r1 snapshot Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-misc/basket/Manifest | 1 - kde-misc/basket/basket-2.49a_p20170225-r1.ebuild | 72 -- .../files/basket-2.49a_p20170225-fixes.patch | 61 -- 3 files changed, 134 deletions(-) diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest index 28ae7fcf2d9..643127e6269 100644 --- a/kde-misc/basket/Manifest +++ b/kde-misc/basket/Manifest @@ -1,2 +1 @@ -DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c DIST basket-2.49a_p20181205.tar.gz 4689215 BLAKE2B dce87001622aac8e50957d87d36c9094a807765d96bc60fe450fed0f293e0e21ead7529c57eaecc97c4f56d5bce7fabd34a564f632fc56f0c83621fac4092dee SHA512 62c6a337f634be374ee8631c8b88a78097ae4badd905e6be556f11fa841cc03ab32ab563f59a865d1bc85f105ec273472734c42f1bff834e4d7219c258d82281 diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild deleted file mode 100644 index 8cc9279a602..000 --- a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315" -KDE_TEST="true" -KDE_HANDBOOK="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 vcs-snapshot - -DESCRIPTION="A DropDrawers clone. Multiple information organizer" -HOMEPAGE="https://github.com/basket-notepads/basket"; -SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="crypt git" - -RDEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kfilemetadata) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - crypt? ( app-crypt/gpgme:= ) - git? ( dev-libs/libgit2:= ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) -" - -PATCHES=( "${FILESDIR}/${P}-fixes.patch" ) - -src_prepare() { - kde5_src_prepare - if ! use test; then - sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Gpgme) - $(cmake-utils_use_find_package git Libgit2) - ) - kde5_src_configure -} diff --git a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch deleted file mode 100644 index 82ca2e8e26e..000 --- a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001 -From: Gleb Baryshev -Date: Sun, 13 Aug 2017 21:37:52 +0300 -Subject: [PATCH] Fix KF5 issues - -#33 Library has wrong versioning (libbasketcommon.so.SOVERSION) -#34 Translations are not properly used -#35 Documentation still requires kdelibs4support for dtd/ktex.dtd - CMakeLists.txt | 3 +++ - doc/en/index.docbook | 4 ++-- - src/CMakeLists.txt | 4 ++-- - 3 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2997365e..7b54ace3 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND) - - #TODO: find meinproc - -+#Make libbasketcommon se
[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
commit: 47acd09be55f8bc364880afc92c5bc04cb86a2f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 1 00:29:50 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 1 00:31:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47acd09b kde-misc/basket: Fix soname, docbook Package-Manager: Portage-2.3.19, Repoman-2.3.6 kde-misc/basket/basket-2.49a_p20170225-r1.ebuild | 72 ++ .../files/basket-2.49a_p20170225-fixes.patch | 61 ++ 2 files changed, 133 insertions(+) diff --git a/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild new file mode 100644 index 000..6effe58212f --- /dev/null +++ b/kde-misc/basket/basket-2.49a_p20170225-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315" +KDE_TEST="true" +KDE_HANDBOOK="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 vcs-snapshot + +DESCRIPTION="A DropDrawers clone. Multiple information organizer" +HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket"; +SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="amd64 x86" +IUSE="crypt git" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kfilemetadata) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + x11-libs/libX11 + crypt? ( app-crypt/gpgme ) + git? ( dev-libs/libgit2 ) +" +DEPEND="${RDEPEND} + $(add_qt_dep qtconcurrent) +" + +PATCHES=( "${FILESDIR}/${P}-fixes.patch" ) + +src_prepare() { + kde5_src_prepare + if ! use test; then + sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package crypt Gpgme) + $(cmake-utils_use_find_package git Libgit2) + ) + kde5_src_configure +} diff --git a/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch new file mode 100644 index 000..82ca2e8e26e --- /dev/null +++ b/kde-misc/basket/files/basket-2.49a_p20170225-fixes.patch @@ -0,0 +1,61 @@ +From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001 +From: Gleb Baryshev +Date: Sun, 13 Aug 2017 21:37:52 +0300 +Subject: [PATCH] Fix KF5 issues + +#33 Library has wrong versioning (libbasketcommon.so.SOVERSION) +#34 Translations are not properly used +#35 Documentation still requires kdelibs4support for dtd/ktex.dtd +--- + CMakeLists.txt | 3 +++ + doc/en/index.docbook | 4 ++-- + src/CMakeLists.txt | 4 ++-- + 3 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2997365e..7b54ace3 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND) + + #TODO: find meinproc + ++#Make libbasketcommon search for translations in basket.mo ++ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\") ++ + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +diff --git a/doc/en/index.docbook b/doc/en/index.docbook +index ddef489a..586014e8 100644 +--- a/doc/en/index.docbook b/doc/en/index.docbook +@@ -1,5 +1,5 @@ + +-BasKet"> + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9ea886d5..f4cf523f 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -59,7 +59,7 @@ IF(HAVE_BALOO) + list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp) + ENDIF(HAVE_BALOO) + +-qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui) ++ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui) + + QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SR
[gentoo-commits] repo/gentoo:master commit in: kde-misc/basket/, kde-misc/basket/files/
commit: b6a7dfaee7fc5e663269b31bde35171bafbf49cd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 18 18:22:24 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 18 18:25:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6a7dfae kde-misc/basket: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-misc/basket/Manifest | 1 - kde-misc/basket/basket-2.49a.ebuild | 71 -- kde-misc/basket/files/basket-2.49a-deps.patch | 72 --- 3 files changed, 144 deletions(-) diff --git a/kde-misc/basket/Manifest b/kde-misc/basket/Manifest index e170255b474..01acb84708e 100644 --- a/kde-misc/basket/Manifest +++ b/kde-misc/basket/Manifest @@ -1,3 +1,2 @@ DIST basket-1.81.tar.bz2 4108025 SHA256 60a3b49af34f1df2b983b1acd321ded256f92f10ce700dc6c7954793fea3fd83 SHA512 8f26379c6aa3423af8bfa77a211845b9998cb186c8906d16f1cbdc65b70e134f861192eecce4caa8c3d429f89f0c98f301dd58451e5bbfacc15292c779195f09 WHIRLPOOL 140f8676e841be9bf4968b9efb1c36a268098200e2d604367d63bf4ddf143da5831f9f8404074f988ed76d93fe190bbda38247c51f71867ed5264c9ed07af11f -DIST basket-2.49a.tar.gz 4692638 SHA256 36679d98a3e4488d903cbd7f30e73715b7491d60f259be53e45e700bca7b900c SHA512 fe53fd8fe6e6f2531197a1f73b6528bc31e3b52c8c68c67526ab155c2a95fac47adb445e9a73d7656fe092a416b16fe0ea310a611a6f3cbb55dc916d0aa58c99 WHIRLPOOL dcd06f09d4bfbea0f03246648bab049346e39082c6db436d56e086945c515a1cb9c21baf3fb3d7cc5d32acc3748e0260a7b887c8d6912cbff3736b6419e21429 DIST basket-2.49a_p20170225.tar.gz 4680129 SHA256 860de00d0287ad4527b6b996e1eb6dc48ff1ea42424059df9bec347813080d49 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c WHIRLPOOL 7ce54ac0c57728fc8a54e333b3457c7bee7870e13a298b8ac9c2dbe8019bd53e7c2e81e45c8e113142532d90b7d5b17f6d9d56f9354a0ed21ff7e23ff70dfe21 diff --git a/kde-misc/basket/basket-2.49a.ebuild b/kde-misc/basket/basket-2.49a.ebuild deleted file mode 100644 index b0f62647bab..000 --- a/kde-misc/basket/basket-2.49a.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="true" -KDE_HANDBOOK="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="A DropDrawers clone. Multiple information organizer" -HOMEPAGE="http://basket.kde.org/ https://github.com/basket-notepads/basket"; -SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="crypt git" - -RDEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kfilemetadata) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5] - x11-libs/libX11 - crypt? ( app-crypt/gpgme ) - git? ( dev-libs/libgit2 ) -" -DEPEND="${RDEPEND} - $(add_qt_dep qtconcurrent) -" - -PATCHES=( "${FILESDIR}"/${P}-deps.patch ) - -src_prepare() { - kde5_src_prepare - if ! use test; then - sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package crypt Gpgme) - $(cmake-utils_use_find_package git Libgit2) - ) - kde5_src_configure -} diff --git a/kde-misc/basket/files/basket-2.49a-deps.patch b/kde-misc/basket/files/basket-2.49a-deps.patch deleted file mode 100644 index 225d484c407..000 --- a/kde-misc/basket/files/basket-2.49a-deps.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit 1372381456ceb4d3d15f6c78df6ba8bf0a3388a2 -Author: Andreas Sturmlechner -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 -