summaryrefslogtreecommitdiff
path: root/misc/rbutil/patches
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2020-02-29 07:43:29 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-02-29 07:43:29 +0700
commitdd3221e405ea98ed393ac56152b6a7d8bb09c2b1 (patch)
tree1bdbb91cfd8c4cba4180f56e45bf21700dfa4250 /misc/rbutil/patches
parent38df6c96b89cc278ce8d08f223f87d98572a779f (diff)
downloadslackbuilds-dd3221e405ea98ed393ac56152b6a7d8bb09c2b1.tar.gz
misc/rbutil: Added (Rockbox Utility).
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'misc/rbutil/patches')
-rw-r--r--misc/rbutil/patches/rbutil-1.4.1-quazip.patch63
1 files changed, 63 insertions, 0 deletions
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 0000000000..596127c340
--- /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 <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+
+
+ 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 <QtCore>
+ #include "archiveutil.h"
+-#include "quazip/quazip.h"
+-#include "quazip/quazipfile.h"
+-#include "quazip/quazipfileinfo.h"
++#include <quazip5/quazip.h>
++#include <quazip5/quazipfile.h>
++#include <quazip5/quazipfileinfo.h>
+
+ 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)