Accepting request 1278331 from multimedia:apps

OBS-URL: https://build.opensuse.org/request/show/1278331
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rbutil?expand=0&rev=5

0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch

@@ -1,27 +0,0 @@
-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
-

RockboxUtility-v1.4.1-src.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e1949f9f358e3f423a1cef6cd5f563be90da85e5b650bb03a1e04a40270a97e
-size 1427019

_service

@@ -0,0 +1,22 @@
+<services>
+  <service name="tar_scm" mode="manual">
+    <param name="url">https://git.rockbox.org/cgit/rockbox.git</param>
+    <param name="scm">git</param>
+    <param name="revision">rbutil_1.5.1</param>
+    <param name="changesgenerate">disable</param>
+    <param name="versionformat">1.5.1</param>
+    <param name="filename">rockbox-rbutil</param>
+    <param name="exclude">.git</param>
+    <param name="exclude">apps</param>
+    <param name="exclude">fonts</param>
+    <param name="exclude">uisimulator</param>
+    <param name="exclude">manual</param>
+    <param name="exclude">firmware</param>
+  </service>
+  <service name="recompress" mode="manual">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="manual"/>
+</services>
+

rbutil-fix-versionstring.patch

@@ -1,11 +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 @@
+diff --git a/utils/rbutilqt/version.h b/utils/rbutilqt/version.h
+index c55a4d8..095b634 100644
+--- a/utils/rbutilqt/version.h
++++ b/utils/rbutilqt/version.h
+@@ -42,5 +42,5 @@
  // PUREVERSION should identify the build uniquely. Use version string for now.
- #define PUREVERSION "v1.4.1"
+ #define PUREVERSION GITHASH
  
--#define FULLVERSION VERSION " (" PUREVERSION "), built " __DATE__ " " __TIME__
+-#define FULLVERSION VERSION " (" GITHASH "), built " __DATE__ " " __TIME__
 +#define FULLVERSION VERSION
  

rbutil-no-themeeditor.patch

@@ -0,0 +1,10 @@
+diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
+index 55e5b79..329146e 100644
+--- a/utils/CMakeLists.txt
++++ b/utils/CMakeLists.txt
+@@ -391,5 +391,4 @@ target_include_directories(gitversion INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/gitv
+ include(${CMAKE_CURRENT_LIST_DIR}/cmake/deploy.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/cmake/QtTest.cmake)
+ add_subdirectory(rbutilqt)
+-add_subdirectory(themeeditor)
+ 

rbutil.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Sun May 18 12:28:41 UTC 2025 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 1.5.1
+  * Fix bootloader installation for Ipods.
+  * Fix bootloader installation for Sandisk players.
+  * Improve responsiveness on install / uninstall.
+  * Enable Themes installation if themes are selected.
+- Update to version 1.5.0
+  * Add support for xDuoo X3, X3ii, X20.
+  * Add support for AGPTek Rocker.
+  * Add support for AIGO Eros Q and various clones (AIGO Eros K,
+    AGPTek H3, HIFI Walker H2, Surfans F20)
+  * Add support for showing "retired" target status.
+  * Update Iriver H100 / H300 series bootloader.
+  * Rename Game Files installation to Plugin Data; now installs
+    files for further games (Duke3D, Wolfenstein3D, etc.) as well
+    as other plugins (MIDI patchset).
+  * Support installing daily builds.
+  * Move Manual / prerendered voice file installation to main
+    dialog.
+  * Support installing voice files in other languages than english
+  * Improved HiDPI support.
+  * Drop support for Qt4, now requires Qt5.
+  * Update various external libraries.
+  * Server Downloads changed to https.
+- Remove patch:
+  * 0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
+- Update patch:
+  * rbutil-fix-versionstring.patch
+- Add patch
+  * rbutil-no-themeeditor.patch
+- Use tar_scm service to create the tarball
+- Run tests
+- Drop obsolete update-desktop-files
+- Force usage of gcc12 on builds for Leap 15.5 and 15.6
+
 -------------------------------------------------------------------
 Fri Feb 23 11:49:55 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

rbutil.spec

@@ -1,8 +1,8 @@
 #
 # spec file for package rbutil
 #
-# Copyright (c) 2020 SUSE LLC
-# Copyright (c) 2018, Martin Hauke <mardnh@gmx.de>
+# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2018-2025, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,64 +18,71 @@
 
 
 Name:           rbutil
-Version:        1.4.1
+Version:        1.5.1
 Release:        0
 Summary:        Rockbox Firmware Manager
 License:        GPL-2.0-only
 Group:          Hardware/Other
 URL:            https://www.rockbox.org/wiki/RockboxUtility
-Source:         http://download.rockbox.org/rbutil/source/RockboxUtility-v%{version}-src.tar.bz2
+#Git-Clone:     https://git.rockbox.org/cgit/rockbox.git
+Source:         rockbox-rbutil-%{version}.tar.xz
+Patch0:         rbutil-no-themeeditor.patch
 Patch1:         rbutil-fix-versionstring.patch
-Patch2:         0001-imxtools-sbtools-fix-compilation-with-gcc-10.patch
-BuildRequires:  gcc-c++
-BuildRequires:  libqt5-linguist
-BuildRequires:  libqt5-qtbase-common-devel
+BuildRequires:  cmake
 BuildRequires:  pkgconfig
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(cryptopp)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Core5Compat)
+BuildRequires:  pkgconfig(Qt6Linguist)
+BuildRequires:  pkgconfig(Qt6Multimedia)
+BuildRequires:  pkgconfig(Qt6Network)
+BuildRequires:  pkgconfig(Qt6Svg)
+BuildRequires:  pkgconfig(Qt6Test)
+BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(zlib)
-%if 0%{?suse_version} < 1330
-Requires(post): update-desktop-files
-Requires(postun): update-desktop-files
+%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
+BuildRequires:  gcc12
+BuildRequires:  gcc12-c++
+%else
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 %endif
 
 %description
 Firmware manager for Rockbox MP3 players.
 
 %prep
