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-frameworks/ki18n/files/, kde-frameworks/ki18n/
Date: Sun, 21 Apr 2019 11:31:35 +0000 (UTC)	[thread overview]
Message-ID: <1555846256.b59c06bbdbec6b256da79694928c72c121850fd6.asturm@gentoo> (raw)

commit:     b59c06bbdbec6b256da79694928c72c121850fd6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 19:04:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 11:30:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b59c06bb

kde-frameworks/ki18n: Fix build with python2_7

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch | 11 +++++++++++
 kde-frameworks/ki18n/ki18n-5.57.0.ebuild             |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
new file mode 100644
index 00000000000..8b863e4e0fc
--- /dev/null
+++ b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
@@ -0,0 +1,11 @@
+--- a/cmake/KF5I18nMacros.cmake.in	2019-04-07 09:28:26.000000000 +0200
++++ b/cmake/KF5I18nMacros.cmake.in	2019-04-20 20:56:41.628484762 +0200
+@@ -31,7 +31,7 @@
+ # solution if it cannot be found in $PATH when building applications.
+ set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
+ 
+-find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
++find_program(KI18N_PYTHON_EXECUTABLE NAMES python)
+ if(NOT KI18N_PYTHON_EXECUTABLE)
+     set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
+ endif()

diff --git a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
index 0793540bf12..cd5cad14afb 100644
--- a/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.57.0.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	test? ( $(add_qt_dep qtconcurrent) )
 "
 
+PATCHES=( "${FILESDIR}/${P}-python.patch" )
+
 pkg_setup() {
 	kde5_pkg_setup
 	python-single-r1_pkg_setup


             reply	other threads:[~2019-04-21 11:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-21 11:31 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-11-21 10:38 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/ Andreas Sturmlechner

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=1555846256.b59c06bbdbec6b256da79694928c72c121850fd6.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