Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/
Date: Thu, 31 Aug 2017 19:53:20
Message-Id: 1504209173.6e43a1e33d68e470c772b09f0489eecf47677de0.floppym@gentoo
1 commit: 6e43a1e33d68e470c772b09f0489eecf47677de0
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Aug 31 18:30:01 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 31 19:52:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e43a1e3
7
8 app-i18n/kcm-fcitx: Update dependencies.
9
10 https://github.com/fcitx/kcm-fcitx/commit/f8416ffe5b8baf1f3102fb8fe9d757cc3117bad2
11
12 app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild | 8 +++++++-
13 app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild | 2 +-
14 2 files changed, 8 insertions(+), 2 deletions(-)
15
16 diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
17 index 59ff589971a..7c1971240e5 100644
18 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
19 +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
20 @@ -30,7 +30,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
21 dev-qt/qtdbus:5
22 dev-qt/qtgui:5
23 dev-qt/qtwidgets:5
24 - kde-frameworks/kcmutils:5
25 + kde-frameworks/kcompletion:5
26 + kde-frameworks/kconfigwidgets:5
27 kde-frameworks/kcoreaddons:5
28 kde-frameworks/ki18n:5
29 kde-frameworks/kio:5
30 @@ -48,6 +49,11 @@ src_prepare() {
31 # x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
32 sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
33
34 + # Adjust dependencies to match actual usage.
35 + # https://github.com/fcitx/kcm-fcitx/issues/12
36 + sed -e "s/KCMUtils/Completion\n ConfigWidgets/" -i CMakeLists.txt
37 + sed -e "s/KF5::KCMUtils/KF5::Completion\n KF5::ConfigWidgets/" -i src/CMakeLists.txt
38 +
39 cmake-utils_src_prepare
40 }
41
42
43 diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
44 index 7b6425d1af8..d82e5c56359 100644
45 --- a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
46 +++ b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
47 @@ -31,7 +31,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
48 dev-qt/qtgui:5
49 dev-qt/qtwidgets:5
50 dev-qt/qtx11extras:5
51 - kde-frameworks/kcmutils:5
52 + kde-frameworks/kconfigwidgets:5
53 kde-frameworks/kcoreaddons:5
54 kde-frameworks/ki18n:5
55 kde-frameworks/kio:5