public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
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:46:53 +0000 (UTC)	[thread overview]
Message-ID: <1531567704.3f31411e1d7351e6ed7d148b1b8d214b93127dc9.asturm@gentoo> (raw)

commit:     3f31411e1d7351e6ed7d148b1b8d214b93127dc9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 11:28:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 11:28:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f31411e

kde-apps/kde-dev-utils: Fix build with KF-5.48

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../files/kde-dev-utils-18.04.3-ki18n-5.48.patch   | 34 ++++++++++++++++++++++
 .../kde-dev-utils/kde-dev-utils-18.04.3.ebuild     |  2 ++
 2 files changed, 36 insertions(+)

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
new file mode 100644
index 00000000000..3713839d32d
--- /dev/null
+++ b/kde-apps/kde-dev-utils/files/kde-dev-utils-18.04.3-ki18n-5.48.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,5 +10,8 @@
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+ include(ECMQtDeclareLoggingCategory)
+ 
++# Required for ki18n_install(po) added on tarball generation
++find_package(KF5 REQUIRED COMPONENTS I18n)
++
+ add_subdirectory(kpartloader)
+ add_subdirectory(kuiviewer)
+diff --git a/kpartloader/CMakeLists.txt b/kpartloader/CMakeLists.txt
+--- a/kpartloader/CMakeLists.txt
++++ b/kpartloader/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ find_package(KF5 REQUIRED
+     COMPONENTS
+     CoreAddons
+-    I18n
+     Parts
+     WidgetsAddons
+ )
+diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt
+--- a/kuiviewer/CMakeLists.txt
++++ b/kuiviewer/CMakeLists.txt
+@@ -15,7 +15,6 @@
+     COMPONENTS
+     CoreAddons
+     KIO
+-    I18n
+     Parts
+ )
+ 

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
index fd428260d4a..2db803cad04 100644
--- 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
@@ -27,3 +27,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!<kde-apps/kde4-l10n-17.03.90:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-ki18n-5.48.patch" )


                 reply	other threads:[~2018-07-14 11:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1531567704.3f31411e1d7351e6ed7d148b1b8d214b93127dc9.asturm@gentoo \
    --to=asturm@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