1 |
commit: 9391f29090a6db15cc5ce41a3cf5003af9d8d5df |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 2 21:11:49 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 2 21:12:26 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9391f290 |
7 |
|
8 |
app-misc/rbutil: New package |
9 |
|
10 |
Closes: https://bugs.gentoo.org/411619 |
11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
12 |
|
13 |
app-misc/rbutil/Manifest | 1 + |
14 |
app-misc/rbutil/files/quazip.patch | 88 +++++++++++++++++++++++++++++++++++++ |
15 |
app-misc/rbutil/metadata.xml | 8 ++++ |
16 |
app-misc/rbutil/rbutil-1.4.0.ebuild | 62 ++++++++++++++++++++++++++ |
17 |
4 files changed, 159 insertions(+) |
18 |
|
19 |
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest |
20 |
new file mode 100644 |
21 |
index 00000000000..4103d534582 |
22 |
--- /dev/null |
23 |
+++ b/app-misc/rbutil/Manifest |
24 |
@@ -0,0 +1 @@ |
25 |
+DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe |
26 |
|
27 |
diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/quazip.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..9d803712209 |
30 |
--- /dev/null |
31 |
+++ b/app-misc/rbutil/files/quazip.patch |
32 |
@@ -0,0 +1,88 @@ |
33 |
+This patch is a simplified version of a patch I have sent upstream. |
34 |
+http://gerrit.rockbox.org/1825 |
35 |
+ |
36 |
+-- Chewi |
37 |
+ |
38 |
+diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp |
39 |
+--- a/base/ziputil.cpp 2014-01-05 22:44:53.000000000 +0000 |
40 |
++++ b/base/ziputil.cpp 2018-02-25 10:55:36.994002648 +0000 |
41 |
+@@ -22,9 +22,9 @@ |
42 |
+ #include "progressloggerinterface.h" |
43 |
+ #include "Logger.h" |
44 |
+ |
45 |
+-#include "quazip/quazip.h" |
46 |
+-#include "quazip/quazipfile.h" |
47 |
+-#include "quazip/quazipfileinfo.h" |
48 |
++#include <quazip5/quazip.h> |
49 |
++#include <quazip5/quazipfile.h> |
50 |
++#include <quazip5/quazipfileinfo.h> |
51 |
+ |
52 |
+ |
53 |
+ ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) |
54 |
+diff -Naur a/base/ziputil.h b/base/ziputil.h |
55 |
+--- a/base/ziputil.h 2014-01-05 22:44:54.000000000 +0000 |
56 |
++++ b/base/ziputil.h 2018-02-25 10:55:28.513838004 +0000 |
57 |
+@@ -21,9 +21,9 @@ |
58 |
+ |
59 |
+ #include <QtCore> |
60 |
+ #include "archiveutil.h" |
61 |
+-#include "quazip/quazip.h" |
62 |
+-#include "quazip/quazipfile.h" |
63 |
+-#include "quazip/quazipfileinfo.h" |
64 |
++#include <quazip5/quazip.h> |
65 |
++#include <quazip5/quazipfile.h> |
66 |
++#include <quazip5/quazipfileinfo.h> |
67 |
+ |
68 |
+ class ZipUtil : public ArchiveUtil |
69 |
+ { |
70 |
+diff -Naur a/rbutilqt.pri b/rbutilqt.pri |
71 |
+--- a/rbutilqt.pri 2014-01-05 22:44:57.000000000 +0000 |
72 |
++++ b/rbutilqt.pri 2018-02-25 10:54:39.793852035 +0000 |
73 |
+@@ -69,12 +69,6 @@ |
74 |
+ base/rockboxinfo.cpp \ |
75 |
+ ../../tools/mkboot.c \ |
76 |
+ ../../tools/iriver.c \ |
77 |
+- quazip/quazip.cpp \ |
78 |
+- quazip/quazipfile.cpp \ |
79 |
+- quazip/quazipnewinfo.cpp \ |
80 |
+- quazip/unzip.c \ |
81 |
+- quazip/zip.c \ |
82 |
+- quazip/ioapi.c \ |
83 |
+ base/ziputil.cpp \ |
84 |
+ gui/comboboxviewdelegate.cpp \ |
85 |
+ gui/selectiveinstallwidget.cpp \ |
86 |
+@@ -156,14 +150,6 @@ |
87 |
+ base/rockboxinfo.h \ |
88 |
+ ../../tools/mkboot.h \ |
89 |
+ ../../tools/iriver.h \ |
90 |
+- quazip/crypt.h \ |
91 |
+- quazip/ioapi.h \ |
92 |
+- quazip/quazipfile.h \ |
93 |
+- quazip/quazipfileinfo.h \ |
94 |
+- quazip/quazip.h \ |
95 |
+- quazip/quazipnewinfo.h \ |
96 |
+- quazip/unzip.h \ |
97 |
+- quazip/zip.h \ |
98 |
+ base/ziputil.h \ |
99 |
+ lame/lame.h \ |
100 |
+ gui/comboboxviewdelegate.h \ |
101 |
+diff -Naur a/rbutilqt.pro b/rbutilqt.pro |
102 |
+--- a/rbutilqt.pro 2014-01-05 22:45:00.000000000 +0000 |
103 |
++++ b/rbutilqt.pro 2018-02-25 10:55:04.577357613 +0000 |
104 |
+@@ -114,7 +114,7 @@ |
105 |
+ |
106 |
+ DEPENDPATH = $$INCLUDEPATH |
107 |
+ |
108 |
+-LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR |
109 |
++LIBS += -L$$OUT_PWD -L$$MYLIBBUILDDIR -lquazip5 |
110 |
+ # append all RBLIBS to LIBS |
111 |
+ for(rblib, RBLIBS) { |
112 |
+ LIBS += -l$$rblib |
113 |
+@@ -122,7 +122,6 @@ |
114 |
+ |
115 |
+ # on win32 libz is linked implicitly. |
116 |
+ !win32 { |
117 |
+- LIBS += -lz |
118 |
+ } |
119 |
+ |
120 |
+ # Add a (possibly found) libspeex now, don't do this before -lrbspeex! |
121 |
|
122 |
diff --git a/app-misc/rbutil/metadata.xml b/app-misc/rbutil/metadata.xml |
123 |
new file mode 100644 |
124 |
index 00000000000..54be7ff7e5d |
125 |
--- /dev/null |
126 |
+++ b/app-misc/rbutil/metadata.xml |
127 |
@@ -0,0 +1,8 @@ |
128 |
+<?xml version="1.0" encoding="UTF-8"?> |
129 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
130 |
+<pkgmetadata> |
131 |
+ <maintainer type="person"> |
132 |
+ <email>chewi@g.o</email> |
133 |
+ <name>James Le Cuirot</name> |
134 |
+ </maintainer> |
135 |
+</pkgmetadata> |
136 |
|
137 |
diff --git a/app-misc/rbutil/rbutil-1.4.0.ebuild b/app-misc/rbutil/rbutil-1.4.0.ebuild |
138 |
new file mode 100644 |
139 |
index 00000000000..0982dffdb4b |
140 |
--- /dev/null |
141 |
+++ b/app-misc/rbutil/rbutil-1.4.0.ebuild |
142 |
@@ -0,0 +1,62 @@ |
143 |
+# Copyright 1999-2018 Gentoo Foundation |
144 |
+# Distributed under the terms of the GNU General Public License v2 |
145 |
+ |
146 |
+EAPI=6 |
147 |
+ |
148 |
+inherit desktop gnome2-utils qmake-utils |
149 |
+ |
150 |
+DESCRIPTION="Rockbox open source firmware manager for music players" |
151 |
+HOMEPAGE="https://www.rockbox.org/wiki/RockboxUtility" |
152 |
+SRC_URI="https://download.rockbox.org/${PN}/source/RockboxUtility-v${PV}-src.tar.bz2" |
153 |
+LICENSE="GPL-2" |
154 |
+SLOT="0" |
155 |
+KEYWORDS="~amd64" |
156 |
+IUSE="debug" |
157 |
+ |
158 |
+RDEPEND="dev-libs/quazip |
159 |
+ dev-qt/qtcore:5= |
160 |
+ dev-qt/qtgui:5= |
161 |
+ dev-qt/qtnetwork:5= |
162 |
+ dev-qt/qtwidgets:5= |
163 |
+ media-libs/speex |
164 |
+ media-libs/speexdsp |
165 |
+ virtual/libusb:1" |
166 |
+ |
167 |
+DEPEND="${RDEPEND} |
168 |
+ dev-qt/linguist-tools:5" |
169 |
+ |
170 |
+S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt" |
171 |
+ |
172 |
+PATCHES=( |
173 |
+ "${FILESDIR}"/quazip.patch |
174 |
+) |
175 |
+ |
176 |
+src_prepare() { |
177 |
+ default |
178 |
+ rm -rv quazip/ zlib/ || die |
179 |
+} |
180 |
+ |
181 |
+src_configure() { |
182 |
+ # Generate binary translations. |
183 |
+ lrelease ${PN}qt.pro || die |
184 |
+ |
185 |
+ # noccache is required to call the correct compiler. |
186 |
+ eqmake5 CONFIG+="noccache $(use debug && echo dbg)" |
187 |
+} |
188 |
+ |
189 |
+src_install() { |
190 |
+ local icon size |
191 |
+ for icon in icons/rockbox-*.png; do |
192 |
+ size=${icon##*-} |
193 |
+ size=${size%%.*} |
194 |
+ newicon -s "${size}" "${icon}" rockbox.png |
195 |
+ done |
196 |
+ |
197 |
+ dobin RockboxUtility |
198 |
+ make_desktop_entry RockboxUtility "Rockbox Utility" rockbox |
199 |
+ dodoc changelog.txt |
200 |
+} |
201 |
+ |
202 |
+pkg_preinst() { gnome2_icon_savelist; } |
203 |
+pkg_postinst() { gnome2_icon_cache_update; } |
204 |
+pkg_postrm() { gnome2_icon_cache_update; } |