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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 57F9D158094 for ; Wed, 27 Jul 2022 09:24:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BBDBE10D6; Wed, 27 Jul 2022 09:24:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBDE9E10D6 for ; Wed, 27 Jul 2022 09:24:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB9C4340E7C for ; Wed, 27 Jul 2022 09:23:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0394326 for ; Wed, 27 Jul 2022 09:23:57 +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: <1658913816.464f7436367e198544fe1afb176b93d1545d8795.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/kopeninghours/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch X-VCS-Directories: dev-libs/kopeninghours/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 464f7436367e198544fe1afb176b93d1545d8795 X-VCS-Branch: master Date: Wed, 27 Jul 2022 09:23:57 +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: 370760a7-af9e-43fa-8ce5-dff219eab1ad X-Archives-Hash: b5aab65511a42ca2a3dbdaf54d070b9b commit: 464f7436367e198544fe1afb176b93d1545d8795 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jul 26 16:49:28 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 27 09:23:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464f7436 dev-libs/kopeninghours: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11 Closes: https://github.com/gentoo/gentoo/pull/26605 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kopeninghours-21.03.90-boostpython.patch | 79 ---------------------- 1 file changed, 79 deletions(-) diff --git a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch b/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch deleted file mode 100644 index 939bcbcd9e37..000000000000 --- a/dev-libs/kopeninghours/files/kopeninghours-21.03.90-boostpython.patch +++ /dev/null @@ -1,79 +0,0 @@ -From fd7c2e1f3797c1a67dc6346dfcb192f042cb19e8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 11 Apr 2021 14:33:48 +0200 -Subject: [PATCH] Use FindPython3 w/ Python3_SITELIB, add - BOOSTPYTHON_VERSION_MAJOR_MINOR - -- Use BOOSTPYTHON_VERSION_MAJOR_MINOR to inject desired python target -- Drop deprecated PythonLibs -- Use FindPython3 with Python3_SITELIB for correct install location - -Signed-off-by: Andreas Sturmlechner ---- - CMakeLists.txt | 16 +++++----------- - PyKOpeningHours/CMakeLists.txt | 10 ++++------ - 2 files changed, 9 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7c50b40..a9a9328 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-FileCopyrightText: 2020 Volker Krause - # SPDX-License-Identifier: BSD-3-Clause - --cmake_minimum_required(VERSION 3.5) -+cmake_minimum_required(VERSION 3.12) - - # KDE Application Version, managed by release script - set (RELEASE_SERVICE_VERSION_MAJOR "21") -@@ -56,22 +56,16 @@ set_package_properties(FLEX PROPERTIES PURPOSE "Lexer generator for parsing open - find_package(BISON REQUIRED) - set_package_properties(BISON PROPERTIES PURPOSE "Grammar generator for parsing opening hours expressions") - --find_package(PythonLibs 3.6 MODULE) --if (PythonLibs_FOUND) -- # Extract major/minor python version -- string(REPLACE "." ";" VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) -- list(GET VERSION_LIST 0 PYTHONLIBS_VERSION_MAJOR) -- list(GET VERSION_LIST 1 PYTHONLIBS_VERSION_MINOR) -- -- # boost-python requires exact version number -- find_package(Boost COMPONENTS python${PYTHONLIBS_VERSION_MAJOR}${PYTHONLIBS_VERSION_MINOR} MODULE) --endif() -+set(BOOSTPYTHON_VERSION_MAJOR_MINOR python36 CACHE STRING "Version of BoostPython to feed CMake's FindBoost") -+# boost-python requires exact version number -+find_package(Boost 1.70 COMPONENTS ${BOOSTPYTHON_VERSION_MAJOR_MINOR} MODULE) - - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) - add_definitions(-DQT_NO_FOREACH) - add_subdirectory(src) - if (Boost_FOUND) -+ find_package(Python3 3.6 COMPONENTS Development) - add_subdirectory(PyKOpeningHours) - endif() - -diff --git a/PyKOpeningHours/CMakeLists.txt b/PyKOpeningHours/CMakeLists.txt -index 771cedf..e755ea7 100644 ---- a/PyKOpeningHours/CMakeLists.txt -+++ b/PyKOpeningHours/CMakeLists.txt -@@ -21,11 +21,9 @@ kde_target_enable_exceptions(PyKOpeningHours PRIVATE) - target_compile_definitions(PyKOpeningHours PRIVATE KOPENINGHOURS_VALIDATOR_ONLY) - - # Set up the libraries and header search paths for this target --target_link_libraries(PyKOpeningHours PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} KOpeningHours) --target_include_directories(PyKOpeningHours PRIVATE ${PYTHON_INCLUDE_DIRS}) -+target_link_libraries(PyKOpeningHours PUBLIC Boost::${BOOSTPYTHON_VERSION_MAJOR_MINOR} ${Python3_LIBRARIES} KOpeningHours) -+target_include_directories(PyKOpeningHours PRIVATE ${Python3_INCLUDE_DIRS}) - --set(_install_dir lib/python${PYTHONLIBS_VERSION_MAJOR}.${PYTHONLIBS_VERSION_MINOR}/site-packages) -- --install(TARGETS PyKOpeningHours DESTINATION ${_install_dir}/PyKOpeningHours) --install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${_install_dir}/PyKOpeningHours) -+install(TARGETS PyKOpeningHours DESTINATION ${Python3_SITELIB}/PyKOpeningHours) -+install(FILES PyKOpeningHours.pyi __init__.py DESTINATION ${Python3_SITELIB}/PyKOpeningHours) - --- -2.31.1 -