[gentoo-commits] repo/gentoo:master commit in: app-misc/rbutil/files/, app-misc/rbutil/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     ba7058e018a216be319d274dc685411f69abaebc
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 10:43:03 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 10:44:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7058e0

app-misc/rbutil: Version bump to 1.5.1

Closes: https://bugs.gentoo.org/829093
Closes: https://bugs.gentoo.org/830559
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-misc/rbutil/Manifest                           |   1 +
 app-misc/rbutil/files/rbutil-1.5.1-cmake.patch     |  32 +++++
 app-misc/rbutil/files/rbutil-1.5.1-headers.patch   |  17 +++
 .../rbutil/files/rbutil-1.5.1-system-quazip.patch  | 150 +++++++++++++++++++++
 app-misc/rbutil/rbutil-1.5.1.ebuild                |  63 +++++++++
 5 files changed, 263 insertions(+)

diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest
index 1c8a543cff7d..fc45cb3b8345 100644
--- a/app-misc/rbutil/Manifest
+++ b/app-misc/rbutil/Manifest
@@ -1 +1,2 @@
 DIST RockboxUtility-v1.4.1-src.tar.bz2 1427019 BLAKE2B b4d5e7e74c46c32138c564ebe5b81233ac47ddabe51241e7c6cfef9d5ca25f85b53166a840e5aadec0e021ad206e5d987c71d617c56aee425ece0321aea5edb2 SHA512 24e4ac7b99618d40044bd8248e6755b40e77e333902ddd898e57b33c50705e97fdc5a751be49f8e5ded445b4f712bdd5310b266ff82680ea76488d8bfc8e17c2
+DIST RockboxUtility-v1.5.1-src.tar.bz2 1495776 BLAKE2B 0a5009cfbe610a46a98d72d184cb49852ba6ffbee7a826bc4d69a7dd06f982695c6964586c48cf58b2f12ee5f650ec2ee0c650336ea987b2c8d62b459f2333cb SHA512 623cdc7bba3028264448f072be1e9a754afe544cda1193bec051dd390acadea213cda8f00e25bc3a0254a282f8f6b2ba34e67c2ac0d086c0a74d52df1fd733fb

