From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 726AD138359 for ; Sun, 11 Oct 2020 21:33:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BE91E0BC5; Sun, 11 Oct 2020 21:33:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 058CDE0BC5 for ; Sun, 11 Oct 2020 21:33:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79F97340C3C for ; Sun, 11 Oct 2020 21:33:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F08C03A9 for ; Sun, 11 Oct 2020 21:33:21 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1602451974.c1245e6300f7a054d1ec07c3203de104492fb18d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/cantor/cantor-20.08.2.ebuild kde-apps/cantor/files/cantor-20.08.2-python.patch X-VCS-Directories: kde-apps/cantor/files/ kde-apps/cantor/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c1245e6300f7a054d1ec07c3203de104492fb18d X-VCS-Branch: master Date: Sun, 11 Oct 2020 21:33:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 180ca22e-40f5-4a0f-ae6b-01d07b626511 X-Archives-Hash: 2327bb6f7569a824af9bd3983028fe20 commit: c1245e6300f7a054d1ec07c3203de104492fb18d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 11 20:18:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 11 21:32:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1245e63 kde-apps/cantor: python3_9 via patch to use CMake's Python3 module Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/cantor/cantor-20.08.2.ebuild | 7 ++- kde-apps/cantor/files/cantor-20.08.2-python.patch | 70 +++++++++++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/kde-apps/cantor/cantor-20.08.2.ebuild b/kde-apps/cantor/cantor-20.08.2.ebuild index 1185cb49e18..5ed83ea2278 100644 --- a/kde-apps/cantor/cantor-20.08.2.ebuild +++ b/kde-apps/cantor/cantor-20.08.2.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}/${P}-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 +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 +