From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Mar 2018 16:53:27 +0000 Subject: gentoo resync : 09.03.2018 --- app-misc/rbutil/Manifest | 4 ++ app-misc/rbutil/files/quazip.patch | 88 +++++++++++++++++++++++++++++++++++++ app-misc/rbutil/metadata.xml | 8 ++++ app-misc/rbutil/rbutil-1.4.0.ebuild | 62 ++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) create mode 100644 app-misc/rbutil/Manifest create mode 100644 app-misc/rbutil/files/quazip.patch create mode 100644 app-misc/rbutil/metadata.xml create mode 100644 app-misc/rbutil/rbutil-1.4.0.ebuild (limited to 'app-misc/rbutil') diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest new file mode 100644 index 000000000000..2d3028feb209 --- /dev/null +++ b/app-misc/rbutil/Manifest @@ -0,0 +1,4 @@ +AUX quazip.patch 2401 BLAKE2B c011701e4f416289a5bfc681f2ce3184db091a744192e4b48ae9a42939e862739b030d88caff41a74c4b2ec5ad19e2e0bfa9c3ca0b9dc39f3413cbac41f06714 SHA512 34f2cb3d95ae3ed94adb25964f9009be8f5bab9a93df7ea993797065d297993d1f83a495eef9ee9c3339f8ba6f1e2b6778f8ecd667cf9538d84387373e7322dc +DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe +EBUILD rbutil-1.4.0.ebuild 1368 BLAKE2B ea42c5d6fb96eb01e93487f4e05a8747c9395cf033544a51b1b6f37474356af846aeed0b765c6ab0049b2cdf1230e90a10550a6d715545a2400c5f1bb1dbb759 SHA512 90867d25c0140517d1df46bd0fb78670a5a9e430bc935d91a0b475bce706c087749fe47f17ecac8a78807e60541ef4834943c2c4904e771406202568b105dda0 +MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/quazip.patch new file mode 100644 index 000000000000..9d803712209e --- /dev/null +++ b/app-misc/rbutil/files/quazip.patch @@ -0,0 +1,88 @@ +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 2014-01-05 22:44:53.000000000 +0000 ++++ b/base/ziputil.cpp 2018-02-25 10:55:36.994002648 +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/base/ziputil.h 2014-01-05 22:44:54.000000000 +0000 ++++ b/base/ziputil.h 2018-02-25 10:55:28.513838004 +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.pri b/rbutilqt.pri +--- a/rbutilqt.pri 2014-01-05 22:44:57.000000000 +0000 ++++ b/rbutilqt.pri 2018-02-25 10:54:39.793852035 +0000 +@@ -69,12 +69,6 @@ + base/rockboxinfo.cpp \ + ../../tools/mkboot.c \ + ../../tools/iriver.c \ +- quazip/quazip.cpp \ +- quazip/quazipfile.cpp \ +- quazip/quazipnewinfo.cpp \ +- quazip/unzip.c \ +- quazip/zip.c \ +- quazip/ioapi.c \ + base/ziputil.cpp \ + gui/comboboxviewdelegate.cpp \ + gui/selectiveinstallwidget.cpp \ +@@ -156,14 +150,6 @@ + base/rockboxinfo.h \ + ../../tools/mkboot.h \ + ../../tools/iriver.h \ +- quazip/crypt.h \ +- quazip/ioapi.h \ +- quazip/quazipfile.h \ +- quazip/quazipfileinfo.h \ +- quazip/quazip.h \ +- quazip/quazipnewinfo.h \ +- quazip/unzip.h \ +- quazip/zip.h \ + base/ziputil.h \ + lame/lame.h \ + gui/comboboxviewdelegate.h \ +diff -Naur a/rbutilqt.pro b/rbutilqt.pro +--- a/rbutilqt.pro 2014-01-05 22:45:00.000000000 +0000 ++++ b/rbutilqt.pro 2018-02-25 10:55:04.577357613 +0000 +@@ -114,7 +114,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 +@@ -122,7 +122,6 @@ + + # on win32 libz is linked implicitly. + !win32 { +- LIBS += -lz + } + + # Add a (possibly found) libspeex now, don't do this before -lrbspeex! diff --git a/app-misc/rbutil/metadata.xml b/app-misc/rbutil/metadata.xml new file mode 100644 index 000000000000..54be7ff7e5d6 --- /dev/null +++ b/app-misc/rbutil/metadata.xml @@ -0,0 +1,8 @@ + + + + + chewi@gentoo.org + James Le Cuirot + + diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.0.ebuild new file mode 100644 index 000000000000..0982dffdb4b5 --- /dev/null +++ b/app-misc/rbutil/rbutil-1.4.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit desktop gnome2-utils qmake-utils + +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/quazip + 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} + dev-qt/linguist-tools:5" + +S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt" + +PATCHES=( + "${FILESDIR}"/quazip.patch +) + +src_prepare() { + default + rm -rv quazip/ zlib/ || die +} + +src_configure() { + # Generate binary translations. + lrelease ${PN}qt.pro || die + + # noccache is required to call the correct compiler. + eqmake5 CONFIG+="noccache $(use debug && echo dbg)" +} + +src_install() { + 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 +} + +pkg_preinst() { gnome2_icon_savelist; } +pkg_postinst() { gnome2_icon_cache_update; } +pkg_postrm() { gnome2_icon_cache_update; } -- cgit v1.2.3