From 0307a79fc3b99317d03e65a2e18af83e92b09c7e Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Mon, 1 Jun 2020 19:31:38 +0200 Subject: [PATCH 1/2] p7zip: Fix building with gcc 10 --- .../patches/p7zip-0500-gcc10-build-fix.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/compress/p7zip/patches/p7zip-0500-gcc10-build-fix.patch diff --git a/packages/compress/p7zip/patches/p7zip-0500-gcc10-build-fix.patch b/packages/compress/p7zip/patches/p7zip-0500-gcc10-build-fix.patch new file mode 100644 index 0000000000..45f9f84af4 --- /dev/null +++ b/packages/compress/p7zip/patches/p7zip-0500-gcc10-build-fix.patch @@ -0,0 +1,26 @@ +diff -Nrup a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp +--- a/CPP/Windows/ErrorMsg.cpp 2015-01-18 11:20:28.000000000 -0700 ++++ b/CPP/Windows/ErrorMsg.cpp 2019-09-24 13:01:18.887289152 -0600 +@@ -14,14 +14,14 @@ UString MyFormatMessage(DWORD errorCode) + AString msg; + + switch(errorCode) { +- case ERROR_NO_MORE_FILES : txt = "No more files"; break ; +- case E_NOTIMPL : txt = "E_NOTIMPL"; break ; +- case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ; +- case E_ABORT : txt = "E_ABORT"; break ; +- case E_FAIL : txt = "E_FAIL"; break ; +- case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ; +- case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ; +- case E_INVALIDARG : txt = "E_INVALIDARG"; break ; ++ case unsigned (ERROR_NO_MORE_FILES) : txt = "No more files"; break ; ++ case unsigned (E_NOTIMPL) : txt = "E_NOTIMPL"; break ; ++ case unsigned (E_NOINTERFACE) : txt = "E_NOINTERFACE"; break ; ++ case unsigned (E_ABORT) : txt = "E_ABORT"; break ; ++ case unsigned (E_FAIL) : txt = "E_FAIL"; break ; ++ case unsigned (STG_E_INVALIDFUNCTION) : txt = "STG_E_INVALIDFUNCTION"; break ; ++ case unsigned (E_OUTOFMEMORY) : txt = "E_OUTOFMEMORY"; break ; ++ case unsigned (E_INVALIDARG) : txt = "E_INVALIDARG"; break ; + case ERROR_DIRECTORY : txt = "Error Directory"; break ; + default: + txt = strerror(errorCode); From 0e25e3ffedf27d0c86fec9b85e680c49945989b4 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Mon, 1 Jun 2020 19:32:07 +0200 Subject: [PATCH 2/2] squashfs-tools: Fix building with gcc 10 --- .../patches/squashfs-tools-4.4-fno-common.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch diff --git a/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch b/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch new file mode 100644 index 0000000000..dfbf42abb3 --- /dev/null +++ b/packages/sysutils/squashfs-tools/patches/squashfs-tools-4.4-fno-common.patch @@ -0,0 +1,11 @@ +--- a/squashfs-tools/mksquashfs.h ++++ b/squashfs-tools/mksquashfs.h +@@ -143,7 +143,7 @@ struct append_file { + #endif + + extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; +-struct cache *bwriter_buffer, *fwriter_buffer; ++extern struct cache *bwriter_buffer, *fwriter_buffer; + extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, + *to_frag, *locked_fragment, *to_process_frag; + extern struct append_file **file_mapping;