commit: b1d1b10c4a6ef1ca177f8dc63a8c4c36c5171e86 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Feb 20 17:20:21 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 23 19:52:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d1b10c
app-misc/rbutil: Drop 1.4.1-r1 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-misc/rbutil/files/rbutil-1.4.1-quazip.patch | 63 ---------------------- app-misc/rbutil/rbutil-1.4.1-r1.ebuild | 71 ------------------------- 2 files changed, 134 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 deleted file mode 100644 index 2feabb77136..00000000000 --- a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch +++ /dev/null @@ -1,63 +0,0 @@ -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/rbutil/rbutilqt/base/ziputil.cpp 2019-11-10 06:45:49.000000000 +0000 -+++ b/rbutil/rbutilqt/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/rbutil/rbutilqt/base/ziputil.h 2019-11-10 06:45:49.000000000 +0000 -+++ b/rbutil/rbutilqt/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/rbutil/rbutilqt/rbutilqt.pro 2019-11-10 06:45:50.000000000 +0000 -+++ b/rbutil/rbutilqt/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) diff --git a/app-misc/rbutil/rbutil-1.4.1-r1.ebuild b/app-misc/rbutil/rbutil-1.4.1-r1.ebuild deleted file mode 100644 index fbb297fc7fb..00000000000 --- a/app-misc/rbutil/rbutil-1.4.1-r1.ebuild +++ /dev/null @@ -1,71 +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" - -S="${WORKDIR}/RockboxUtility-v${PV}" -QTDIR="${PN}/${PN}qt" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.1-quazip.patch - "${FILESDIR}"/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch -) - -src_prepare() { - xdg_src_prepare - rm -rv "${QTDIR}"/{quazip,zlib}/ || die -} - -src_configure() { - cd "${QTDIR}" || die - - # Generate binary translations. - "$(qt5_get_bindir)"/lrelease ${PN}qt.pro || die - - # noccache is required to call the correct compiler. - eqmake5 CONFIG+="noccache $(use debug && echo dbg)" -} - -src_compile() { - emake -C "${QTDIR}" -} - -src_install() { - cd "${QTDIR}" || die - - local icon size - for icon in icons/rockbox-*.png; do - size=${icon##*-} - size=${size%%.*} - newicon -s "${size}" "${icon}" rockbox.png - done - - dobin RockboxUtility - make_desktop_entry RockboxUtility "Rockbox Utility" rockbox - dodoc changelog.txt -}
