diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-15 23:01:21 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-10-15 23:01:54 +0200 |
| commit | 48fe47ce614ca6939e222465a7a0f9729d929a7a (patch) | |
| tree | 75ea7046d5d7e2b1ff9d3f3b494694ffc4a4aa50 | |
| parent | 5e884fc6ea8df7a55189cb757881f077101ac206 (diff) | |
| download | kde-48fe47ce614ca6939e222465a7a0f9729d929a7a.tar.gz kde-48fe47ce614ca6939e222465a7a0f9729d929a7a.tar.bz2 kde-48fe47ce614ca6939e222465a7a0f9729d929a7a.zip | |
kde-apps/cantor: Update python.patch with upstream review changes
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-apps/cantor/cantor-20.08.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/cantor/cantor-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/cantor/files/cantor-20.08.3-python.patch (renamed from kde-apps/cantor/files/cantor-20.08.2-python.patch) | 19 |
3 files changed, 12 insertions, 11 deletions
diff --git a/kde-apps/cantor/cantor-20.08.49.9999.ebuild b/kde-apps/cantor/cantor-20.08.49.9999.ebuild index d7a34a7ba64..ee1c4bf4b38 100644 --- a/kde-apps/cantor/cantor-20.08.49.9999.ebuild +++ b/kde-apps/cantor/cantor-20.08.49.9999.ebuild @@ -74,7 +74,7 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild index b415fa864f6..1a6538747c8 100644 --- a/kde-apps/cantor/cantor-9999.ebuild +++ b/kde-apps/cantor/cantor-9999.ebuild @@ -74,7 +74,7 @@ RDEPEND="${DEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-20.08.2-python.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" ) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.3-python.patch index 0f3c6774628..c0dc3804c83 100644 --- a/kde-apps/cantor/files/cantor-20.08.2-python.patch +++ b/kde-apps/cantor/files/cantor-20.08.3-python.patch @@ -1,13 +1,14 @@ -From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001 +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, 7 insertions(+), 9 deletions(-) + 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 @@ -44,24 +45,24 @@ index e99e1731..9b6b615e 100644 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 +index 04b4c313..c7868561 100644 --- a/src/backends/python/CMakeLists.txt +++ b/src/backends/python/CMakeLists.txt -@@ -14,7 +14,7 @@ set(PythonServer_SRCS +@@ -14,8 +14,6 @@ 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 + 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_LIBRARIES}) ++target_link_libraries(cantor_pythonserver Python3::Python) if(BUILD_TESTING) add_executable(testpython testpython.cpp settings.cpp) |