commit: 24f9e37e666d3feed760ff53dabdf98e6e718182 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 25 05:55:52 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 25 05:55:52 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=24f9e37e
kde-apps/pimcommon: Backport patch wrt unused deps, fix DEPENDs Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../pimcommon/files/pimcommon-17.04.3-deps.patch | 54 ++++++++++++++++++++++ kde-apps/pimcommon/pimcommon-17.07.80.ebuild | 3 ++ kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild | 3 ++ kde-apps/pimcommon/pimcommon-9999.ebuild | 1 + 4 files changed, 61 insertions(+) diff --git a/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch new file mode 100644 index 0000000000..9e9b37b4f3 --- /dev/null +++ b/kde-apps/pimcommon/files/pimcommon-17.04.3-deps.patch @@ -0,0 +1,54 @@ +commit fbebfbe29d1928a36fe5643853b5a02f13f7b07c +Author: Andreas Sturmlechner <[email protected]> +Date: Sun Jul 23 22:21:38 2017 +0200 + + Cleanup unused dependencies + + Test Plan: Builds fine. + + Reviewers: #kde_pim, mlaurent + + Reviewed By: #kde_pim, mlaurent + + Subscribers: mlaurent + + Tags: #kde_pim + + Differential Revision: https://phabricator.kde.org/D6859 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dca7fe2..d5f41fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,23 +47,18 @@ find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED) +-find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5JobWidgets ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED) +-find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED) +-find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED) + find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) + + find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) + find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED) +-find_package(KF5AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) +-find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) + find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) + find_package(Grantlee5 "5.1" CONFIG REQUIRED) + +@@ -82,6 +76,7 @@ find_package(Xsltproc) + set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT processor from libxslt" TYPE REQUIRED PURPOSE "Required to generate D-Bus interfaces for all Akonadi resources.") + + if(BUILD_TESTING) ++ find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) + add_definitions(-DBUILD_TESTING) + endif(BUILD_TESTING) + diff --git a/kde-apps/pimcommon/pimcommon-17.07.80.ebuild b/kde-apps/pimcommon/pimcommon-17.07.80.ebuild index 0308f4f16c..e08688f90a 100644 --- a/kde-apps/pimcommon/pimcommon-17.07.80.ebuild +++ b/kde-apps/pimcommon/pimcommon-17.07.80.ebuild @@ -44,6 +44,7 @@ COMMON_DEPEND=" dev-libs/grantlee:5 " DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kiconthemes) dev-libs/libxslt test? ( $(add_kdeapps_dep kmime) ) " @@ -51,3 +52,5 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n " + +PATCHES=( "${FILESDIR}/${PN}-17.04.3-deps.patch" ) diff --git a/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild index 9f51dcfb00..eae3316062 100644 --- a/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-17.08.49.9999.ebuild @@ -44,6 +44,7 @@ COMMON_DEPEND=" dev-libs/grantlee:5 " DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kiconthemes) dev-libs/libxslt test? ( $(add_kdeapps_dep kmime) ) " @@ -51,3 +52,5 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n " + +PATCHES=( "${FILESDIR}/${PN}-17.04.3-deps.patch" ) diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild index 9f51dcfb00..2c6db7a368 100644 --- a/kde-apps/pimcommon/pimcommon-9999.ebuild +++ b/kde-apps/pimcommon/pimcommon-9999.ebuild @@ -44,6 +44,7 @@ COMMON_DEPEND=" dev-libs/grantlee:5 " DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kiconthemes) dev-libs/libxslt test? ( $(add_kdeapps_dep kmime) ) "
