diff options
Diffstat (limited to 'app-misc/rbutil')
| -rw-r--r-- | app-misc/rbutil/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/rbutil/files/rbutil-1.5.1-system-quazip.patch | 36 | ||||
| -rw-r--r-- | app-misc/rbutil/rbutil-1.5.1-r2.ebuild (renamed from app-misc/rbutil/rbutil-1.5.1-r1.ebuild) | 30 |
3 files changed, 29 insertions, 41 deletions
diff --git a/app-misc/rbutil/Manifest b/app-misc/rbutil/Manifest index 85714c5c5376..40060db19faa 100644 --- a/app-misc/rbutil/Manifest +++ b/app-misc/rbutil/Manifest @@ -1,6 +1,6 @@ AUX rbutil-1.5.1-cmake.patch 1518 BLAKE2B 1755a6cf567775afc5eb1a9b9c12ac29a01ed26d2d921d47080ee2542a8ba2621bfe2704d89cd417cb34cd50f0d6d4374d266dd71fe87b15d8ee21510ba79fec SHA512 6e083d19795a9d6020bf910510b53796c68dd30939949fff4f0b48e3d988d16139784d36dead756ee88d318be09ebc1508f788e4283482fb973b3c1c40ea54d8 AUX rbutil-1.5.1-headers.patch 475 BLAKE2B 3bb6bfdaaa16f8401b9efce799a2a726b8c903a20b97191e41ed01b7970f7629b997fa6e044ff9472e64947cad207dcdb0c71ca1489e391648a8f30c06eaea6f SHA512 ebf25d30cb067d831024973913f8aa48de6b282db667939a4bdada4a44f7d74ccf58f764a2aa079dc3f7875631638070b75d7fae65d670836460efc1f0dc64f8 -AUX rbutil-1.5.1-system-quazip.patch 5656 BLAKE2B c36a76ebe073055ea4c7e840f532a3a356b824d1aba5f4082f88176a5ffa5a01c1a4b199346baa1a2ac910698fc0fb7cdb222fc7c6ee7f9f83f5e945301b64d9 SHA512 3ee97efa7453ad7fc77a39dcae9225f1a17b176b62cde1033a3426d5f8786447d260a284f43b6fcf8bd7c8a5049f845a4241daa057ee81ad342d1994c83529d7 +AUX rbutil-1.5.1-system-quazip.patch 5346 BLAKE2B 2985a5b7ba3202bdcb7eb7dc69ae80cd80b58e6367db89251ac9c210fc28ecaa140c32d70e32c151cdcd58191cbf488160fb9c8de2a4f5f46394bdfafcb351d5 SHA512 1d66378ca1854553a0a7ebc8014d879b25a16a716bda47608d6ba2b2158c9384b43847420ae802157be525887dc4ae9918bebf5e357a32457303d0220a65374c DIST RockboxUtility-v1.5.1-src.tar.bz2 1495776 BLAKE2B 0a5009cfbe610a46a98d72d184cb49852ba6ffbee7a826bc4d69a7dd06f982695c6964586c48cf58b2f12ee5f650ec2ee0c650336ea987b2c8d62b459f2333cb SHA512 623cdc7bba3028264448f072be1e9a754afe544cda1193bec051dd390acadea213cda8f00e25bc3a0254a282f8f6b2ba34e67c2ac0d086c0a74d52df1fd733fb -EBUILD rbutil-1.5.1-r1.ebuild 1385 BLAKE2B 41b756370e93063d9951818aa248bfea68ca733d7af139d686da182ef86cbfa30f2ac5c60d3670f002fd79a87e1251c1287db014c1eb038784c731adebabfcf2 SHA512 87ccaad4a4461096a61f267e63156962d109f44585e6e83a38dfb44d4a5de5f6d5a669795424cddada50262014839a0d7ef84712b373e93909e13b2903cd1b90 +EBUILD rbutil-1.5.1-r2.ebuild 1442 BLAKE2B e2ebc96939dd898ad36f85f05519b58c42bd9ec7b24b1ad729756efae6ec1e74c15df7d9e7f3673636349a86b69ec9b021399cb40622ed6ad0043d9553f0a02b SHA512 1f15bdd1308e0b08c4549b301c599b33e730b4f4b9f58c5ff430477a62f15b166a7ac13c145f1cb0359dba2211894d85b41d86b5a4e7b1a298c3952537296817 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203 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 <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 +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 index f40401e4f9e5..6711750b476a 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,35 +17,29 @@ 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,ssl,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 "${FILESDIR}"/${P}-headers.patch ) +CMAKE_SKIP_TESTS=( "TestHttpGet\." ) + src_prepare() { cmake_src_prepare rm -rv utils/rbutilqt/{quazip,zlib}/ || die @@ -53,7 +49,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 } |