From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1215208-garchives=archives.gentoo.org@lists.gentoo.org>
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 9126D13835B
for <garchives@archives.gentoo.org>; Thu, 15 Oct 2020 22:14:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E9556E087E;
Thu, 15 Oct 2020 22:14:55 +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 C2A77E087E
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2020 22:14:55 +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 C1C1733FE2A
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2020 22:14:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 75CB03A7
for <gentoo-commits@lists.gentoo.org>; Thu, 15 Oct 2020 22:14:53 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1602795714.48fe47ce614ca6939e222465a7a0f9729d929a7a.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/cantor/cantor-20.08.49.9999.ebuild kde-apps/cantor/cantor-9999.ebuild kde-apps/cantor/files/cantor-20.08.2-python.patch kde-apps/cantor/files/cantor-20.08.3-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: 48fe47ce614ca6939e222465a7a0f9729d929a7a
X-VCS-Branch: master
Date: Thu, 15 Oct 2020 22:14:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0490872c-ab60-44f7-9dc4-1d1b15f765d1
X-Archives-Hash: ee95eaadf7977f9f461bb2a89d17e9cc
commit: 48fe47ce614ca6939e222465a7a0f9729d929a7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 21:01:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 21:01:54 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=48fe47ce
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 <AT> gentoo.org>
kde-apps/cantor/cantor-20.08.49.9999.ebuild | 2 +-
kde-apps/cantor/cantor-9999.ebuild | 2 +-
....08.2-python.patch => cantor-20.08.3-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 d7a34a7ba6..ee1c4bf4b3 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 b415fa864f..1a6538747c 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
similarity index 80%
rename from kde-apps/cantor/files/cantor-20.08.2-python.patch
rename to kde-apps/cantor/files/cantor-20.08.3-python.patch
index 0f3c677462..c0dc3804c8 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)