Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/ki18n/files/, kde-frameworks/ki18n/
Date: Sun, 21 Apr 2019 11:18:35
Message-Id: 1555845225.bcc04eaf5bb1c60b1739bfb217e4037e53988ffd.asturm@gentoo
1 commit: bcc04eaf5bb1c60b1739bfb217e4037e53988ffd
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 20 19:04:17 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 21 11:13:45 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bcc04eaf
7
8 kde-frameworks/ki18n: Fix build with python2_7
9
10 Package-Manager: Portage-2.3.64, Repoman-2.3.12
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch | 11 +++++++++++
14 kde-frameworks/ki18n/ki18n-9999.ebuild | 2 ++
15 2 files changed, 13 insertions(+)
16
17 diff --git a/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
18 new file mode 100644
19 index 0000000000..8b863e4e0f
20 --- /dev/null
21 +++ b/kde-frameworks/ki18n/files/ki18n-5.57.0-python.patch
22 @@ -0,0 +1,11 @@
23 +--- a/cmake/KF5I18nMacros.cmake.in 2019-04-07 09:28:26.000000000 +0200
24 ++++ b/cmake/KF5I18nMacros.cmake.in 2019-04-20 20:56:41.628484762 +0200
25 +@@ -31,7 +31,7 @@
26 + # solution if it cannot be found in $PATH when building applications.
27 + set(_KI18N_PYTHON_EXECUTABLE "@PYTHON_EXECUTABLE@")
28 +
29 +-find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
30 ++find_program(KI18N_PYTHON_EXECUTABLE NAMES python)
31 + if(NOT KI18N_PYTHON_EXECUTABLE)
32 + set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
33 + endif()
34
35 diff --git a/kde-frameworks/ki18n/ki18n-9999.ebuild b/kde-frameworks/ki18n/ki18n-9999.ebuild
36 index b452e1b707..0efa337e88 100644
37 --- a/kde-frameworks/ki18n/ki18n-9999.ebuild
38 +++ b/kde-frameworks/ki18n/ki18n-9999.ebuild
39 @@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
40 test? ( $(add_qt_dep qtconcurrent) )
41 "
42
43 +PATCHES=( "${FILESDIR}/${PN}-5.57.0-python.patch" )
44 +
45 pkg_setup() {
46 kde5_pkg_setup
47 python-single-r1_pkg_setup