Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-dev-utils/, kde-apps/kde-dev-utils/files/
Date: Sat, 14 Jul 2018 11:47:03
Message-Id: 1531567704.3f31411e1d7351e6ed7d148b1b8d214b93127dc9.asturm@gentoo
1 commit: 3f31411e1d7351e6ed7d148b1b8d214b93127dc9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 14 11:28:24 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 14 11:28:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f31411e
7
8 kde-apps/kde-dev-utils: Fix build with KF-5.48
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 .../files/kde-dev-utils-18.04.3-ki18n-5.48.patch | 34 ++++++++++++++++++++++
13 .../kde-dev-utils/kde-dev-utils-18.04.3.ebuild | 2 ++
14 2 files changed, 36 insertions(+)
15
16 diff --git a/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
17 new file mode 100644
18 index 00000000000..3713839d32d
19 --- /dev/null
20 +++ b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
21 @@ -0,0 +1,34 @@
22 +diff --git a/CMakeLists.txt b/CMakeLists.txt
23 +--- a/CMakeLists.txt
24 ++++ b/CMakeLists.txt
25 +@@ -10,5 +10,8 @@
26 + include(KDECompilerSettings NO_POLICY_SCOPE)
27 + include(ECMQtDeclareLoggingCategory)
28 +
29 ++# Required for ki18n_install(po) added on tarball generation
30 ++find_package(KF5 REQUIRED COMPONENTS I18n)
31 ++
32 + add_subdirectory(kpartloader)
33 + add_subdirectory(kuiviewer)
34 +diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
35 +--- a/kpartloader/CMakeLists.txt
36 ++++ b/kpartloader/CMakeLists.txt
37 +@@ -11,7 +11,6 @@
38 + find_package(KF5 REQUIRED
39 + COMPONENTS
40 + CoreAddons
41 +- I18n
42 + Parts
43 + WidgetsAddons
44 + )
45 +diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
46 +--- a/kuiviewer/CMakeLists.txt
47 ++++ b/kuiviewer/CMakeLists.txt
48 +@@ -15,7 +15,6 @@
49 + COMPONENTS
50 + CoreAddons
51 + KIO
52 +- I18n
53 + Parts
54 + )
55 +
56
57 diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
58 index fd428260d4a..2db803cad04 100644
59 --- a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
60 +++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.3.ebuild
61 @@ -27,3 +27,5 @@ DEPEND="
62 RDEPEND="${DEPEND}
63 !<kde-apps/kde4-l10n-17.03.90:4
64 "
65 +
66 +PATCHES=( "${FILESDIR}/${P}-ki18n-5.48.patch" )