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 E30C81582EF for ; Sun, 09 Feb 2025 22:40:44 +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 C7CB6343145 for ; Sun, 09 Feb 2025 22:40:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 30BDB110473; Sun, 09 Feb 2025 22:40:38 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 273DD110473 for ; Sun, 09 Feb 2025 22:40:38 +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 D160034310F for ; Sun, 09 Feb 2025 22:40:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05FAA2764 for ; Sun, 09 Feb 2025 22:40:36 +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: <1739140743.0017cf3ecbaae17dba4014bf84ecb7b2a8f67e97.w.iron.zombie@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/corectrl/, app-misc/corectrl/files/ 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/files/ app-misc/corectrl/ X-VCS-Committer: w.iron.zombie X-VCS-Committer-Name: Quinet Charlie X-VCS-Revision: 0017cf3ecbaae17dba4014bf84ecb7b2a8f67e97 X-VCS-Branch: dev Date: Sun, 09 Feb 2025 22:40:36 +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: 59a791c1-9589-4a59-b2f1-e09bff2820d8 X-Archives-Hash: 5acfc31418a6d6556f2ce95afd340ecf commit: 0017cf3ecbaae17dba4014bf84ecb7b2a8f67e97 Author: Charlie Quinet gmail com> AuthorDate: Sun Feb 9 22:00:02 2025 +0000 Commit: Quinet Charlie gmail com> CommitDate: Sun Feb 9 22:39:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0017cf3e app-misc/corectrl: add a patch to fix building with libc++ Signed-off-by: Charlie Quinet gmail.com> app-misc/corectrl/corectrl-1.4.3.ebuild | 5 +++++ app-misc/corectrl/corectrl-9999.ebuild | 5 +++++ .../1.4.3-remove_libstdcxxfs_dependency.patch | 24 ++++++++++++++++++++++ .../files/9999-remove_libstdcxxfs_dependency.patch | 24 ++++++++++++++++++++++ 4 files changed, 58 insertions(+) diff --git a/app-misc/corectrl/corectrl-1.4.3.ebuild b/app-misc/corectrl/corectrl-1.4.3.ebuild index 576999192..db01a0cc1 100644 --- a/app-misc/corectrl/corectrl-1.4.3.ebuild +++ b/app-misc/corectrl/corectrl-1.4.3.ebuild @@ -54,6 +54,11 @@ RDEPEND="${COMMON_DEPEND} " CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG" +src_prepare() { + (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/1.4.3-remove_libstdcxxfs_dependency.patch" + cmake_src_prepare +} + pkg_setup() { linux-info_pkg_setup } diff --git a/app-misc/corectrl/corectrl-9999.ebuild b/app-misc/corectrl/corectrl-9999.ebuild index 576999192..799113c56 100644 --- a/app-misc/corectrl/corectrl-9999.ebuild +++ b/app-misc/corectrl/corectrl-9999.ebuild @@ -54,6 +54,11 @@ RDEPEND="${COMMON_DEPEND} " CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG" +src_prepare() { + (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/9999-remove_libstdcxxfs_dependency.patch" + cmake_src_prepare +} + pkg_setup() { linux-info_pkg_setup } 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 new file mode 100644 index 000000000..ec620497e --- /dev/null +++ b/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch @@ -0,0 +1,24 @@ +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 new file mode 100644 index 000000000..fa9f7f5ca --- /dev/null +++ b/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch @@ -0,0 +1,24 @@ +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}