commit: bff228d65d341fa4cbfec1651be626c316eb992c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 12 16:00:49 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 12 16:00:49 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bff228d6
kde-apps/lskat: Switch to pending upstream patch Package-Manager: Portage-2.3.49, Repoman-2.3.10 kde-apps/lskat/files/lskat-18.08.1-deps.patch | 46 +++++++++++++++++++++++++++ kde-apps/lskat/lskat-18.08.49.9999.ebuild | 4 ++- kde-apps/lskat/lskat-9999.ebuild | 5 +-- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/kde-apps/lskat/files/lskat-18.08.1-deps.patch b/kde-apps/lskat/files/lskat-18.08.1-deps.patch new file mode 100644 index 0000000000..c70f4014cd --- /dev/null +++ b/kde-apps/lskat/files/lskat-18.08.1-deps.patch @@ -0,0 +1,46 @@ +From c0a0fc016d58a2b09967a71d6b0c025e4dee71c4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 12 Sep 2018 17:42:44 +0200 +Subject: [PATCH] Drop unused dependencies + +Summary: Still builds, starts fine after the change. + +Reviewers: #kde_games + +Subscribers: kde-games-devel + +Differential Revision: https://phabricator.kde.org/D15457 +--- + CMakeLists.txt | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9764d9c..b22017e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,13 +7,11 @@ set (KF5_MIN_VERSION "5.30.0") + find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Gui Svg Widgets) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + Config +- ConfigWidgets + CoreAddons + Crash +- DBusAddons + DocTools + GuiAddons + I18n +@@ -22,7 +20,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + ) + + find_package(KF5KDEGames 4.9.0 REQUIRED) +-find_package(Phonon4Qt5 CONFIG REQUIRED) + + include(FeatureSummary) + include(ECMAddAppIcon) +-- +2.19.0 + diff --git a/kde-apps/lskat/lskat-18.08.49.9999.ebuild b/kde-apps/lskat/lskat-18.08.49.9999.ebuild index 19ad403b0b..2e94064c91 100644 --- a/kde-apps/lskat/lskat-18.08.49.9999.ebuild +++ b/kde-apps/lskat/lskat-18.08.49.9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_HANDBOOK=true +KDE_HANDBOOK="true" KDE_SELINUX_MODULE="games" inherit kde5 @@ -31,3 +31,5 @@ DEPEND=" RDEPEND="${DEPEND} !<kde-apps/kde4-l10n-17.07.80 " + +PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" ) diff --git a/kde-apps/lskat/lskat-9999.ebuild b/kde-apps/lskat/lskat-9999.ebuild index 79d7638662..2e94064c91 100644 --- a/kde-apps/lskat/lskat-9999.ebuild +++ b/kde-apps/lskat/lskat-9999.ebuild @@ -32,7 +32,4 @@ RDEPEND="${DEPEND} !<kde-apps/kde4-l10n-17.07.80 " -src_prepare() { - kde5_src_prepare - punt_bogus_dep Phonon 4Qt5 -} +PATCHES=( "${FILESDIR}/${PN}-18.08.1-deps.patch" )
