public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/, app-misc/rbutil/files/
@ 2018-03-02 21:12 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2018-03-02 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     9391f29090a6db15cc5ce41a3cf5003af9d8d5df
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 21:11:49 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 21:12:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9391f290

app-misc/rbutil: New package

Closes: https://bugs.gentoo.org/411619
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-misc/rbutil/Manifest            |  1 +
 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, 159 insertions(+)

diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
new file mode 100644
index 00000000000..4103d534582
--- /dev/null
+++ b/app-misc/rbutil/Manifest
@@ -0,0 +1 @@
+DIST RockboxUtility-v1.4.0-src.tar.bz2 1181116 BLAKE2B 64d0cbedb3917a8f3f79e2b47b8eb230bb5fd6627ffd0647d5fbb42973d07675ee8a8f0eb9ae6e3481a8bd4cb4a183fb463bf97a1edbb2a74076e7a595f09ade SHA512 705723d6ee2231c3b79d0c67cabc7c6c00d3f1a76a970c1bd15e028a98b4a25de987b0921ea932ca0098defbec0bc9bde9d9ed3a79dd46f81da18bb5472be9fe

diff --git a/app-misc/rbutil/files/quazip.patch b/app-misc/rbutil/files/quazip.patch
new file mode 100644
index 00000000000..9d803712209
--- /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 <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/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 <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.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 00000000000..54be7ff7e5d
--- /dev/null
+++ b/app-misc/rbutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+</pkgmetadata>

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 00000000000..0982dffdb4b
--- /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; }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/, app-misc/rbutil/files/
@ 2021-01-16 22:22 James Le Cuirot
  0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2021-01-16 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5a03ce05b6f9199a8efcd3b7e15680769e54bde2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 22:19:49 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 22:20:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a03ce05

app-misc/rbutil: Fix building with -fno-common or GCC 10

Closes: https://bugs.gentoo.org/731288
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 ...tools-sbtools-fix-compilation-with-gcc-10.patch | 27 ++++++++++++++++++++++
 app-misc/rbutil/files/rbutil-1.4.1-quazip.patch    | 12 +++++-----
 app-misc/rbutil/rbutil-1.4.1.ebuild                | 14 +++++++++--
 3 files changed, 45 insertions(+), 8 deletions(-)

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
new file mode 100644
index 00000000000..3ff18f2afcf
--- /dev/null
+++ b/app-misc/rbutil/files/0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
@@ -0,0 +1,27 @@
+From 141c9c218c31dfd6f4f9e47f25cc2764d2bb4b63 Mon Sep 17 00:00:00 2001
+From: Martin Hauke <mardnh@gmx.de>
+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-quazip.patch b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
index 596127c3406..2feabb77136 100644
--- a/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
+++ b/app-misc/rbutil/files/rbutil-1.4.1-quazip.patch
@@ -4,8 +4,8 @@ http://gerrit.rockbox.org/1825
 -- Chewi
 
 diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
---- a/base/ziputil.cpp	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.cpp	2019-12-04 22:38:34.443112450 +0000
+--- 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"
@@ -20,8 +20,8 @@ diff -Naur a/base/ziputil.cpp b/base/ziputil.cpp
  
  ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent)
 diff -Naur a/base/ziputil.h b/base/ziputil.h
---- a/base/ziputil.h	2019-11-10 06:45:49.000000000 +0000
-+++ b/base/ziputil.h	2019-12-04 22:38:34.443112450 +0000
+--- 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>
@@ -36,8 +36,8 @@ diff -Naur a/base/ziputil.h b/base/ziputil.h
  class ZipUtil : public ArchiveUtil
  {
 diff -Naur a/rbutilqt.pro b/rbutilqt.pro
---- a/rbutilqt.pro	2019-11-10 06:45:50.000000000 +0000
-+++ b/rbutilqt.pro	2019-12-04 22:43:30.144259710 +0000
+--- 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

diff --git a/app-misc/rbutil/rbutil-1.4.1.ebuild b/app-misc/rbutil/rbutil-1.4.1.ebuild
index 3ba0000d120..f558a5e9dd9 100644
--- a/app-misc/rbutil/rbutil-1.4.1.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1.ebuild
@@ -28,18 +28,22 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
-S="${WORKDIR}/RockboxUtility-v${PV}/${PN}/${PN}qt"
+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 quazip/ zlib/ || die
+	rm -rv "${QTDIR}"/{quazip,zlib}/ || die
 }
 
 src_configure() {
+	cd "${QTDIR}" || die
+
 	# Generate binary translations.
 	"$(qt5_get_bindir)"/lrelease ${PN}qt.pro || die
 
@@ -47,7 +51,13 @@ src_configure() {
 	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##*-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/, app-misc/rbutil/files/
@ 2021-02-23 19:53 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-02-23 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     d991b9096b3e44d2aba771ed19fa3220af45ec51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 20:00:47 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=d991b909

app-misc/rbutil: Fix version string

Closes: https://bugs.gentoo.org/734178
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-fix-versionstring.patch | 11 +++++++++++
 app-misc/rbutil/rbutil-1.4.1-r2.ebuild                     |  1 +
 2 files changed, 12 insertions(+)

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 00000000000..f8a1fade7f0
--- /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/rbutil-1.4.1-r2.ebuild b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
index 322c9c396c3..ebfb53deeda 100644
--- a/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
+++ b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
@@ -37,6 +37,7 @@ 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() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/, app-misc/rbutil/files/
@ 2021-02-23 19:53 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-02-23 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4d117f06aea1efe47243f73a64820fc54d42e40d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 17:19:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 19:52:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d117f06

app-misc/rbutil: Support build with >=dev-libs/quazip-1.0

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-quazip1.patch | 84 ++++++++++++++++++++++++
 app-misc/rbutil/rbutil-1.4.1-r2.ebuild           | 79 ++++++++++++++++++++++
 2 files changed, 163 insertions(+)

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 00000000000..aa28cc9ea27
--- /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 <asturm@gentoo.org>
+Date: Sat, 20 Feb 2021 18:11:09 +0100
+Subject: [PATCH] Use upstream quazip1-qt5 pkgconfig
+
+Based on patch by James Le Cuirot <chewi@gentoo.org>
+http://gerrit.rockbox.org/1825
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ 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 <QtCore>
+ #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
new file mode 100644
index 00000000000..322c9c396c3
--- /dev/null
+++ b/app-misc/rbutil/rbutil-1.4.1-r2.ebuild
@@ -0,0 +1,79 @@
+# 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
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/^PKGCONFIG/s/quazip1-qt5/quazip/" -i ${QTDIR}/${PN}qt.pro || die
+	fi
+
+	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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-23 19:53 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-02 21:12 [gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/, app-misc/rbutil/files/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2021-01-16 22:22 James Le Cuirot
2021-02-23 19:53 Andreas Sturmlechner
2021-02-23 19:53 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox