diff options
Diffstat (limited to 'app-misc/rbutil/files')
6 files changed, 199 insertions, 122 deletions
diff --git a/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch deleted file mode 100644 index 3ff18f2afcf1..000000000000 --- a/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 141c9c218c31dfd6f4f9e47f25cc2764d2bb4b63 Mon Sep 17 00:00:00 2001 -From: Martin Hauke <mardnh@gmx.de> -Date: Sat, 13 Jun 2020 19:11:15 +0200 -Subject: [PATCH] imxtools/sbtools: fix compilation with gcc 10 - ---- - utils/imxtools/sbtools/misc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/utils/imxtools/sbtools/misc.h b/utils/imxtools/sbtools/misc.h -index f803fbb..5c6b2fc 100644 ---- a/utils/imxtools/sbtools/misc.h -+++ b/utils/imxtools/sbtools/misc.h -@@ -40,8 +40,8 @@ extern bool g_debug; - extern bool g_force; - - typedef struct crypto_key_t *key_array_t; --int g_nr_keys; --key_array_t g_key_array; -+extern int g_nr_keys; -+extern key_array_t g_key_array; - - typedef void (*misc_printf_t)(void *user, const char *fmt, ...); - --- -2.26.2 - diff --git a/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch b/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch deleted file mode 100644 index f8a1fade7f0e..000000000000 --- a/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/rbutil/rbutilqt/version.h b/rbutil/rbutilqt/version.h -index f0877ba..044c7c7 100644 ---- a/rbutil/rbutilqt/version.h -+++ b/rbutil/rbutilqt/version.h -@@ -40,5 +40,5 @@ - // PUREVERSION should identify the build uniquely. Use version string for now. - #define PUREVERSION "v1.4.1" - --#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__ -+#define FULLVERSION VERSION - diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch deleted file mode 100644 index aa28cc9ea271..000000000000 --- a/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f9e3ba5d8be99dc78eeb7b21d16afe2955e0a9f8 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sat, 20 Feb 2021 18:11:09 +0100 -Subject: [PATCH] Use upstream quazip1-qt5 pkgconfig - -Based on patch by James Le Cuirot <chewi@gentoo.org> -http://gerrit.rockbox.org/1825 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - rbutil/rbutilqt/base/ziputil.cpp | 6 +++--- - rbutil/rbutilqt/base/ziputil.h | 6 +++--- - rbutil/rbutilqt/rbutilqt.pro | 9 +++------ - 3 files changed, 9 insertions(+), 12 deletions(-) - -diff --git a/rbutil/rbutilqt/base/ziputil.cpp b/rbutil/rbutilqt/base/ziputil.cpp -index b6cfddd..9fa6632 100644 ---- a/rbutil/rbutilqt/base/ziputil.cpp -+++ b/rbutil/rbutilqt/base/ziputil.cpp -@@ -22,9 +22,9 @@ - #include "progressloggerinterface.h" - #include "Logger.h" - --#include "quazip/quazip.h" --#include "quazip/quazipfile.h" --#include "quazip/quazipfileinfo.h" -+#include "quazip.h" -+#include "quazipfile.h" -+#include "quazipfileinfo.h" - - - ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) -diff --git a/rbutil/rbutilqt/base/ziputil.h b/rbutil/rbutilqt/base/ziputil.h -index 25c3dce..7a6e08a 100644 ---- a/rbutil/rbutilqt/base/ziputil.h -+++ b/rbutil/rbutilqt/base/ziputil.h -@@ -21,9 +21,9 @@ - - #include <QtCore> - #include "archiveutil.h" --#include "quazip/quazip.h" --#include "quazip/quazipfile.h" --#include "quazip/quazipfileinfo.h" -+#include "quazip.h" -+#include "quazipfile.h" -+#include "quazipfileinfo.h" - - class ZipUtil : public ArchiveUtil - { -diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro -index d5caa77..40a62ff 100644 ---- a/rbutil/rbutilqt/rbutilqt.pro -+++ b/rbutil/rbutilqt/rbutilqt.pro -@@ -140,11 +140,6 @@ for(rblib, RBLIBS) { - # We need libcrypto++ - LIBS += -lcryptopp - --# on win32 libz is linked implicitly. --!win32 { -- LIBS += -lz --} -- - # Add a (possibly found) libspeex now, don't do this before -lrbspeex! - !static:!isEmpty(LIBSPEEX) { - LIBS += $$LIBSPEEX -@@ -205,6 +200,9 @@ unix:!static:libusb0:!macx { - LIBS += -lusb - } - -+CONFIG += link_pkgconfig -+PKGCONFIG += quazip1-qt5 -+ - unix:!macx:static { - # force statically linking of libusb. Libraries that are appended - # later will get linked dynamically again. -@@ -271,5 +269,4 @@ unix { - - # source files are separate. - include(rbutilqt.pri) --include(quazip/quazip.pri) - include(logger/logger.pri) --- -2.30.1 - diff --git a/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch b/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch new file mode 100644 index 000000000000..276dba7e61d9 --- /dev/null +++ b/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch @@ -0,0 +1,32 @@ +diff -Naur a/utils/CMakeLists.txt b/utils/CMakeLists.txt +--- a/utils/CMakeLists.txt 2022-04-18 20:05:44.073208000 +0100 ++++ b/utils/CMakeLists.txt 2022-07-07 16:19:17.378055916 +0100 +@@ -358,22 +358,6 @@ + ) + target_include_directories(rbtomcrypt PUBLIC ${CMAKE_CURRENT_LIST_DIR}/tomcrypt/src/headers) + +-add_library(skin_parser +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_buffer.c +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_buffer.h +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_debug.c +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_debug.h +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_parser.c +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_parser.h +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_scan.c +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_scan.h +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/symbols.h +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/tag_table.c +- ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/tag_table.h +- ) +-target_include_directories(skin_parser PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser) +-target_compile_definitions(skin_parser PUBLIC __PCTOOL__) +- + # target will always be build. File is only updated when contents change. + add_custom_target(gitversion.h + COMMENT "Updating gitversion.h" +@@ -391,5 +375,3 @@ + include(${CMAKE_CURRENT_LIST_DIR}/cmake/deploy.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/cmake/QtTest.cmake) + add_subdirectory(rbutilqt) +-add_subdirectory(themeeditor) +- diff --git a/app-misc/rbutil/files/rbutil-1.5.1-headers.patch b/app-misc/rbutil/files/rbutil-1.5.1-headers.patch new file mode 100644 index 000000000000..ff7ac8760ff7 --- /dev/null +++ b/app-misc/rbutil/files/rbutil-1.5.1-headers.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/830559 +https://www.rockbox.org/tracker/task/13358 + +Note: This may need tweaking for non-Linux platforms. + +diff --git a/utils/sansapatcher/sansaio.h b/utils/sansapatcher/sansaio.h +index 61e2f1d1b2..327f8fbd18 100644 +--- a/utils/sansapatcher/sansaio.h ++++ b/utils/sansapatcher/sansaio.h +@@ -23,6 +23,7 @@ + #define __SANSAIO_H + + #include <stdint.h> ++#include <sys/types.h> + #if !defined(_MSC_VER) + #include <unistd.h> /* not available on MSVC */ + #endif diff --git a/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch b/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch new file mode 100644 index 000000000000..84b9655c0c0e --- /dev/null +++ b/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch @@ -0,0 +1,150 @@ +From 930293a899825ae552370a060dd04117ebc5fdae Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Thu, 7 Jul 2022 21:52:54 +0100 +Subject: [PATCH] rbutil: Add USE_SYSTEM_QUAZIP option to use system-wide + QuaZIP + +QuaZIP is included in several major Linux distributions and packaging +policies strongly oppose bundling of libraries. + +Change-Id: I8d454784dc4b244f4dd8aa18deb3350a29aaab77 +--- + docs/CREDITS | 1 + + utils/rbutilqt/CMakeLists.txt | 65 ++++++++++++++++++--------------- + utils/rbutilqt/base/ziputil.cpp | 6 +-- + utils/rbutilqt/base/ziputil.h | 6 +-- + 4 files changed, 43 insertions(+), 35 deletions(-) + +diff --git a/docs/CREDITS b/docs/CREDITS +index 6f7c23fc7e..3a6fcb83b9 100644 +--- a/docs/CREDITS ++++ b/docs/CREDITS +@@ -710,6 +710,7 @@ Marc Aarts + Fabrice Bellard + Selami Dinçer + Matej Golian ++James Le Cuirot + + The libmad team + The wavpack team +diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt +index 41954cb9ee..350790109b 100644 +--- a/utils/rbutilqt/CMakeLists.txt ++++ b/utils/rbutilqt/CMakeLists.txt +@@ -255,9 +255,43 @@ if(APPLE) + ${CMAKE_CURRENT_LIST_DIR}/base/ttscarbon.h) + endif() + ++option(USE_SYSTEM_QUAZIP "Use system QuaZIP library" OFF) ++if(USE_SYSTEM_QUAZIP) ++ find_package(QuaZip-Qt5 REQUIRED) ++ set(QUAZIP_LIBRARY QuaZip::QuaZip) ++else() ++ # TODO: Upstream has cmake support, use that instead. ++ add_library(quazip ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/ioapi.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/minizip_crypt.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/qioapi.cpp ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.cpp ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.cpp ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.cpp ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip_global.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.cpp ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.c ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.h ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.c ++ ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.h ++ ) ++ target_include_directories(quazip PUBLIC ${CMAKE_CURRENT_LIST_DIR}/quazip) ++ target_link_libraries(quazip z Qt${QT_VERSION_MAJOR}::Core) ++ if(QT_VERSION_MAJOR EQUAL 6) ++ target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat) ++ endif() ++ target_compile_definitions(quazip PUBLIC QUAZIP_STATIC) ++ set_property(TARGET quazip PROPERTY AUTOMOC ON) ++ set(QUAZIP_LIBRARY quazip) ++endif() ++ + target_link_libraries(rbbase +- cutelogger quazip mspack bspatch rbspeex voicefont +- sansapatcher ipodpatcher chinachippatcher ++ cutelogger ${QUAZIP_LIBRARY} mspack bspatch rbspeex ++ voicefont sansapatcher ipodpatcher chinachippatcher + mkamsboot mkimxboot mkmpioboot mktccboot mks5lboot + Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network) + target_include_directories(rbbase PUBLIC ${CMAKE_CURRENT_LIST_DIR}/base) +@@ -298,33 +332,6 @@ target_link_libraries(cutelogger PUBLIC Qt${QT_VERSION_MAJOR}::Core) + target_compile_definitions(cutelogger PUBLIC CUTELOGGER_STATIC) + set_property(TARGET cutelogger PROPERTY AUTOMOC ON) + +-# TODO: Upstream has cmake support, use that instead. +-add_library(quazip +- ${CMAKE_CURRENT_LIST_DIR}/quazip/ioapi.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/minizip_crypt.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/qioapi.cpp +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.cpp +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.cpp +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.cpp +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip_global.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.cpp +- ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.c +- ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.h +- ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.c +- ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.h +- ) +-target_include_directories(quazip PUBLIC ${CMAKE_CURRENT_LIST_DIR}/quazip) +-target_link_libraries(quazip z Qt${QT_VERSION_MAJOR}::Core) +-if(QT_VERSION_MAJOR EQUAL 6) +- target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat) +-endif() +-target_compile_definitions(quazip PUBLIC QUAZIP_STATIC) +-set_property(TARGET quazip PROPERTY AUTOMOC ON) +- + add_library(mspack + #mspack/cabc.c + mspack/cabd.c +diff --git a/utils/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp +index e285446711..877a861253 100644 +--- a/utils/rbutilqt/base/ziputil.cpp ++++ b/utils/rbutilqt/base/ziputil.cpp +@@ -22,9 +22,9 @@ + #include "progressloglevels.h" + #include "Logger.h" + +-#include "quazip/quazip.h" +-#include "quazip/quazipfile.h" +-#include "quazip/quazipfileinfo.h" ++#include <quazip.h> ++#include <quazipfile.h> ++#include <quazipfileinfo.h> + + + ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) +diff --git a/utils/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h +index 73a87a820a..ea32ca42c3 100644 +--- a/utils/rbutilqt/base/ziputil.h ++++ b/utils/rbutilqt/base/ziputil.h +@@ -21,9 +21,9 @@ + + #include <QtCore> + #include "archiveutil.h" +-#include "quazip/quazip.h" +-#include "quazip/quazipfile.h" +-#include "quazip/quazipfileinfo.h" ++#include <quazip.h> ++#include <quazipfile.h> ++#include <quazipfileinfo.h> + + class ZipUtil : public ArchiveUtil + { +-- +2.35.1 + |