From 27754d34eb02ba1cf6aaffa04be7b490441fc8a7 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 27 Oct 2019 10:50:13 +0100 Subject: [PATCH] kde-plasma/breeze-gtk: Fix python executable selection Thanks-to: Arfrever Frehtes Taifersar Arahesis Closes: https://bugs.gentoo.org/691092 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild | 17 +++++++++++++++++ kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild | 17 +++++++++++++++++ .../breeze-gtk-5.16.5-cmake-pre-3.16.patch | 16 ++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild index 0587632ef9b1..f1f464f67c1c 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild @@ -26,3 +26,20 @@ pkg_setup() { python-any-r1_pkg_setup kde5_pkg_setup } + +src_prepare() { + kde5_src_prepare + if has_version " + +--- a/cmake/FindPythonCairo.cmake ++++ b/cmake/FindPythonCairo.cmake +@@ -1,10 +1,4 @@ +-if(CMAKE_VERSION VERSION_LESS 3.12.0) +- find_package(PythonInterp 3 REQUIRED) +- # PythonInterp sets PYTHON_EXECUTABLE +-else() +- find_package(Python3 COMPONENTS Interpreter REQUIRED) +- set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}") +-endif() ++find_package(PythonInterp 3 REQUIRED) + + # Check for python cairo + execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import cairo" -- 2.26.2