From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/
Date: Thu, 31 Aug 2017 19:53:18 +0000 (UTC) [thread overview]
Message-ID: <1504209173.6e43a1e33d68e470c772b09f0489eecf47677de0.floppym@gentoo> (raw)
commit: 6e43a1e33d68e470c772b09f0489eecf47677de0
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Aug 31 18:30:01 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 19:52:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e43a1e3
app-i18n/kcm-fcitx: Update dependencies.
https://github.com/fcitx/kcm-fcitx/commit/f8416ffe5b8baf1f3102fb8fe9d757cc3117bad2
app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild | 8 +++++++-
app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
index 59ff589971a..7c1971240e5 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.4.ebuild
@@ -30,7 +30,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- kde-frameworks/kcmutils:5
+ kde-frameworks/kcompletion:5
+ kde-frameworks/kconfigwidgets:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
kde-frameworks/kio:5
@@ -48,6 +49,11 @@ src_prepare() {
# x11-libs/libxkbfile only used by kbd-layout-viewer not ported to Qt 5 / KDE 5.
sed -e "/find_package(XkbFile REQUIRED)/d" -i CMakeLists.txt
+ # Adjust dependencies to match actual usage.
+ # https://github.com/fcitx/kcm-fcitx/issues/12
+ sed -e "s/KCMUtils/Completion\n ConfigWidgets/" -i CMakeLists.txt
+ sed -e "s/KF5::KCMUtils/KF5::Completion\n KF5::ConfigWidgets/" -i src/CMakeLists.txt
+
cmake-utils_src_prepare
}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
index 7b6425d1af8..d82e5c56359 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-9999.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
- kde-frameworks/kcmutils:5
+ kde-frameworks/kconfigwidgets:5
kde-frameworks/kcoreaddons:5
kde-frameworks/ki18n:5
kde-frameworks/kio:5
next reply other threads:[~2017-08-31 19:53 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-31 19:53 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-20 20:26 [gentoo-commits] repo/gentoo:master commit in: app-i18n/kcm-fcitx/ Andreas Sturmlechner
2021-04-27 22:02 Sam James
2021-04-01 19:57 Mike Gilbert
2021-03-26 14:38 Mike Gilbert
2020-11-16 19:51 Mike Gilbert
2020-11-16 19:51 Mike Gilbert
2020-11-03 20:20 Mike Gilbert
2020-10-02 17:45 Mike Gilbert
2018-03-28 19:49 Johannes Huber
2018-03-17 6:45 Matt Turner
2017-09-27 19:57 Mike Gilbert
2017-09-21 21:06 Mike Gilbert
2017-09-21 21:06 Mike Gilbert
2017-09-18 18:31 Mike Gilbert
2017-09-13 19:25 Mike Gilbert
2017-08-31 19:53 Mike Gilbert
2017-08-31 19:53 Mike Gilbert
2017-08-22 14:21 Mike Gilbert
2017-08-22 14:21 Mike Gilbert
2017-08-22 14:21 Mike Gilbert
2016-10-13 18:54 Mike Gilbert
2016-10-05 19:36 Mike Gilbert
2016-09-15 14:47 Mike Gilbert
2016-04-28 21:07 Mike Gilbert
2016-03-24 14:43 Mike Gilbert
2016-03-24 14:43 Mike Gilbert
2016-03-24 14:43 Mike Gilbert
2015-12-22 2:32 Yixun Lan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1504209173.6e43a1e33d68e470c772b09f0489eecf47677de0.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox