From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- app-misc/rbutil/Manifest | 5 +- .../files/rbutil-1.4.1-fix-versionstring.patch | 11 +++ app-misc/rbutil/files/rbutil-1.4.1-quazip.patch | 63 ---------------- app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch | 84 ++++++++++++++++++++++ app-misc/rbutil/rbutil-1.4.1-r1.ebuild | 71 ------------------ app-misc/rbutil/rbutil-1.4.1-r2.ebuild | 80 +++++++++++++++++++++ 6 files changed, 178 insertions(+), 136 deletions(-) create mode 100644 app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch delete mode 100644 app-misc/rbutil/files/rbutil-1.4.1-quazip.patch create mode 100644 app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch delete mode 100644 app-misc/rbutil/rbutil-1.4.1-r1.ebuild create 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 02f9f1ba1639..f483c10d2354 100644 --- a/app-misc/rbutil/Manifest +++ b/app-misc/rbutil/Manifest @@ -1,5 +1,6 @@ AUX 0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch 765 BLAKE2B f71598d503d5c9981b2955aa1eadf374d7bf00cc1af7b6733aee8009ff7bb20455a6539a7614ec742b4067e6a9337f1dfe713bfc19fb8344af6a43422867a148 SHA512 e9661c5365d2c71fe9f016d936b3d4c844c91cbc9649f877eee385ad894ff03bd3a8e90ecc504aaf1f21c7d339348f22b59a45859fe9b1527113ad7eb39dfd9e -AUX rbutil-1.4.1-quazip.patch 1829 BLAKE2B 616af9d3d90384c70f717c363dfea2f4a7a3b9ad75438612a92e12997d2239d10860acc17fb8f2885ef6863764257c2756e03d9d2650e1af90e8f097607a3906 SHA512 6e30cfccb30d9f0dd677abd55fd2d53dc2cf8c06aadd8f278d119d1fca5c5a78e2adb84bf32feac37f6d82ba00e090b3693ef4d28c0f3234b8445368f4bd0cb0 +AUX rbutil-1.4.1-fix-versionstring.patch 402 BLAKE2B afe3c79869c926ff04d7630104c0b177974beb9103d729e5deb2e91f183e7ec859811beaf1141084ed9371f9541ec6b3a6e59fbad4dfab5069ab3ab19bc39d87 SHA512 9a627aa68fdd639a33dfcbbe81f86e1a757fc040cef223eb3c0ea1feed2574140cb6c6645c9fe200adc9c8dcf4026e32d792572d3011ad8c1bbf37b9c445033d +AUX rbutil-1.4.1-quazip1.patch 2376 BLAKE2B 5bf56d8ca9d91e321f3a61b80e64b80a3e227e7cfc46c96d1a6b5b2dbf94f63a3c545f1394df76dcf2562cfdb45d4e19dfdf17896553146c214fbb80a2eb4c0d SHA512 b2b58a21e13af102bddf1be14e506310f9c1f8e03cbf8793440492080ee7868b8e9d664177c6309dd3dd99da1c3898f4edad8fadb484d69590cc6d0bb689742a DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2 -EBUILD rbutil-1.4.1-r1.ebuild 1475 BLAKE2B aeb6e184759a04c0dea644e140589686125341320d9cb1af0ea539e2d8a8ff3341929e8f83a7c18a3ba6c42426430a3edc343e52cb785559580daca830ddf31a SHA512 cce769fa3152092f1daf2aa260eb609db663275e042b71b96192505b7cce67282efb8ea8f1b67aa3f890e24533921c0fb7840046f28c3789d317a753cc30bc78 +EBUILD rbutil-1.4.1-r2.ebuild 1676 BLAKE2B b7c7a662ce282f9cc8f96a93f3a86e318f035889eb6e15c7c33533a8a0b3b084b2becaaa08ed4353392d653a4296aab1428102e3d6c4f455ebd3e844b716f462 SHA512 071dd21234e5880be514247aea42a35d20d7533cf4ccf379ed0f327c775583b8704734db25f5bacf493b205fcd5b6ea5df92f446ca31648779a2ba1d6004d567 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc 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 new file mode 100644 index 000000000000..f8a1fade7f0e --- /dev/null +++ b/app-misc/rbutil/files/rbutil-1.4.1-fix-versionstring.patch @@ -0,0 +1,11 @@ +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-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch deleted file mode 100644 index 2feabb771367..000000000000 --- 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 -+#include -+#include - - - 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 - #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/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/files/rbutil-1.4.1-quazip1.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch new file mode 100644 index 000000000000..aa28cc9ea271 --- /dev/null +++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip1.patch @@ -0,0 +1,84 @@ +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-r1.ebuild b/app-misc/rbutil/rbutil-1.4.1-r1.ebuild deleted file mode 100644 index fbb297fc7fb5..000000000000 --- 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 -} diff --git a/app-misc/rbutil/rbutil-1.4.1-r2.ebuild b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild new file mode 100644 index 000000000000..ebfb53deeda9 --- /dev/null +++ b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild @@ -0,0 +1,80 @@ +# 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 "