diff options
Diffstat (limited to 'kde-apps')
| -rw-r--r-- | kde-apps/cantor/cantor-20.08.49.9999.ebuild | 7 | ||||
| -rw-r--r-- | kde-apps/cantor/cantor-9999.ebuild | 7 | ||||
| -rw-r--r-- | kde-apps/cantor/files/cantor-20.08.2-python.patch | 70 |
3 files changed, 80 insertions, 4 deletions
diff --git a/kde-apps/cantor/cantor-20.08.49.9999.ebuild b/kde-apps/cantor/cantor-20.08.49.9999.ebuild index c807935fdf3..2193661feb6 100644 --- a/kde-apps/cantor/cantor-20.08.49.9999.ebuild +++ b/kde-apps/cantor/cantor-20.08.49.9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-3) KFMIN=5.72.0 QTMIN=5.14.2 @@ -74,6 +74,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup @@ -87,10 +89,11 @@ src_configure() { $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) -DUSE_LIBSPECTRE=$(usex postscript) - $(cmake_use_find_package python PythonLibs3) + $(cmake_use_find_package python Python3) $(cmake_use_find_package qalculate Qalculate) $(cmake_use_find_package R R) ) + use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) ecm_src_configure } diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild index 87d15617ea4..8b8ba94e1b6 100644 --- a/kde-apps/cantor/cantor-9999.ebuild +++ b/kde-apps/cantor/cantor-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-3) KFMIN=5.75.0 QTMIN=5.15.1 @@ -74,6 +74,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup ecm_pkg_setup @@ -87,10 +89,11 @@ src_configure() { $(cmake_use_find_package julia Julia) $(cmake_use_find_package lua LuaJIT) -DUSE_LIBSPECTRE=$(usex postscript) - $(cmake_use_find_package python PythonLibs3) + $(cmake_use_find_package python Python3) $(cmake_use_find_package qalculate Qalculate) $(cmake_use_find_package R R) ) + use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" ) ecm_src_configure } diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.2-python.patch new file mode 100644 index 00000000000..0f3c6774628 --- /dev/null +++ b/kde-apps/cantor/files/cantor-20.08.2-python.patch @@ -0,0 +1,70 @@ +From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 11 Oct 2020 22:47:55 +0200 +Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12 + +--- + CMakeLists.txt | 2 +- + src/backends/CMakeLists.txt | 10 ++++------ + src/backends/python/CMakeLists.txt | 4 ++-- + 3 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e96e6df0..a90328b5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.5 FATAL_ERROR) ++cmake_minimum_required (VERSION 3.12 FATAL_ERROR) + + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt +index e99e1731..9b6b615e 100644 +--- a/src/backends/CMakeLists.txt ++++ b/src/backends/CMakeLists.txt +@@ -50,15 +50,13 @@ if(QALCULATE_FOUND) + add_subdirectory(qalculate) + endif(QALCULATE_FOUND) + +-set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language." +- URL "https://www.python.org/" +- TYPE OPTIONAL ++set_package_properties(Python3 PROPERTIES TYPE OPTIONAL + PURPOSE "Backend to use Python with Cantor.") + +-find_package(PythonLibs3) +-if(PYTHONLIBS3_FOUND) ++find_package(Python3 COMPONENTS Interpreter Development) ++if(Python3_FOUND) + add_subdirectory(python) +-endif(PYTHONLIBS3_FOUND) ++endif() + + set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)." + URL "https://www.lua.org/" +diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMakeLists.txt +index 04b4c313..ccf76193 100644 +--- a/src/backends/python/CMakeLists.txt ++++ b/src/backends/python/CMakeLists.txt +@@ -14,7 +14,7 @@ set(PythonServer_SRCS + pythonserver.cpp + ) + +-include_directories(${PYTHONLIBS3_INCLUDE_DIRS}) ++include_directories(${Python3_INCLUDE_DIRS}) + + qt5_add_resources(PythonBackend_RSCS python.qrc) + ki18n_wrap_ui(PythonBackend_SRCS settings.ui) +@@ -34,7 +34,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH + if(MSVC) + set_property(TARGET cantor_pythonserver PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE") + endif() +-target_link_libraries(cantor_pythonserver ${PYTHONLIBS3_LIBRARIES}) ++target_link_libraries(cantor_pythonserver ${Python3_LIBRARIES}) + + if(BUILD_TESTING) + add_executable(testpython testpython.cpp settings.cpp) +-- +2.28.0 + |