From dd3221e405ea98ed393ac56152b6a7d8bb09c2b1 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sat, 29 Feb 2020 07:43:29 +0700 Subject: misc/rbutil: Added (Rockbox Utility). Signed-off-by: Willy Sudiarto Raharjo --- misc/rbutil/patches/rbutil-1.4.1-quazip.patch | 63 +++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 misc/rbutil/patches/rbutil-1.4.1-quazip.patch (limited to 'misc/rbutil/patches') diff --git a/misc/rbutil/patches/rbutil-1.4.1-quazip.patch b/misc/rbutil/patches/rbutil-1.4.1-quazip.patch new file mode 100644 index 000000000000..596127c34060 --- /dev/null +++ b/misc/rbutil/patches/rbutil-1.4.1-quazip.patch @@ -0,0 +1,63 @@ +This patch is a simplified version of a patch I have sent upstream. +http://gerrit.rockbox.org/1825 + +-- Chewi + +diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp +--- a/base/ziputil.cpp 2019-11-10 06:45:49.000000000 +0000 ++++ b/base/ziputil.cpp 2019-12-04 22:38:34.443112450 +0000 +@@ -22,9 +22,9 @@ + #include "progressloggerinterface.h" + #include "Logger.h" + +-#include "quazip/quazip.h" +-#include "quazip/quazipfile.h" +-#include "quazip/quazipfileinfo.h" ++#include ++#include ++#include + + + ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) +diff -Naur a/base/ziputil.h b/base/ziputil.h +--- a/base/ziputil.h 2019-11-10 06:45:49.000000000 +0000 ++++ b/base/ziputil.h 2019-12-04 22:38:34.443112450 +0000 +@@ -21,9 +21,9 @@ + + #include + #include "archiveutil.h" +-#include "quazip/quazip.h" +-#include "quazip/quazipfile.h" +-#include "quazip/quazipfileinfo.h" ++#include ++#include ++#include + + class ZipUtil : public ArchiveUtil + { +diff -Naur a/rbutilqt.pro b/rbutilqt.pro +--- a/rbutilqt.pro 2019-11-10 06:45:50.000000000 +0000 ++++ b/rbutilqt.pro 2019-12-04 22:43:30.144259710 +0000 +@@ -131,7 +131,7 @@ + + DEPENDPATH = $$INCLUDEPATH + +-LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR ++LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5 + # append all RBLIBS to LIBS + for(rblib, RBLIBS) { + LIBS += -l$$rblib +@@ -142,7 +142,6 @@ + + # on win32 libz is linked implicitly. + !win32 { +- LIBS += -lz + } + + # Add a (possibly found) libspeex now, don't do this before -lrbspeex! +@@ -271,5 +270,4 @@ + + # source files are separate. + include(rbutilqt.pri) +-include(quazip/quazip.pri) + include(logger/logger.pri) -- cgit v1.2.3