diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2019-12-04 22:54:20 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2019-12-04 22:54:20 +0000 |
| commit | 73b0e23be79843ae37e3f1e6b0845ea85f94327a (patch) | |
| tree | 702b8cfb2763563a326c28389c5b6ee59825e9c1 /app-misc/rbutil/files | |
| parent | sys-auth/elogind-241.4: ia64 stable, bug 685748 (diff) | |
| download | gentoo-73b0e23be79843ae37e3f1e6b0845ea85f94327a.tar.gz gentoo-73b0e23be79843ae37e3f1e6b0845ea85f94327a.tar.bz2 gentoo-73b0e23be79843ae37e3f1e6b0845ea85f94327a.zip | |
app-misc/rbutil: Bump to 1.4.1, EAPI 7
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'app-misc/rbutil/files')
| -rw-r--r-- | app-misc/rbutil/files/rbutil-1.4.1-quazip.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch new file mode 100644 index 000000000000..596127c34060 --- /dev/null +++ b/app-misc/rbutil/files/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) |