wyj/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2025-04-10 12:08:43 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

app-misc/corectrl: replace patches with a simple sed

Browse Source 
Signed-off-by: Charlie Quinet <w.iron.zombie@gmail.com>
This commit is contained in:
Charlie Quinet 2025-02-14 16:07:26 +01:00
parent dd91a08977
commit d0baf21da9
No known key found for this signature in database
GPG Key ID: F3A1878B14F5F0D7
4 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app-misc/corectrl/corectrl-1.4.3.ebuild
View File

@ -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
}

4
app-misc/corectrl/corectrl-9999.ebuild
View File

@ -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
}

24
app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch
View File

@ -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}

24
app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch
View File

@ -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}