diff options
Diffstat (limited to 'net-im/openmittsu/files')
-rw-r--r-- | net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch | 25 | ||||
-rw-r--r-- | net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch | 11 |
2 files changed, 25 insertions, 11 deletions
diff --git a/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch new file mode 100644 index 000000000000..7935ff5530d4 --- /dev/null +++ b/net-im/openmittsu/files/openmittsu-0.10.0.0-musl.patch @@ -0,0 +1,25 @@ +Fix compilation with MUSL libc +https://bugs.gentoo.org/907754 + +Patch backported from spdlog repository: +https://github.com/gabime/spdlog/commit/287a00d364990edbb621fe5e392aeb550135fb96 + +commit 287a00d364990edbb621fe5e392aeb550135fb96 +Author: Khem Raj <raj.khem@gmail.com> +Date: Tue Jan 3 09:54:50 2023 -0800 + + Do not use LFS64 functions on linux/musl (#2589) + +--- openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h ++++ openmittsu-0.10.0.0/3rdparty/spdlog/include/spdlog/details/os-inl.h +@@ -230,8 +230,8 @@ + #else + int fd = ::fileno(f); + #endif +-// 64 bits(but not in osx or cygwin, where fstat64 is deprecated) +-#if (defined(__linux__) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) ++// 64 bits(but not in osx, linux/musl or cygwin, where fstat64 is deprecated) ++#if ((defined(__linux__) && defined(__GLIBC__)) || defined(__sun) || defined(_AIX)) && (defined(__LP64__) || defined(_LP64)) + struct stat64 st; + if (::fstat64(fd, &st) == 0) + { diff --git a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch b/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch deleted file mode 100644 index c89d24536ae9..000000000000 --- a/net-im/openmittsu/files/openmittsu-0.9.13.32-fix-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openmittsu-0.9.13.32-orig/CMakeLists.txt -+++ openmittsu-0.9.13.32/CMakeLists.txt -@@ -570,7 +570,7 @@ - target_link_libraries(openMittsu openMittsuCore Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql) - target_link_libraries(openMittsuVersionInfo Qt5::Core) - if (OPENMITTSU_ENABLE_TESTS) -- target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest) -+ target_link_libraries(openMittsuTests openMittsuCore Qt5::Core Qt5::Network Qt5::Multimedia Qt5::MultimediaWidgets Qt5::Sql gmock gtest pthread) - endif (OPENMITTSU_ENABLE_TESTS) - - # Link against libc++abi if requested. |