From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 099D61582EF for ; Fri, 14 Feb 2025 15:09:24 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id BCC1A3430D5 for ; Fri, 14 Feb 2025 15:09:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BE51B11042D; Fri, 14 Feb 2025 15:09:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id B27D611042D for ; Fri, 14 Feb 2025 15:09:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 53C4D3430D5 for ; Fri, 14 Feb 2025 15:09:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 846272694 for ; Fri, 14 Feb 2025 15:09:20 +0000 (UTC) From: "Quinet Charlie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Quinet Charlie" Message-ID: <1739545646.d0baf21da930c919c649559ee4939635b2743f1c.w.iron.zombie@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/corectrl/files/, app-misc/corectrl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/corectrl/corectrl-1.4.3.ebuild app-misc/corectrl/corectrl-9999.ebuild app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch X-VCS-Directories: app-misc/corectrl/ app-misc/corectrl/files/ X-VCS-Committer: w.iron.zombie X-VCS-Committer-Name: Quinet Charlie X-VCS-Revision: d0baf21da930c919c649559ee4939635b2743f1c X-VCS-Branch: dev Date: Fri, 14 Feb 2025 15:09:20 +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: a8c1e356-eb56-4a14-874b-2bdcebbb5a7b X-Archives-Hash: 1d9438d520dec7bccb77d44ccb693ca6 commit: d0baf21da930c919c649559ee4939635b2743f1c Author: Charlie Quinet gmail com> AuthorDate: Fri Feb 14 15:07:26 2025 +0000 Commit: Quinet Charlie gmail com> CommitDate: Fri Feb 14 15:07:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0baf21d app-misc/corectrl: replace patches with a simple sed Signed-off-by: Charlie Quinet gmail.com> app-misc/corectrl/corectrl-1.4.3.ebuild | 4 +++- app-misc/corectrl/corectrl-9999.ebuild | 4 +++- .../1.4.3-remove_libstdcxxfs_dependency.patch | 24 ---------------------- .../files/9999-remove_libstdcxxfs_dependency.patch | 24 ---------------------- 4 files changed, 6 insertions(+), 50 deletions(-) diff --git a/app-misc/corectrl/corectrl-1.4.3.ebuild b/app-misc/corectrl/corectrl-1.4.3.ebuild index 97b0bd6b2..8f724ceeb 100644 --- a/app-misc/corectrl/corectrl-1.4.3.ebuild +++ b/app-misc/corectrl/corectrl-1.4.3.ebuild @@ -55,7 +55,9 @@ RDEPEND="${COMMON_DEPEND} CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG" src_prepare() { - ! tc-is-gcc && (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/1.4.3-remove_libstdcxxfs_dependency.patch" + if [[ $(tc-get-cxx-stdlib) == "libc++" ]]; then + sed -i 's/stdc++fs//g' src/CMakeLists.txt src/helper/CMakeLists.txt || die + fi cmake_src_prepare } diff --git a/app-misc/corectrl/corectrl-9999.ebuild b/app-misc/corectrl/corectrl-9999.ebuild index 93c9918ba..7e9fa9e0b 100644 --- a/app-misc/corectrl/corectrl-9999.ebuild +++ b/app-misc/corectrl/corectrl-9999.ebuild @@ -52,7 +52,9 @@ RDEPEND="${COMMON_DEPEND} CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG" src_prepare() { - ! tc-is-gcc && (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/9999-remove_libstdcxxfs_dependency.patch" + if [[ $(tc-get-cxx-stdlib) == "libc++" ]]; then + sed -i 's/stdc++fs//g' src/CMakeLists.txt src/helper/CMakeLists.txt || die + fi cmake_src_prepare } diff --git a/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch b/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch deleted file mode 100644 index ec620497e..000000000 --- a/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 789f15e..69504df 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -373,7 +373,6 @@ target_compile_definitions(corectrl_lib PRIVATE ${APP_COMPILE_DEFINITIONS}) - target_link_libraries(corectrl_lib PRIVATE - Qt5::Core - QuaZip::QuaZip -- stdc++fs - pthread - spdlog::spdlog - pugixml::pugixml -diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt -index c262086..2c5ffd8 100644 ---- a/src/helper/CMakeLists.txt -+++ b/src/helper/CMakeLists.txt -@@ -101,7 +101,6 @@ target_compile_definitions(corectrl_helper PRIVATE ${HELPER_COMPILE_DEFINITIONS} - target_link_libraries(corectrl_helper PRIVATE - Qt5::Core - Qt5::DBus -- stdc++fs - pthread - spdlog::spdlog - ${Botan_LIBRARIES} diff --git a/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch b/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch deleted file mode 100644 index fa9f7f5ca..000000000 --- a/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 361b4aa..1f61281 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -375,7 +375,6 @@ target_compile_definitions(corectrl_lib PRIVATE ${APP_COMPILE_DEFINITIONS}) - target_link_libraries(corectrl_lib PRIVATE - Qt6::Core - QuaZip::QuaZip -- stdc++fs - pthread - spdlog::spdlog - pugixml::pugixml -diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt -index 38deb12..b8ed17e 100644 ---- a/src/helper/CMakeLists.txt -+++ b/src/helper/CMakeLists.txt -@@ -106,7 +106,6 @@ target_compile_definitions(corectrl_helper PRIVATE ${HELPER_COMPILE_DEFINITIONS} - target_link_libraries(corectrl_helper PRIVATE - Qt6::Core - Qt6::DBus -- stdc++fs - pthread - spdlog::spdlog - ${Botan_LIBRARIES}