| 1 |
commit: 27754d34eb02ba1cf6aaffa04be7b490441fc8a7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 27 09:50:13 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 27 10:35:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27754d34 |
| 7 |
|
| 8 |
kde-plasma/breeze-gtk: Fix python executable selection |
| 9 |
|
| 10 |
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com> |
| 11 |
Closes: https://bugs.gentoo.org/691092 |
| 12 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild | 17 +++++++++++++++++ |
| 16 |
kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild | 17 +++++++++++++++++ |
| 17 |
.../files/breeze-gtk-5.16.5-cmake-pre-3.16.patch | 16 ++++++++++++++++ |
| 18 |
3 files changed, 50 insertions(+) |
| 19 |
|
| 20 |
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild |
| 21 |
index 0587632ef9b..f1f464f67c1 100644 |
| 22 |
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild |
| 23 |
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild |
| 24 |
@@ -26,3 +26,20 @@ pkg_setup() { |
| 25 |
python-any-r1_pkg_setup |
| 26 |
kde5_pkg_setup |
| 27 |
} |
| 28 |
+ |
| 29 |
+src_prepare() { |
| 30 |
+ kde5_src_prepare |
| 31 |
+ if has_version "<dev-util/cmake-3.16_rc1"; then |
| 32 |
+ eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch |
| 33 |
+ fi |
| 34 |
+} |
| 35 |
+ |
| 36 |
+src_configure() { |
| 37 |
+ local mycmakeargs=( |
| 38 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 39 |
+ ) |
| 40 |
+ if has_version "<dev-util/cmake-3.16_rc1"; then |
| 41 |
+ mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
| 42 |
+ fi |
| 43 |
+ kde5_src_configure |
| 44 |
+} |
| 45 |
|
| 46 |
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild |
| 47 |
index 7c9fed2f4c3..38c53a1e609 100644 |
| 48 |
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild |
| 49 |
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild |
| 50 |
@@ -26,3 +26,20 @@ pkg_setup() { |
| 51 |
python-any-r1_pkg_setup |
| 52 |
kde5_pkg_setup |
| 53 |
} |
| 54 |
+ |
| 55 |
+src_prepare() { |
| 56 |
+ kde5_src_prepare |
| 57 |
+ if has_version "<dev-util/cmake-3.16_rc1"; then |
| 58 |
+ eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch |
| 59 |
+ fi |
| 60 |
+} |
| 61 |
+ |
| 62 |
+src_configure() { |
| 63 |
+ local mycmakeargs=( |
| 64 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 65 |
+ ) |
| 66 |
+ if has_version "<dev-util/cmake-3.16_rc1"; then |
| 67 |
+ mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) |
| 68 |
+ fi |
| 69 |
+ kde5_src_configure |
| 70 |
+} |
| 71 |
|
| 72 |
diff --git a/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch |
| 73 |
new file mode 100644 |
| 74 |
index 00000000000..cbf8693731e |
| 75 |
--- /dev/null |
| 76 |
+++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch |
| 77 |
@@ -0,0 +1,16 @@ |
| 78 |
+Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> |
| 79 |
+ |
| 80 |
+--- a/cmake/FindPythonCairo.cmake |
| 81 |
++++ b/cmake/FindPythonCairo.cmake |
| 82 |
+@@ -1,10 +1,4 @@ |
| 83 |
+-if(CMAKE_VERSION VERSION_LESS 3.12.0) |
| 84 |
+- find_package(PythonInterp 3 REQUIRED) |
| 85 |
+- # PythonInterp sets PYTHON_EXECUTABLE |
| 86 |
+-else() |
| 87 |
+- find_package(Python3 COMPONENTS Interpreter REQUIRED) |
| 88 |
+- set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}") |
| 89 |
+-endif() |
| 90 |
++find_package(PythonInterp 3 REQUIRED) |
| 91 |
+ |
| 92 |
+ # Check for python cairo |
| 93 |
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import cairo" |
Archives