diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-27 10:50:13 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-27 11:30:42 +0100 |
| commit | c4fac72ada1f8baeee835017f47d14ca5589cfa5 (patch) | |
| tree | afbf340c457736a4da01948312726428a4edbe84 | |
| parent | kde-plasma/xdg-desktop-portal-kde: Simplify USE screencast RDEPEND (diff) | |
| download | kde-c4fac72a.tar.gz kde-c4fac72a.tar.bz2 kde-c4fac72a.zip | |
kde-plasma/breeze-gtk: Fix python executable selection
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
Bug: https://bugs.gentoo.org/691092
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
3 files changed, 50 insertions, 0 deletions
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild index 3795a4e04c..9c320fbc60 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.49.9999.ebuild @@ -26,3 +26,20 @@ pkg_setup() { python-any-r1_pkg_setup kde5_pkg_setup } + +src_prepare() { + kde5_src_prepare + if has_version "<dev-util/cmake-3.16_rc1"; then + eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch + fi +} + +src_configure() { + local mycmakeargs=( + -DPython3_EXECUTABLE="${PYTHON}" + ) + if has_version "<dev-util/cmake-3.16_rc1"; then + mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) + fi + kde5_src_configure +} diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild index 3795a4e04c..9c320fbc60 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild @@ -26,3 +26,20 @@ pkg_setup() { python-any-r1_pkg_setup kde5_pkg_setup } + +src_prepare() { + kde5_src_prepare + if has_version "<dev-util/cmake-3.16_rc1"; then + eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch + fi +} + +src_configure() { + local mycmakeargs=( + -DPython3_EXECUTABLE="${PYTHON}" + ) + if has_version "<dev-util/cmake-3.16_rc1"; then + mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) + fi + kde5_src_configure +} 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 new file mode 100644 index 0000000000..cbf8693731 --- /dev/null +++ b/kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch @@ -0,0 +1,16 @@ +Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> + +--- 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" |