commit: 8fb4f87a447572751fb7b0c11c5883b1d9a08b94 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu May 1 22:06:35 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu May 1 22:11:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb4f87a
app-misc/rbutil: Use newer QuaZIP patch, migrate to Qt6 Closes: https://bugs.gentoo.org/942323 Closes: https://bugs.gentoo.org/955136 Co-authored-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../rbutil/files/rbutil-1.5.1-system-quazip.patch | 36 +++++++++------------- ...util-1.5.1-r1.ebuild => rbutil-1.5.1-r2.ebuild} | 28 +++++++---------- 2 files changed, 25 insertions(+), 39 deletions(-) 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 index 84b9655c0c0e..dc3ed98bd410 100644 --- a/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch +++ b/app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch @@ -1,25 +1,19 @@ -From 930293a899825ae552370a060dd04117ebc5fdae Mon Sep 17 00:00:00 2001 +From 4917f764bbb9580d9ec312794c0d7ae71c6792e1 Mon Sep 17 00:00:00 2001 From: James Le Cuirot <[email protected]> -Date: Thu, 7 Jul 2022 21:52:54 +0100 -Subject: [PATCH] rbutil: Add USE_SYSTEM_QUAZIP option to use system-wide - QuaZIP +Date: Thu, 07 Jul 2022 21:52:54 +0100 +Subject: [PATCH] rbutil: Try to use system-wide QuaZIP in preference to building our own 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 +index 6f7c23f..3a6fcb8 100644 --- a/docs/CREDITS +++ b/docs/CREDITS -@@ -710,6 +710,7 @@ Marc Aarts +@@ -710,6 +710,7 @@ Fabrice Bellard Selami Dinçer Matej Golian @@ -28,18 +22,19 @@ index 6f7c23fc7e..3a6fcb83b9 100644 The libmad team The wavpack team diff --git a/utils/rbutilqt/CMakeLists.txt b/utils/rbutilqt/CMakeLists.txt -index 41954cb9ee..350790109b 100644 +index 41954cb..24e15ac 100644 --- a/utils/rbutilqt/CMakeLists.txt +++ b/utils/rbutilqt/CMakeLists.txt -@@ -255,9 +255,43 @@ if(APPLE) +@@ -255,9 +255,44 @@ ${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) ++find_package(QuaZip-Qt${QT_VERSION_MAJOR} QUIET) ++if(QuaZip-Qt${QT_VERSION_MAJOR}_FOUND) ++ message("-- Found QuaZip") + set(QUAZIP_LIBRARY QuaZip::QuaZip) +else() ++ message("-- QuaZip not found, building our own") + # TODO: Upstream has cmake support, use that instead. + add_library(quazip + ${CMAKE_CURRENT_LIST_DIR}/quazip/ioapi.h @@ -77,7 +72,7 @@ index 41954cb9ee..350790109b 100644 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) +@@ -298,33 +333,6 @@ target_compile_definitions(cutelogger PUBLIC CUTELOGGER_STATIC) set_property(TARGET cutelogger PROPERTY AUTOMOC ON) @@ -112,7 +107,7 @@ index 41954cb9ee..350790109b 100644 #mspack/cabc.c mspack/cabd.c diff --git a/utils/rbutilqt/base/ziputil.cpp b/utils/rbutilqt/base/ziputil.cpp -index e285446711..877a861253 100644 +index e285446..877a861 100644 --- a/utils/rbutilqt/base/ziputil.cpp +++ b/utils/rbutilqt/base/ziputil.cpp @@ -22,9 +22,9 @@ @@ -129,7 +124,7 @@ index e285446711..877a861253 100644 ZipUtil::ZipUtil(QObject* parent) : ArchiveUtil(parent) diff --git a/utils/rbutilqt/base/ziputil.h b/utils/rbutilqt/base/ziputil.h -index 73a87a820a..ea32ca42c3 100644 +index 73a87a8..ea32ca4 100644 --- a/utils/rbutilqt/base/ziputil.h +++ b/utils/rbutilqt/base/ziputil.h @@ -21,9 +21,9 @@ @@ -145,6 +140,3 @@ index 73a87a820a..ea32ca42c3 100644 class ZipUtil : public ArchiveUtil { --- -2.35.1 - diff --git a/app-misc/rbutil/rbutil-1.5.1-r1.ebuild b/app-misc/rbutil/rbutil-1.5.1-r2.ebuild similarity index 79% rename from app-misc/rbutil/rbutil-1.5.1-r1.ebuild rename to app-misc/rbutil/rbutil-1.5.1-r2.ebuild index f40401e4f9e5..0f0358aab863 100644 --- a/app-misc/rbutil/rbutil-1.5.1-r1.ebuild +++ b/app-misc/rbutil/rbutil-1.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,6 +8,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"; +S="${WORKDIR}/RockboxUtility-v${PV}-src" +CMAKE_USE_DIR="${S}/utils" LICENSE="GPL-2" SLOT="0" @@ -15,29 +17,21 @@ KEYWORDS="~amd64" RDEPEND=" app-arch/bzip2:= - >=dev-libs/quazip-1.2:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 + >=dev-libs/quazip-1.3-r2:=[qt6(+)] + dev-qt/qt5compat:6 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtmultimedia:6 + dev-qt/qtsvg:6 media-libs/speex media-libs/speexdsp virtual/libusb:1 " -DEPEND=" - ${RDEPEND} - dev-qt/qttest:5 -" +DEPEND="${RDEPEND}" BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] virtual/pkgconfig " -S="${WORKDIR}/RockboxUtility-v${PV}-src" -CMAKE_USE_DIR="${S}/utils" - PATCHES=( "${FILESDIR}"/${P}-system-quazip.patch "${FILESDIR}"/${P}-cmake.patch @@ -53,7 +47,7 @@ src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF -DCCACHE_PROGRAM=FALSE - -DUSE_SYSTEM_QUAZIP=ON + -DQT_DIR="${EPREFIX}/usr/$(get_libdir)/cmake/Qt6" # Force 6 over 5. ) cmake_src_configure }
