From f5cee9c4733c924f016365bc6c5979e4fca275ef Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 8 Jul 2022 11:43:43 +0100 Subject: app-misc/rbutil: Drop old 1.4.1-r2 Signed-off-by: James Le Cuirot --- app-misc/rbutil/Manifest | 1 - ...tools-sbtools-fix-compilation-with-gcc-10.patch | 27 ------- .../files/rbutil-1.4.1-fix-versionstring.patch | 11 --- app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch | 84 ---------------------- app-misc/rbutil/rbutil-1.4.1-r2.ebuild | 80 --------------------- 5 files changed, 203 deletions(-) delete mode 100644 app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch delete mode 100644 app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch delete mode 100644 app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch delete mode 100644 app-misc/rbutil/rbutil-1.4.1-r2.ebuild (limited to 'app-misc/rbutil') diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest index fc45cb3b8345..adbfba10a388 100644 --- a/app-misc/rbutil/Manifest +++ b/app-misc/rbutil/Manifest @@ -1,2 +1 @@ -DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2 DIST RockboxUtility-v1.5.1-src.tar.bz2 1495776 BLAKE2B 0a5009cfbe610a46a98d72d184cb49852ba6ffbee7a826bc4d69a7dd06f982695c6964586c48cf58b2f12ee5f650ec2ee0c650336ea987b2c8d62b459f2333cb SHA512 623cdc7bba3028264448f072be1e9a754afe544cda1193bec051dd390acadea213cda8f00e25bc3a0254a282f8f6b2ba34e67c2ac0d086c0a74d52df1fd733fb 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 -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 -Date: Sat, 20 Feb 2021 18:11:09 +0100 -Subject: [PATCH] Use upstream quazip1-qt5 pkgconfig - -Based on patch by James Le Cuirot -http://gerrit.rockbox.org/1825 - -Signed-off-by: Andreas Sturmlechner ---- - 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 - #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/rbutil-1.4.1-r2.ebuild b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild deleted file mode 100644 index ebfb53deeda9..000000000000 --- a/app-misc/rbutil/rbutil-1.4.1-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils xdg - -DESCRIPTION="Rockbox open source firmware manager for music players" -HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility" -SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="debug" - -RDEPEND=" - dev-libs/crypto++:= - dev-libs/quazip:0= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-libs/speex - media-libs/speexdsp - virtual/libusb:1 -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/RockboxUtility-v${PV}" -QTDIR="${PN}/${PN}qt" - -PATCHES=( - "${FILESDIR}"/${P}-quazip1.patch - "${FILESDIR}"/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch - "${FILESDIR}"/${P}-fix-versionstring.patch # bug 734178 -) - -src_prepare() { - xdg_src_prepare - - if has_version "