diff --git a/.files b/.files index 6f5d48b..4dee2e6 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 1be8941..74995ca 100644 --- a/.rev +++ b/.rev @@ -1221,4 +1221,30 @@ https://git.reviewboard.kde.org/r/104878/ (forwarded request 116659 from StefanB New snapshot 1035634 + + 69b080c5890edd6252ddde44105e499c + 2.9.75git.20230322T021226~4f7c3aff99 + + dimstar_suse + - Update to version 2.9.75git.20230322T021226~4f7c3aff99: + * Force scheme where KIO copies local files + * cmake: adjust configure file definition position ... + * Edit some NULLs to nullptrs. + * MusicDNSAudioDecoder: add support for ffmpeg 5.0 + * Small improvements to de-deprecation changeset. + * Fix remaining cases of iterator problems. + * Fix a crash. + * Require Qt 5.15+ + * Cleanup deprecated code. + * cmake: Require C++14 + * Shorten onPressAndHold delay + * Enable dragging tracks from the album context applet. + * Add C++ functions for providing selected URL lists. + * Remove Tokens from layout first to avoid bug. + * Fix an old typo causing a missing icon. + * Fix crash when filtering collections. + * Fix path for qca dep + * Use normal KMessageBox method instead of util one + 1073933 + diff --git a/.servicemark b/.servicemark deleted file mode 100644 index 4bf96f8..0000000 --- a/.servicemark +++ /dev/null @@ -1 +0,0 @@ -3e1e39e898cb404110359fe22ed09f93 diff --git a/_servicedata b/_servicedata index d2049c0..c568b5b 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/multimedia/amarok.git - 457db492b455973076a93cd1188b4e98fa750457 \ No newline at end of file + 4f7c3aff990d42d9dde6c2d806e0e0c6e9faced5 \ No newline at end of file diff --git a/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz b/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz deleted file mode 120000 index 1ba4b05..0000000 --- a/amarok-2.9.75git.20221114T020258~457db492b4.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeifl3poozplj6tbb355xidxenrx53jeypepd4bfk5gsk3r3ft34d2q \ No newline at end of file diff --git a/amarok-2.9.75git.20230322T021226~4f7c3aff99.tar.xz b/amarok-2.9.75git.20230322T021226~4f7c3aff99.tar.xz new file mode 120000 index 0000000..51b45c7 --- /dev/null +++ b/amarok-2.9.75git.20230322T021226~4f7c3aff99.tar.xz @@ -0,0 +1 @@ +/ipfs/bafybeid77k2efywadcqvblzyjxwxmxhulit5oulwp7uz2bq6mmnvfa24ty \ No newline at end of file diff --git a/amarok.changes b/amarok.changes index b6fee2a..5745642 100644 --- a/amarok.changes +++ b/amarok.changes @@ -1,4 +1,27 @@ ------------------------------------------------------------------- +Thu Mar 23 09:26:55 UTC 2023 - christophe@krop.fr + +- Update to version 2.9.75git.20230322T021226~4f7c3aff99: + * Force scheme where KIO copies local files + * cmake: adjust configure file definition position ... + * Edit some NULLs to nullptrs. + * MusicDNSAudioDecoder: add support for ffmpeg 5.0 + * Small improvements to de-deprecation changeset. + * Fix remaining cases of iterator problems. + * Fix a crash. + * Require Qt 5.15+ + * Cleanup deprecated code. + * cmake: Require C++14 + * Shorten onPressAndHold delay + * Enable dragging tracks from the album context applet. + * Add C++ functions for providing selected URL lists. + * Remove Tokens from layout first to avoid bug. + * Fix an old typo causing a missing icon. + * Fix crash when filtering collections. + * Fix path for qca dep + * Use normal KMessageBox method instead of util one + +------------------------------------------------------------------- Mon Nov 14 11:53:34 UTC 2022 - christophe@krop.fr - Update to version 2.9.75git.20221114T020258~457db492b4: diff --git a/amarok.spec b/amarok.spec index eb1b039..1424137 100644 --- a/amarok.spec +++ b/amarok.spec @@ -17,11 +17,10 @@ Name: amarok -Version: 2.9.75git.20221114T020258~457db492b4 +Version: 2.9.75git.20230322T021226~4f7c3aff99 Release: 0 Summary: Media Player License: GPL-2.0-or-later -Group: Productivity/Multimedia/Sound/Players URL: https://amarok.kde.org/ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctrippe@gmx.net -- Support for the changed mimetype for flac files @@ -86,16 +85,9 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(glib-2.0) -%if 0%{suse_version} >= 1550 -# The FFmpeg 5 port isn't ready: https://invent.kde.org/multimedia/amarok/-/merge_requests/45 -BuildRequires: ffmpeg-4-libavcodec-devel -BuildRequires: ffmpeg-4-libavformat-devel -BuildRequires: ffmpeg-4-libavutil-devel -%else BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) -%endif BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libgpod-1.0) BuildRequires: pkgconfig(libmtp) >= 1.0.0 @@ -142,12 +134,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" # E: devel-file-in-non-devel-package rm %{buildroot}%{_kf5_libdir}/libamarok{core,lib,shared,-sqlcollection,-transcoding}.so -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %license COPYING* -%doc AUTHORS ChangeLog README TODO +%doc README %{_kf5_applicationsdir}/org.kde.amarok.desktop %{_kf5_applicationsdir}/org.kde.amarok_containers.desktop %{_kf5_appstreamdir}/org.kde.amarok.*