diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-23 12:35:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-07-23 12:36:40 +0200 |
| commit | c5e154651e041b989e761fe02cf9318da008fab1 (patch) | |
| tree | e39950798e56c2e434bc7bf63edd08f7ef954287 /kde-apps/kwrite/kwrite-9999.ebuild | |
| parent | 60ac6dd3ca12ca42e14b17864f33cb412343aeea (diff) | |
| download | kde-c5e154651e041b989e761fe02cf9318da008fab1.tar.gz kde-c5e154651e041b989e761fe02cf9318da008fab1.tar.bz2 kde-c5e154651e041b989e761fe02cf9318da008fab1.zip | |
kde-apps/kwrite: Workaround upstream's reshuffling of build system
Fixing kate vs. kwrite conflicting in shared kateprivate library.
Patch pending upstream:
https://invent.kde.org/utilities/kate/-/merge_requests/815
Also, add IUSE telemetry.
Upstream commits:
5ef89b41cfc1c78fe9dc91e93f9bc8c63984a1cb
8ebf728518162248bd7178c1f55678f2d4c6b77c
Closes: https://bugs.gentoo.org/859358
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kwrite/kwrite-9999.ebuild')
| -rw-r--r-- | kde-apps/kwrite/kwrite-9999.ebuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kde-apps/kwrite/kwrite-9999.ebuild b/kde-apps/kwrite/kwrite-9999.ebuild index ab77a30aa1c..90e2ea790f0 100644 --- a/kde-apps/kwrite/kwrite-9999.ebuild +++ b/kde-apps/kwrite/kwrite-9999.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kwrite/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="activities" +IUSE="activities telemetry" RDEPEND=" >=dev-qt/qtgui-${QTMIN}:5 @@ -33,11 +33,14 @@ RDEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) " DEPEND="${RDEPEND} >=kde-frameworks/ktextwidgets-${KFMIN}:5 " +PATCHES=( "${FILESDIR}/${KDE_ORG_NAME}-22.07.80-split-build-from-source.patch" ) + src_prepare() { ecm_src_prepare # delete colliding kate translations @@ -49,9 +52,11 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake_use_find_package activities KF5Activities) + -DBUILD_SPLIT_FROM_SOURCE=ON -DBUILD_addons=FALSE -DBUILD_kate=FALSE + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package telemetry KUserFeedback) ) use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE ) |