diff --git a/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch b/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch
new file mode 100644
index 000000000000..276dba7e61d9
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.5.1-cmake.patch
@@ -0,0 +1,32 @@
+diff -Naur a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+--- a/utils/CMakeLists.txt	2022-04-18 20:05:44.073208000 +0100
++++ b/utils/CMakeLists.txt	2022-07-07 16:19:17.378055916 +0100
+@@ -358,22 +358,6 @@
+     )
+ target_include_directories(rbtomcrypt PUBLIC ${CMAKE_CURRENT_LIST_DIR}/tomcrypt/src/headers)
+ 
+-add_library(skin_parser
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_buffer.c
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_buffer.h
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_debug.c
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_debug.h
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_parser.c
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_parser.h
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_scan.c
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/skin_scan.h
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/symbols.h
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/tag_table.c
+-    ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser/tag_table.h
+-    )
+-target_include_directories(skin_parser PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../lib/skin_parser)
+-target_compile_definitions(skin_parser PUBLIC __PCTOOL__)
+-
+ # target will always be build. File is only updated when contents change.
+ add_custom_target(gitversion.h
+     COMMENT "Updating gitversion.h"
+@@ -391,5 +375,3 @@
+ include(${CMAKE_CURRENT_LIST_DIR}/cmake/deploy.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/cmake/QtTest.cmake)
+ add_subdirectory(rbutilqt)
+-add_subdirectory(themeeditor)
+-

diff --git a/app-misc/rbutil/files/rbutil-1.5.1-headers.patch b/app-misc/rbutil/files/rbutil-1.5.1-headers.patch
new file mode 100644
index 000000000000..ff7ac8760ff7
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.5.1-headers.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/830559
+https://www.rockbox.org/tracker/task/13358
+
+Note: This may need tweaking for non-Linux platforms.
+
+diff --git a/utils/sansapatcher/sansaio.h b/utils/sansapatcher/sansaio.h
+index 61e2f1d1b2..327f8fbd18 100644
+--- a/utils/sansapatcher/sansaio.h
++++ b/utils/sansapatcher/sansaio.h
+@@ -23,6 +23,7 @@
+ #define __SANSAIO_H
+
+ #include <stdint.h>
++#include <sys/types.h>
+ #if !defined(_MSC_VER)
+ #include <unistd.h> /* not available on MSVC */
+ #endif

diff --git a/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch b/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch
new file mode 100644
index 000000000000..84b9655c0c0e
--- /dev/null
+++ b/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch
@@ -0,0 +1,150 @@
+From 930293a899825ae552370a060dd04117ebc5fdae Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Thu, 7 Jul 2022 21:52:54 +0100
+Subject: [PATCH] rbutil: Add USE_SYSTEM_QUAZIP option to use system-wide
+ QuaZIP
+
+QuaZIP is included in several major Linux distributions and packaging
+policies strongly oppose bundling of libraries.
+
+Change-Id: I8d454784dc4b244f4dd8aa18deb3350a29aaab77
+---
+ docs/CREDITS                    |  1 +
+ utils/rbutilqt/CMakeLists.txt   | 65 ++++++++++++++++++---------------
+ utils/rbutilqt/base/ziputil.cpp |  6 +--
+ utils/rbutilqt/base/ziputil.h   |  6 +--
+ 4 files changed, 43 insertions(+), 35 deletions(-)
+
+diff --git a/docs/CREDITS b/docs/CREDITS
+index 6f7c23fc7e..3a6fcb83b9 100644
+--- a/docs/CREDITS
++++ b/docs/CREDITS
+@@ -710,6 +710,7 @@ Marc Aarts
+ Fabrice Bellard
+ Selami Dinçer
+ Matej Golian
++James Le Cuirot
+ 
+ The libmad team
+ The wavpack team
+diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt
+index 41954cb9ee..350790109b 100644
+--- a/utils/rbutilqt/CMakeLists.txt
++++ b/utils/rbutilqt/CMakeLists.txt
+@@ -255,9 +255,43 @@ if(APPLE)
+         ${CMAKE_CURRENT_LIST_DIR}/base/ttscarbon.h)
+ endif()
+ 
++option(USE_SYSTEM_QUAZIP "Use system QuaZIP library" OFF)
++if(USE_SYSTEM_QUAZIP)
++    find_package(QuaZip-Qt5 REQUIRED)
++    set(QUAZIP_LIBRARY QuaZip::QuaZip)
++else()
++    # TODO: Upstream has cmake support, use that instead.
++    add_library(quazip
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/ioapi.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/minizip_crypt.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/qioapi.cpp
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.cpp
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.cpp
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.cpp
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip_global.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.cpp
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.c
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.h
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.c
++        ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.h
++        )
++    target_include_directories(quazip PUBLIC ${CMAKE_CURRENT_LIST_DIR}/quazip)
++    target_link_libraries(quazip z Qt${QT_VERSION_MAJOR}::Core)
++    if(QT_VERSION_MAJOR EQUAL 6)
++        target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat)
++    endif()
++    target_compile_definitions(quazip PUBLIC QUAZIP_STATIC)
++    set_property(TARGET quazip PROPERTY AUTOMOC ON)
++    set(QUAZIP_LIBRARY quazip)
++endif()
++
+ target_link_libraries(rbbase
+-    cutelogger quazip mspack bspatch rbspeex voicefont
+-    sansapatcher ipodpatcher chinachippatcher
++    cutelogger ${QUAZIP_LIBRARY} mspack bspatch rbspeex
++    voicefont sansapatcher ipodpatcher chinachippatcher
+     mkamsboot mkimxboot mkmpioboot mktccboot mks5lboot
+     Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network)
+ target_include_directories(rbbase PUBLIC ${CMAKE_CURRENT_LIST_DIR}/base)
+@@ -298,33 +332,6 @@ target_link_libraries(cutelogger PUBLIC Qt${QT_VERSION_MAJOR}::Core)
+ target_compile_definitions(cutelogger PUBLIC CUTELOGGER_STATIC)
+ set_property(TARGET cutelogger PROPERTY AUTOMOC ON)
+ 
+-# TODO: Upstream has cmake support, use that instead.
+-add_library(quazip
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/ioapi.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/minizip_crypt.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/qioapi.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfile.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipfileinfo.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip_global.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazip.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.cpp
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/quazipnewinfo.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.c
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/unzip.h
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.c
+-    ${CMAKE_CURRENT_LIST_DIR}/quazip/zip.h
+-    )
+-target_include_directories(quazip PUBLIC ${CMAKE_CURRENT_LIST_DIR}/quazip)
+-target_link_libraries(quazip z Qt${QT_VERSION_MAJOR}::Core)
+-if(QT_VERSION_MAJOR EQUAL 6)
+-    target_link_libraries(quazip Qt${QT_VERSION_MAJOR}::Core5Compat)
+-endif()
+-target_compile_definitions(quazip PUBLIC QUAZIP_STATIC)
+-set_property(TARGET quazip PROPERTY AUTOMOC ON)
+-
+ add_library(mspack
+     #mspack/cabc.c
+     mspack/cabd.c
+diff --git a/utils/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp
+index e285446711..877a861253 100644
+--- a/utils/rbutilqt/base/ziputil.cpp
++++ b/utils/rbutilqt/base/ziputil.cpp
+@@ -22,9 +22,9 @@
+ #include "progressloglevels.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/utils/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h
+index 73a87a820a..ea32ca42c3 100644
+--- a/utils/rbutilqt/base/ziputil.h
++++ b/utils/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
+ {
+-- 
+2.35.1
+

diff --git a/app-misc/rbutil/rbutil-1.5.1.ebuild b/app-misc/rbutil/rbutil-1.5.1.ebuild
new file mode 100644
index 000000000000..96956195e14e
--- /dev/null
+++ b/app-misc/rbutil/rbutil-1.5.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop 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"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=dev-libs/quazip-1.2:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg: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}-src"
+CMAKE_USE_DIR="${S}/utils"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-quazip.patch
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-headers.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	rm -rv utils/rbutilqt/{quazip,zlib}/ || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DCCACHE_PROGRAM=FALSE
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/{ipodpatcher,sansapatcher,rbutilqt/RockboxUtility}
+	newicon -s scalable docs/logo/rockbox-clef.svg rockbox.svg
+	make_desktop_entry RockboxUtility "Rockbox Utility" rockbox
+	dodoc utils/rbutilqt/changelog.txt
+}