Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at 2018-03-09 10:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/amarok (Old) and /work/SRC/openSUSE:Factory/.amarok.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "amarok" Fri Mar 9 10:33:37 2018 rev:114 rq:584459 version:2.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/amarok/amarok.changes 2018-01-09 14:46:36.374332094 +0100 +++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes 2018-03-09 10:33:40.502595769 +0100 @@ -1,0 +2,125 @@ +Thu Mar 8 10:59:56 UTC 2018 - [email protected] + +- Update to 2.9.0 +VERSION 2.9.0 + * CHANGES: + * Substitute deprecated MySQL option --myisam-recover for + compatibility with MySQL 5.7+ (kde#354255) + * BUGFIXES: + * Fix integer fields, like length, always showing up as zero in + filter creation dialog (kde#341661) + * Fix background color of the lyrics applet (kde#314854) + * Fix Organize tracks / Guess tags presets not persisted + properly (kde#226144) + * Fix MPRIS2 DesktopEntry name, makes media controls in Plasma + 5.7 taskbar work again (kde#365275) + * Auto-expand after search in Collection Browser works + correctly again (kde#335217) + * Fix crash during MusicBrainz search (kde#328359) +VERSION 2.8.90 + * FEATURES: + * Database configuration dialog now has a "test connection" + button + * Add Service entries for directories (kde#229708) + * Collection Browser scrolls back to its original position when + the filter is cleared (kde#188074) + * Notification Center support on Mac OS X + * Statistics synchronization between Amarok collections and + Amarok 1.4, Amarok 2.x, Apple iTunes, Banshee, Clementine, + and Rhythmbox track databases + * Usability of the Organize Files dialog has been improved + * Wikipedia can now be also used over SSL + * New ASCII Analyzer option in the Analyzer widget + * CHANGES: + * Last played and first played dates now use the same formatter + than in the playlist giving a human readable date such as + "one minute ago" in meta edit dialog + * "Import" button under Configure Amarok -> Local Collection no + longer serves to import statistics from Amarok 1.4 and + iTunes, and has been renamed to "Import batch file" to + reflect the change + * Configure Amarok -> Metadata tab includes new buttons to add + and reconfigure synchronization targets + * When ffmpeg is not available, the Transcode dialog is no + longer skipped; info message is shown instead (kde#317902) + * Amarok now uses some C++11 features. The subset used is + defined by the compilers currently supported by KDE. + * BUGFIXES: + * Fixed longstanding APG zero-length playlist bug (kde#313762, + kde#315206, kde#323945) + * Fix a crash when searching the Icecast directory (kde#334479) + * Correct wrong lowercase for FLAC and MP3 (kde#339495) + * Collection Browser no longer excessively expands the tree + (kde#300557) + * Properly calculate and store Aft tags in mp4 files + (kde#332811) + * Update Progress Slider when restoring from System Tray + (kde#299883) + * Update Jamendo to use new website (kde#331934) + * Allows CollectionBrowser filter to have length of almost 24 + hours (kde#291400) + * Prevent creation of video stream when transcoding to Opus + * Fix crash when starting Amarok with an iPod mounted + (kde#329498) + * Also fetch cover art from xiph-comments with + METADATA_BLOCK_PICTURE tag (kde#328451) + * Fix crash on quit when Amarok is in the middle of fadeout + (kde#325723) + * Prevent shared memory size errors for very large collections + (kde#327812) + * Fix OpenGL related crash (kde#327150) + * Always show preview in Organize Files dialog, hide + complicated options behind a button (kde#327201) + * Fix sound glitch with fade-out on pause and GStreamer + (kde#323729) + * Fix a bug in Organize Collection functionality that could + lead to assertion failures later on (kde#322474) + * Fix an assertion failure when a track in Local Collection is + replaced by another already tracked one (kde#323156) + * Fix failure to start embedded MySQL (with version 5.1 and + MariaDB) (kde#323802) + * Fixed compilation with libc++ (used on OSX and FreeBSD) + (kde#324075) + * Fixed crashes with Intel drivers due to Analyzer applet + (kde#323635) + * Fixed performance problem with large podcast feeds + (kde#283022) + * Fixed issue with Amarok sometimes not finding its plugins + after an upgrade + * Album Artist / Compilation / Disc Number tags are now read + correctly from APE tags (kde#323735) + * Using Shuffle keyboard shortcut no longer causes Amarok to + crash (kde#323614) + * Check for QtBindings at runtime instead. Disable scripts and + display error message if missing (kde#325006) + * Print playlist download errors to the debug log (kde#325120) + * Wikipedia Applet only connect with SSL, so that redirects + are handled correctly (kde#349313) +- Drop patches merged upstream: + * amarok-taglib-compare.patch + * gcc6-workaround.patch + * Skip-qtwebkit-parts.patch + * 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch + * 0002-Don-t-allow-adding-Analyzer-applet-when-not-supporte.patch + * 0003-Optimization-Don-t-draw-more-than-necessary.patch + * 0004-Fix-reading-Album-Artist-Compilation-Disc-Number-in-.patch + * 0005-Sync-playlist-search-config-instantly.patch + * 0006-Don-t-suppress-html-tag-like-characters.patch + * 0007-Fix-performance-issue-with-large-podcast-feeds.patch + * 0008-Clean-up-the-leftover-of-strigi-removal.patch + * 0009-Fix-Ampache-plugin-connections.patch + * Enable_Wikipedia_over_SSL.patch + * amarok-ffmpeg3.0.patch + * Fix-for-infinite-loop-with-some-Audio-CDs.patch + * Fix-MPRIS2-DesktopEntry-value.patch + * Fix-crash-during-musicbrainz-search.patch + * amarok-2.8.0-find_mysql.patch +- Don't disable QtWebKit on Leap 42, it's available there +- Build with libqca2 again, it supports OpenSSL 1.1 now +- Drop load-scrips-without-qca.patch, no longer necessary +- Drop revert_solid_workaround.diff, it shouldn't be needed +- Add Fix-build-with-gcc6.patch to make it compile on Leap 42 +- Adjust initial-preference.diff and flac_mimetype_bnc671581.diff +- Update Source Url + +------------------------------------------------------------------- Old: ---- 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch 0002-Don-t-allow-adding-Analyzer-applet-when-not-supporte.patch 0003-Optimization-Don-t-draw-more-than-necessary.patch 0004-Fix-reading-Album-Artist-Compilation-Disc-Number-in-.patch 0005-Sync-playlist-search-config-instantly.patch 0006-Don-t-suppress-html-tag-like-characters.patch 0007-Fix-performance-issue-with-large-podcast-feeds.patch 0008-Clean-up-the-leftover-of-strigi-removal.patch 0009-Fix-Ampache-plugin-connections.patch Enable_Wikipedia_over_SSL.patch Fix-MPRIS2-DesktopEntry-value.patch Fix-crash-during-musicbrainz-search.patch Fix-for-infinite-loop-with-some-Audio-CDs.patch Skip-qtwebkit-parts.patch amarok-2.8.0-find_mysql.patch amarok-2.8.0.tar.bz2 amarok-ffmpeg3.0.patch amarok-taglib-compare.patch gcc6-workaround.patch load-scrips-without-qca.patch revert_solid_workaround.diff New: ---- Fix-build-with-gcc6.patch amarok-2.9.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.s4Nd2Y/_old 2018-03-09 10:33:43.482488490 +0100 +++ /var/tmp/diff_new_pack.s4Nd2Y/_new 2018-03-09 10:33:43.486488346 +0100 @@ -1,7 +1,7 @@ # # spec file for package amarok # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,60 +19,23 @@ # Make sure to require at least the version used for linking to avoid undefined symbols at runtime %define required_libtag %(rpm -qf `ldd $(type -P tagreader) | awk '/libtag.so.[0-9]/{ print $3 }'`) Name: amarok -Version: 2.8.0 +Version: 2.9.0 Release: 0 Summary: Media Player for KDE License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Url: http://amarok.kde.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz # for reproducible builds Source99: %{name}.changes # PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 [email protected] -- Increase initial preference to be used for audio files instead of Kaffeine Patch1: initial-preference.diff # PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 [email protected] -- Support for the changed mimetype for flac files Patch2: flac_mimetype_bnc671581.diff -# PATCH-FIX-UPSTREAM revert_solid_workaround.diff -Patch3: revert_solid_workaround.diff -Patch4: amarok-taglib-compare.patch -# PATCH-FIX-OPENSUSE gcc6-workaround.patch -- Workaround an errors seen by GCC6 (PR71273) -Patch5: gcc6-workaround.patch # PATCH-FIX-OPENSUSE -Patch6: Skip-qtwebkit-parts.patch -# PATCH-FIX-UPSTREAM 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch -- avoids adding the analyzer applet on phonon backends that don't support it (e.g. vlc) -Patch100: 0001-Don-t-add-the-analyzer-applet-when-Phonon-doesn-t-su.patch -# PATCH-FIX-UPSTREAM 0002-Don-t-allow-adding-Analyzer-applet-when-not-supporte.patch -- Don't allow adding Analyzer applet when not supported. -# Also now shows an error message explaining why it can't be used. -Patch101: 0002-Don-t-allow-adding-Analyzer-applet-when-not-supporte.patch -# PATCH-FIX-UPSTREAM 0003-Optimization-Don-t-draw-more-than-necessary.patch -- optimization for Analyzer applet -Patch102: 0003-Optimization-Don-t-draw-more-than-necessary.patch -# PATCH-FIX-UPSTREAM 0004-Fix-reading-Album-Artist-Compilation-Disc-Number-in-.patch -- fixes reading APE tags (kde#323735) -Patch103: 0004-Fix-reading-Album-Artist-Compilation-Disc-Number-in-.patch -# PATCH-FIX-UPSTREAM 0005-Sync-playlist-search-config-instantly.patch -- kde#324295 -Patch104: 0005-Sync-playlist-search-config-instantly.patch -# PATCH-FIX-UPSTREAM 0006-Don-t-suppress-html-tag-like-characters.patch -- kde#324614 -Patch105: 0006-Don-t-suppress-html-tag-like-characters.patch -# PATCH-FIX-UPSTREAM 0007-Fix-performance-issue-with-large-podcast-feeds.patch -- kde#283022 -Patch106: 0007-Fix-performance-issue-with-large-podcast-feeds.patch -# PATCH-FIX-UPSTREAM: 0008-Clean-up-the-leftover-of-strigi-removal.patch - remove unneded Strigi reference -Patch107: 0008-Clean-up-the-leftover-of-strigi-removal.patch -# PATCH-FIX-OPENSUSE 0009-Fix-Ampache-plugin-connections.patch - Unbreak Ampache plugin login (under review upstream) -Patch108: 0009-Fix-Ampache-plugin-connections.patch -# PATCH-FIX-UPSTREAM Enable_Wikipedia_over_SSL.patch boo#934730, kde#349313 - Unbreak Wikipedia applet by enabling SSL -Patch109: Enable_Wikipedia_over_SSL.patch -Patch110: amarok-ffmpeg3.0.patch -# PATCH-FIX-UPSTREAM Fix-for-infinite-loop-with-some-Audio-CDs.patch kde#339190 -- Fix for the infinite loop in case a home-burned or old audio CD is inserted -Patch111: Fix-for-infinite-loop-with-some-Audio-CDs.patch -# PATCH-FIX-UPSTREAM Fix-MPRIS2-DesktopEntry-value.patch, necessary for working media controls in taskbar plasma 5.7 -- kde#565275 -Patch112: Fix-MPRIS2-DesktopEntry-value.patch -# PATCH-FIX-UPSTREAM Fix-crash-during-musicbrainz-search.patch kde#328359 -- Fix a possible crash when looking up metadata on MusicBrainz -Patch113: Fix-crash-during-musicbrainz-search.patch -# PATCH-FIX-UPSTREAM amarok-2.8.0-find_mysql.patch -- Fix obvious typo in paths definition in find_library() -Patch114: amarok-2.8.0-find_mysql.patch -# PATCH-FIX-OPENSUSE -Patch200: load-scrips-without-qca.patch -# PATCH-FIX-OPENSUSE -Patch201: disable-web-plugins-by-default.patch +Patch3: disable-web-plugins-by-default.patch +# PATCH-FIX-UPSTREAM +Patch4: Fix-build-with-gcc6.patch # Required for the fdupes macro BuildRequires: fdupes BuildRequires: gdk-pixbuf-devel @@ -86,10 +49,8 @@ BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: libofa-devel -#!BuildIgnore: libopenssl-1_0_0-devel -%if 0%{?suse_version} < 1330 BuildRequires: openssl-devel -%endif +BuildRequires: libqca2-devel BuildRequires: libqjson-devel BuildRequires: libqt4-devel >= 4.8.2 BuildRequires: libxml2-devel @@ -139,25 +100,6 @@ %patch2 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p0 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 -%patch114 -p1 -%patch200 -p1 -%patch201 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y') @@ -168,7 +110,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif # force not to use MYSQLCONFIG as mariadb_config provided by mariadb-connector-c doesn't support "--libmysqld-libs" option anymore +%if 0%{?suse_version} >= 1500 +%cmake_kde4 -d build -- -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF -DWITH_QTWEBKIT=OFF +%else %cmake_kde4 -d build -- -DMYSQLCONFIG_EXECUTABLE:BOOL=OFF +%endif %make_jobs %install @@ -200,7 +146,7 @@ done %endif -%suse_update_desktop_file amarok Qt KDE AudioVideo Audio Player +%suse_update_desktop_file org.kde.amarok Qt KDE AudioVideo Audio Player %suse_update_desktop_file -r amzdownloader Qt KDE AudioVideo Audio Player %fdupes -s %{buildroot} @@ -237,9 +183,10 @@ %{_kde4_libdir}/libamarokocsclient.so.* %{_kde4_libdir}/libamarokpud.so.* %{_kde4_libdir}/libamarokshared.so.* +%{_kde4_libdir}/libampache_account_login.so %{_kde4_libdir}/libamarok_service_lastfm_shared.so -%{_kde4_applicationsdir}/amarok.desktop -%{_kde4_applicationsdir}/amarok_containers.desktop +%{_kde4_applicationsdir}/org.kde.amarok.desktop +%{_kde4_applicationsdir}/org.kde.amarok_containers.desktop %{_kde4_applicationsdir}/amzdownloader.desktop %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml @@ -248,6 +195,8 @@ %{_datadir}/dbus-1/interfaces/org.kde.amarok.Collection.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml %{_datadir}/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/org.kde.amarok.appdata.xml %{_datadir}/mime/packages/amzdownloader.xml %{_kde4_iconsdir}/hicolor/*/apps/amarok.* %{_kde4_iconsdir}/hicolor/*/actions/download.* ++++++ Fix-build-with-gcc6.patch ++++++ >From f047cd8219d9537bb33bba3883bedf6231a0ed5f Mon Sep 17 00:00:00 2001 From: Heiko Becker <[email protected]> Date: Wed, 7 Mar 2018 22:28:52 +0100 Subject: Fix build with gcc6 __attribute__ ((fallthrough)) is only available since gcc7. Despite removing it I saw now warning because gcc recognizes the comment. --- src/playlist/proxymodels/SortAlgorithms.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/playlist/proxymodels/SortAlgorithms.cpp b/src/playlist/proxymodels/SortAlgorithms.cpp index d3e0a3d..aad7bf6 100644 --- a/src/playlist/proxymodels/SortAlgorithms.cpp +++ b/src/playlist/proxymodels/SortAlgorithms.cpp @@ -95,7 +95,6 @@ multilevelLessThan::operator()( const QAbstractItemModel* sourceModel, return ( compareResult < 0 ) != inverted; // Fall through to sorting by album artist if albums have same name - __attribute__ ((fallthrough)); } case Playlist::AlbumArtist: { -- cgit v0.11.2 ++++++ flac_mimetype_bnc671581.diff ++++++ --- /var/tmp/diff_new_pack.s4Nd2Y/_old 2018-03-09 10:33:43.534486618 +0100 +++ /var/tmp/diff_new_pack.s4Nd2Y/_new 2018-03-09 10:33:43.534486618 +0100 @@ -1,8 +1,8 @@ -Index: src/amarok.desktop +Index: src/org.kde.amarok.desktop =================================================================== ---- src/amarok.desktop.orig -+++ src/amarok.desktop -@@ -184,7 +184,7 @@ Comment[zh_TW]=Amarok - 重新探索您 +--- src/org.kde.amarok.desktop.orig ++++ src/org.kde.amarok.desktop +@@ -188,7 +188,7 @@ Comment[zh_TW]=Amarok - 重新探索您 Icon=amarok # Add pure audio formats here, for other formats see amarok_*.desktop files # See bug 242292 @@ -10,4 +10,4 @@ +MimeType=audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg; X-DocPath=amarok/index.html X-KDE-Keywords=music,podcast - X-KDE-Keywords[ca]=música,podcast + X-KDE-Keywords[bs]=muzika,podemisija ++++++ initial-preference.diff ++++++ --- /var/tmp/diff_new_pack.s4Nd2Y/_old 2018-03-09 10:33:43.546486186 +0100 +++ /var/tmp/diff_new_pack.s4Nd2Y/_new 2018-03-09 10:33:43.546486186 +0100 @@ -1,5 +1,5 @@ ---- src/amarok.desktop 2013-01-17 13:53:54.000000000 +0100 -+++ src/amarok.desktop 2013-01-18 06:04:57.679101847 +0100 +--- src/org.kde.amarok.desktop 2013-01-17 13:53:54.000000000 +0100 ++++ src/org.kde.amarok.desktop 2013-01-18 06:04:57.679101847 +0100 @@ -224,5 +224,6 @@ X-KDE-Keywords[zh_CN]=music,podcast,音乐,播客 X-KDE-Keywords[zh_TW]=music,podcast
