From de4c5f31a9c82be881f89480f49267949192cbb0 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 18 Dec 2019 22:14:16 +0100 Subject: [PATCH] gtkpod: fix musl builds --- srcpkgs/gtkpod/patches/musl.patch | 24 ++++++++++++++++++++++++ srcpkgs/gtkpod/template | 4 ---- 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gtkpod/patches/musl.patch diff --git a/srcpkgs/gtkpod/patches/musl.patch b/srcpkgs/gtkpod/patches/musl.patch new file mode 100644 index 0000000000..ce441743db --- /dev/null +++ b/srcpkgs/gtkpod/patches/musl.patch @@ -0,0 +1,24 @@ +This is an awful hack done by inspecting what musl does. + +--- libs/atomic-parsley/AtomicParsley.cpp ++++ libs/atomic-parsley/AtomicParsley.cpp +@@ -4935,7 +4935,8 @@ void APar_MergeTempFile(FILE* dest_file, FILE *src_file, uint32_t src_file_size, + { 0 }; + file_offset.__pos = dest_position + file_pos; + #else +- off_t file_offset = dest_position + file_pos; ++ fpos_t file_offset = {0}; ++ *((long long *)&file_offset) = dest_position + file_pos; + #endif + fsetpos(dest_file, &file_offset); + fwrite(buffer, (size_t) max_buffer, 1, dest_file); +@@ -4952,7 +4953,8 @@ void APar_MergeTempFile(FILE* dest_file, FILE *src_file, uint32_t src_file_size, + { 0 }; + file_offset.__pos = dest_position + file_pos; + #else +- off_t file_offset = dest_position + file_pos; ++ fpos_t file_offset = {0}; ++ *((long long *)&file_offset) = dest_position + file_pos; + #endif + fsetpos(dest_file, &file_offset); + fwrite(buffer, (size_t) (src_file_size - file_pos), 1, dest_file); diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template index e31b6daef6..b42ca10e99 100644 --- a/srcpkgs/gtkpod/template +++ b/srcpkgs/gtkpod/template @@ -14,7 +14,3 @@ license="GPL-2.0-or-later" homepage="http://www.gtkpod.org/libgpod" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76 - -case "$XBPS_TARGET_MACHINE" in - x86_64-musl) broken="cannot convert 'off_t*' to 'const fpos_t*'" ;; -esac