summaryrefslogtreecommitdiff
path: root/kde-apps/cantor/files/cantor-20.08.3-python.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/cantor/files/cantor-20.08.3-python.patch')
-rw-r--r--kde-apps/cantor/files/cantor-20.08.3-python.patch71
1 files changed, 0 insertions, 71 deletions
diff --git a/kde-apps/cantor/files/cantor-20.08.3-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch
deleted file mode 100644
index c0dc3804c83c..000000000000
--- a/kde-apps/cantor/files/cantor-20.08.3-python.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From c794fb5f0f616ce2d9e4004fc459a1c50f077470 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
-
-Gives us out-of-the-box future proof python detection (python-3.9 right now).
----
- CMakeLists.txt | 2 +-
- src/backends/CMakeLists.txt | 10 ++++------
- src/backends/python/CMakeLists.txt | 4 +---
- 3 files changed, 6 insertions(+), 10 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..c7868561 100644
---- a/src/backends/python/CMakeLists.txt
-+++ b/src/backends/python/CMakeLists.txt
-@@ -14,8 +14,6 @@ set(PythonServer_SRCS
- pythonserver.cpp
- )
-
--include_directories(${PYTHONLIBS3_INCLUDE_DIRS})
--
- qt5_add_resources(PythonBackend_RSCS python.qrc)
- ki18n_wrap_ui(PythonBackend_SRCS settings.ui)
- kconfig_add_kcfg_files(PythonBackend_SRCS settings.kcfgc)
-@@ -34,7 +32,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::Python)
-
- if(BUILD_TESTING)
- add_executable(testpython testpython.cpp settings.cpp)
---
-2.28.0
-