-%autosetup -p1 -n RockboxUtility-v%{version}
+%autosetup -p1 -n rockbox-rbutil-%{version}
+rm -Rv utils/rbutilqt/zlib
 
 %build
-cd rbutil/rbutilqt
-%qmake5
-make %{?_smp_mflags}
+%if 0%{?sle_version} >= 150500 && 0%{?sle_version} < 160000 && 0%{?is_opensuse}
+export CC="gcc-12"
+export CXX="g++-12"
+%endif
+#
+cd utils
+%cmake \
+  -DCMAKE_SKIP_RPATH=ON \
+  -DBUILD_SHARED_LIBS=OFF
+%cmake_build
 
 %install
-install -Dm 0755 rbutil/rbutilqt/RockboxUtility %{buildroot}%{_bindir}/RockboxUtility
-install -d %{buildroot}/%{_datadir}/pixmaps/
-install -Dm 0644 rbutil/rbutilqt/icons/rockbox-256.png %{buildroot}/%{_datadir}/pixmaps/rbutil.jpg
-%suse_update_desktop_file -c rbutil rbutil "Rockbox opensource firmware manager" RockboxUtility rbutil "Qt;AudioVideo;Utility;X-SuSE-SyncUtility;"
+install -Dm 0755 utils/build/rbutilqt/RockboxUtility %{buildroot}%{_bindir}/RockboxUtility
+install -Dm 0644 utils/rbutilqt/RockboxUtility.desktop %{buildroot}%{_datadir}/applications/RockboxUtility.desktop
+install -Dm 0644 docs/logo/rockbox-clef.svg %{buildroot}%{_datadir}/pixmaps/rockbox-clef.svg
 
-%if 0%{?suse_version} < 1330
-%post
-%desktop_database_post
-%endif
-
-%if 0%{?suse_version} < 1330
-%postun
-%desktop_database_postun
-%endif
+%check
+cd utils
+%ctest --exclude-regex TestHttpGet
 
 %files
 %license docs/COPYING
-%doc rbutil/rbutilqt/changelog.txt
+%doc utils/rbutilqt/changelog.txt
 %{_bindir}/RockboxUtility
-%{_datadir}/applications/rbutil.desktop
-%{_datadir}/pixmaps/rbutil.jpg
+%{_datadir}/applications/RockboxUtility.desktop
+%{_datadir}//pixmaps/rockbox-clef.svg
 
 %changelog

rockbox-rbutil-1.5.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8be15e50557cb529fd0e0a2809d3c4d268726f580bea7e53b3c68f68734ce7c8
+size 7125648