[gentoo-commits] repo/proj/guru:master commit in: app-misc/corectrl/, app-misc/corectrl/files/

[David Roman]

commit:     0017cf3ecbaae17dba4014bf84ecb7b2a8f67e97
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Sun Feb  9 22:00:02 2025 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> 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 <w.iron.zombie <AT> 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}