Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package musique for openSUSE:Factory checked in at 2024-03-25 21:07:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/musique (Old) and /work/SRC/openSUSE:Factory/.musique.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "musique" Mon Mar 25 21:07:36 2024 rev:4 rq:1160736 version:1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/musique/musique.changes 2024-03-20 21:22:31.880089909 +0100 +++ /work/SRC/openSUSE:Factory/.musique.new.1905/musique.changes 2024-03-25 21:09:20.747711183 +0100 @@ -1,0 +2,13 @@ +Fri Mar 22 15:17:24 UTC 2024 - Martin Winter <m...@letsfindaway.de> + +- Add missing runtime dependency + * Add Requires: qt6-sql-sqlite + +------------------------------------------------------------------- +Thu Mar 21 16:07:06 UTC 2024 - Martin Winter <m...@letsfindaway.de> + +- Update to 1.12 + * No upstream changelog +- Build with Qt6 + +------------------------------------------------------------------- Old: ---- musique-1.10.1.tar.xz New: ---- musique-1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ musique.spec ++++++ --- /var/tmp/diff_new_pack.QgrCpa/_old 2024-03-25 21:09:22.263766848 +0100 +++ /var/tmp/diff_new_pack.QgrCpa/_new 2024-03-25 21:09:22.263766848 +0100 @@ -17,7 +17,7 @@ Name: musique -Version: 1.10.1 +Version: 1.12 Release: 0 Summary: A different take on the music player License: GPL-3.0-only AND LGPL-2.1-only @@ -27,18 +27,18 @@ Patch0: fix-taglib2-compatibility.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: libqt5-linguist BuildRequires: pkgconfig +BuildRequires: qt6-tools-linguist BuildRequires: update-desktop-files -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Quick) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt6DBus) +BuildRequires: pkgconfig(Qt6Network) +BuildRequires: pkgconfig(Qt6Quick) +BuildRequires: pkgconfig(Qt6Sql) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Xml) BuildRequires: pkgconfig(mpv) >= 0.29.0 BuildRequires: pkgconfig(taglib) +Requires: qt6-sql-sqlite %description Musique is a music player designed by and for people that love @@ -64,14 +64,15 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/aboutview.cpp %build -%qmake5 \ +%qmake6 \ PREFIX=%{_prefix} \ + QMAKE_LRELEASE=lrelease6 \ QMAKE_CFLAGS="%{optflags}" \ QMAKE_CXXFLAGS="%{optflags}" %make_build %install -%qmake5_install +%qmake6_install %fdupes %{buildroot}%{_datadir} %files ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QgrCpa/_old 2024-03-25 21:09:22.295768023 +0100 +++ /var/tmp/diff_new_pack.QgrCpa/_new 2024-03-25 21:09:22.299768170 +0100 @@ -4,7 +4,7 @@ <param name="url">https://github.com/flaviotordini/musique.git</param> <param name="filename">musique</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">1.10.1</param> + <param name="revision">1.12</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ fix-taglib2-compatibility.patch ++++++ --- /var/tmp/diff_new_pack.QgrCpa/_old 2024-03-25 21:09:22.311768610 +0100 +++ /var/tmp/diff_new_pack.QgrCpa/_new 2024-03-25 21:09:22.315768757 +0100 @@ -1,4 +1,4 @@ -From dc111dcc6ba4eadc4f04c4bf0ad8340589b058fd Mon Sep 17 00:00:00 2001 +From 7277d40defe9cde40f947a81d624195ddf683f44 Mon Sep 17 00:00:00 2001 From: letsfindaway <m...@letsfindaway.de> Date: Wed, 20 Mar 2024 07:19:11 +0100 Subject: [PATCH] fix: compatibility with TagLib 2.0 @@ -7,16 +7,30 @@ - replace MP4::Tag::itemListMap() by MP4::Tag::itemMap() - add version requirement for TagLib >= 1.10 in README.md --- + README.md | 2 +- src/coverutils.cpp | 2 +- src/mainwindow.cpp | 3 +++ src/tags/mp4utils.h | 4 ++-- - 3 files changed, 6 insertions(+), 3 deletions(-) + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/README.md b/README.md +index a1e08a5..8b28cf8 100644 +--- a/README.md ++++ b/README.md +@@ -10,7 +10,7 @@ Translations are done at https://www.transifex.com/flaviotordini/musique/ + Just register and apply for a language team. Please don't request translation merges on GitHub. + + ## Build instructions +-To compile Musique you need at least Qt 6.0. The following Qt modules are needed: core, gui, widgets, network, sql (using the Sqlite plugin), declarative, dbus. You also need TagLib: http://taglib.github.io and MPV >= 0.29.0: https://mpv.io/ ++To compile Musique you need at least Qt 6.0. The following Qt modules are needed: core, gui, widgets, network, sql (using the Sqlite plugin), declarative, dbus. You also need TagLib: http://taglib.github.io >= 1.10 and MPV >= 0.29.0: https://mpv.io/ + + To be able to build on a Debian (or derivative) system: diff --git a/src/coverutils.cpp b/src/coverutils.cpp -index 9ea7728..9b99f0b 100644 +index ae89330..4ba717e 100644 --- a/src/coverutils.cpp +++ b/src/coverutils.cpp -@@ -159,7 +159,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, Album *album) { +@@ -158,7 +158,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, Album *album) { TagLib::MP4::Tag *tag = static_cast<TagLib::MP4::Tag *>(f.tag()); if (!tag) return false; @@ -26,13 +40,13 @@ TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList(); TagLib::MP4::CoverArt coverArt = coverArtList.front(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp -index 4e4ed27..d1e861e 100644 +index dac2bd8..6587591 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp -@@ -24,6 +24,9 @@ along with Musique. If not, see <http://www.gnu.org/licenses/>. - #include "database.h" - #include "iconutils.h" - #include "spacer.h" +@@ -46,6 +46,9 @@ along with Musique. If not, see <http://www.gnu.org/licenses/>. + #include "view.h" + #include "zoomableui.h" + +#include <iostream> + + ++++++ musique-1.10.1.tar.xz -> musique-1.12.tar.xz ++++++ ++++ 20536 lines of diff (skipped)