summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-10-27 10:50:13 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-10-27 11:35:31 +0100
commit27754d34eb02ba1cf6aaffa04be7b490441fc8a7 (patch)
treeeafb0fc3d9225876b549cd34c1dbf90e808d68a6 /kde-plasma
parentsys-apps/thunderbolt-software-user-space: Add comment re app-text/txt2tags (diff)
downloadgentoo-27754d34eb02ba1cf6aaffa04be7b490441fc8a7.tar.gz
gentoo-27754d34eb02ba1cf6aaffa04be7b490441fc8a7.tar.bz2
gentoo-27754d34eb02ba1cf6aaffa04be7b490441fc8a7.zip
kde-plasma/breeze-gtk: Fix python executable selection
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Closes: https://bugs.gentoo.org/691092 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild17
-rw-r--r--kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild17
-rw-r--r--kde-plasma/breeze-gtk/files/breeze-gtk-5.16.5-cmake-pre-3.16.patch16
3 files changed, 50 insertions, 0 deletions
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 "<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-5.17.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild
index 7c9fed2f4c3f..38c53a1e609a 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.1.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 000000000000..cbf8693731ec
--- /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"