Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Steve Cossette
43f305e6af Revert back to 3.2.2 2025-10-30 19:51:03 -04:00
5 changed files with 139 additions and 160 deletions

1
.gitignore vendored
View file

@ -11,4 +11,3 @@
/amarok-3.2.0.tar.xz
/amarok-3.2.1.tar.xz
/amarok-3.2.2.tar.xz
/amarok-3.3.1.tar.xz

View file

@ -1,9 +1,9 @@
%global __provides_exclude_from ^%{_kf6_qmldir}/org/kde/amarok/.*\.so$
%global __provides_exclude_from ^%{_kf5_qmldir}/org/kde/amarok/.*\.so$
Name: amarok
Summary: Media player
Version: 3.3.1
Release: 2%{?dist}
Version: 3.2.2
Release: 3%{?dist}
# KDE e.V. may determine that future GPL versions are accepted
License: GPL-2.0-only OR GPL-3.0-only
@ -11,80 +11,73 @@ Url: https://amarok.kde.org/
%if 0%{?commitdate}
Source0: https://invent.kde.org/multimedia/amarok/-/archive/%{commit}/amarok-%{commit}.tar.bz2
%else
Source0: https://download.kde.org/%{stable_kf6}/amarok/%{version}/amarok-%{version}.tar.xz
Source0: https://download.kde.org/%{stable_kf5}/amarok/%{version}/amarok-%{version}.tar.xz
%endif
# partially revert https://invent.kde.org/multimedia/amarok/-/commit/c095ebf8780b693605ab23efa4eae6f4dd18fc5e
# it causes amarok to crash on launch for some reason
Patch1: revert.patch
# Version 1.2.0 is a new fork which just bumps the version for Qt6 and includes
# one patch. Fedora's 1.1.0 is a snapshot from the old fork which includes Qt6
# and applies the same patch.
Patch2: liblastfm-version.patch
# Needed because not every distro installs mygpo-qt6 under the same path.
# For instance, Fedora namespaces qt6
Patch10: fix-mygpo-qt6-compilation.patch
# Needed because not every distro installs mygpo-qt5 under the same path.
# For instance, Fedora namespaces qt5
Patch10: fix-mygpo-qt5-compilation.patch
BuildRequires: desktop-file-utils
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: kf6-rpm-macros
BuildRequires: kf5-rpm-macros
BuildRequires: libappstream-glib
BuildRequires: perl-generators
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6DBus)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6QuickWidgets)
BuildRequires: cmake(Qt6Qml)
BuildRequires: cmake(Qt6Sql)
BuildRequires: cmake(Qt6Svg)
BuildRequires: cmake(Qt6Test)
BuildRequires: cmake(Qt6Widgets)
BuildRequires: cmake(Qt6Xml)
BuildRequires: cmake(Qt6QuickControls2)
BuildRequires: cmake(Qt6SvgWidgets)
%ifarch %{qt6_qtwebengine_arches}
BuildRequires: cmake(Qt6WebEngineWidgets)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5QuickWidgets)
BuildRequires: cmake(Qt5Qml)
BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Svg)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5Xml)
BuildRequires: cmake(Qt5QuickControls2)
%ifarch %{qt5_qtwebengine_arches}
BuildRequires: cmake(Qt5WebEngine)
%endif
BuildRequires: cmake(Qt6UiTools)
BuildRequires: cmake(Qt5UiTools)
BuildRequires: cmake(KF6Archive)
BuildRequires: cmake(KF6Codecs)
BuildRequires: cmake(KF6Config)
BuildRequires: cmake(KF6ConfigWidgets)
BuildRequires: cmake(KF6CoreAddons)
BuildRequires: cmake(KF6Crash)
BuildRequires: cmake(KF6DBusAddons)
BuildRequires: cmake(KF6DNSSD)
BuildRequires: cmake(KF6DocTools)
BuildRequires: cmake(KF6GlobalAccel)
BuildRequires: cmake(KF6GuiAddons)
BuildRequires: cmake(KF6I18n)
BuildRequires: cmake(KF6IconThemes)
BuildRequires: cmake(KF6KCMUtils)
BuildRequires: cmake(KF6KIO)
BuildRequires: cmake(KF6Notifications)
BuildRequires: cmake(KF6Package)
BuildRequires: cmake(KF6Solid)
BuildRequires: cmake(KF6TextEditor)
BuildRequires: cmake(KF6TextWidgets)
BuildRequires: cmake(KF6ThreadWeaver)
BuildRequires: cmake(KF6WidgetsAddons)
BuildRequires: cmake(KF6WindowSystem)
BuildRequires: cmake(KF6ColorScheme)
BuildRequires: cmake(KF6KCMUtils)
BuildRequires: cmake(KF6StatusNotifierItem)
BuildRequires: cmake(KF6Kirigami)
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Attica)
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5Declarative)
BuildRequires: cmake(KF5DNSSD)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5GlobalAccel)
BuildRequires: cmake(KF5GuiAddons)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KCMUtils)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5Package)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5TextEditor)
BuildRequires: cmake(KF5ThreadWeaver)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5Kirigami2)
# gpodder, lastfm
BuildRequires: cmake(KF6Wallet)
BuildRequires: cmake(KF5Wallet)
BuildRequires: pkgconfig(gstreamer-audio-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(taglib) >= 1.12
BuildRequires: pkgconfig(taglib) >= 1.6
BuildRequires: pkgconfig(taglib-extras) >= 1.0.1
BuildRequires: cmake(Phonon4Qt5)
BuildRequires: pkgconfig(libmariadb)
BuildRequires: pkgconfig(mariadb)
BuildRequires: mariadb-embedded-devel
@ -92,9 +85,10 @@ BuildRequires: ffmpeg-free-devel
BuildRequires: fftw-devel
%if 0%{?fedora}
# dependencies not available in RHEL or EPEL
BuildRequires: liblastfm-qt6-devel >= 1.1.0
BuildRequires: cmake(Mygpo-qt6) >= 1.2.0
BuildRequires: pkgconfig(libmtp) >= 1.0.0
BuildRequires: liblastfm-qt5-devel
BuildRequires: libofa-devel
BuildRequires: cmake(Mygpo-qt5)
BuildRequires: pkgconfig(libmtp) >= 0.3.0
BuildRequires: pkgconfig(libgpod-1.0) >= 0.7.0
# only used together with libgpod
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@ -108,15 +102,20 @@ BuildRequires: pkgconfig(glib-2.0) pkgconfig(gobject-2.0)
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-utils = %{version}-%{release}
Requires: kf6-filesystem
Requires: kf5-filesystem
# QML module dependencies
Requires: kf6-kirigami%{?_isa}
Requires: kf5-kirigami2%{?_isa}
Requires: qt5-qtquickcontrols2%{?_isa}
Recommends: audiocd-kio
Recommends: kf5-audiocd-kio
%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10
Recommends: kio-extras-kf5
%else
Recommends: kio-extras
%ifarch %{qt6_qtwebengine_arches}
%endif
%ifarch %{qt5_qtwebengine_arches}
# Wikipedia QML plugin
Recommends: qt6-qtwebengine%{?_isa}
Recommends: qt5-qtwebengine%{?_isa}
%endif
%if 0%{?fedora}
Recommends: ifuse
@ -159,10 +158,10 @@ sed -i -e 's|/usr/bin/mysqld|%{_libexecdir}/mysqld|' src/importers/amarok/Amarok
%build
%if 0%{?flatpak}
# find /app-built libmygpo-qt headers
CXXFLAGS="$CXXFLAGS -I%{_includedir}/qt6"
CXXFLAGS="$CXXFLAGS -I%{_includedir}/qt5"
%endif
# force non-use of MYSQLCONFIG, to avoid (potential bogus) stuff from: mysql_config --libmysqld-libs
%{cmake_kf6} \
%{cmake_kf5} \
%if ! 0%{?fedora}
-DWITH_GPODDER=OFF -DWITH_IPOD=OFF -DWITH_LASTFM=OFF \
%endif
@ -179,81 +178,76 @@ CXXFLAGS="$CXXFLAGS -I%{_includedir}/qt6"
%check
appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml
desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}*.desktop
appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}*.desktop
%files -f amarok.lang
%doc AUTHORS ChangeLog README
%license COPYING
%{_qt6_settingsdir}/amarok_homerc
%{_kf6_bindir}/amarok
%{_kf6_bindir}/amarok_afttagger
%{_kf6_datadir}/amarok/
%{_kf6_datadir}/applications/org.kde.amarok.desktop
%{_kf6_datadir}/applications/org.kde.amarok_containers.desktop
%{_kf6_datadir}/config.kcfg/amarokconfig.kcfg
%{_kf6_datadir}/dbus-1/interfaces/*.xml
%{_kf6_datadir}/dbus-1/services/org.kde.amarok.service
%{_kf6_datadir}/icons/hicolor/*/*/*
%{_kf6_datadir}/kio/servicemenus/amarok_append.desktop
%{_kf6_datadir}/knotifications6/amarok.notifyrc
%{_kf6_datadir}/kpackage/amarok
%{_kf6_datadir}/kpackage/genericqml/org.kde.amarok.context
%{_kf6_datadir}/solid/actions/amarok-play-audiocd.desktop
%{_kf6_metainfodir}/org.kde.amarok.*.xml
%{_kf6_qmldir}/org/kde/amarok
%{_kf6_qtplugindir}/amarok_collection-audiocdcollection.so
%{_kf6_qtplugindir}/amarok_collection-daapcollection.so
%{_qt5_settingsdir}/amarok_homerc
%{_kf5_bindir}/amarok
%{_kf5_bindir}/amarok_afttagger
%{_kf5_datadir}/amarok/
%{_kf5_datadir}/applications/org.kde.amarok.desktop
%{_kf5_datadir}/applications/org.kde.amarok_containers.desktop
%{_kf5_datadir}/config.kcfg/amarokconfig.kcfg
%{_kf5_datadir}/dbus-1/interfaces/*.xml
%{_kf5_datadir}/dbus-1/services/org.kde.amarok.service
%{_kf5_datadir}/icons/hicolor/*/*/*
%{_kf5_datadir}/knotifications5/amarok.notifyrc
%{_kf5_datadir}/kpackage/amarok
%{_kf5_datadir}/kpackage/genericqml/org.kde.amarok.context
%{_kf5_datadir}/kservices5/ServiceMenus/amarok_append.desktop
%{_kf5_datadir}/kservices5/amarok*
%{_kf5_datadir}/solid/actions/amarok-play-audiocd.desktop
%{_kf5_metainfodir}/org.kde.amarok.*.xml
%{_kf5_qmldir}/org/kde/amarok
%{_kf5_qtplugindir}/amarok_collection-audiocdcollection.so
%{_kf5_qtplugindir}/amarok_collection-daapcollection.so
%if 0%{?fedora}
%{_kf6_qtplugindir}/amarok_collection-ipodcollection.so
%{_kf6_qtplugindir}/amarok_collection-mtpcollection.so
%{_kf5_qtplugindir}/amarok_collection-ipodcollection.so
%{_kf5_qtplugindir}/amarok_collection-mtpcollection.so
%endif
%{_kf6_qtplugindir}/amarok_collection-mysqlcollection.so
%{_kf6_qtplugindir}/amarok_collection-playdarcollection.so
%{_kf6_qtplugindir}/amarok_collection-umscollection.so
%{_kf6_qtplugindir}/amarok_importer-amarok.so
%{_kf6_qtplugindir}/amarok_importer-banshee.so
%{_kf6_qtplugindir}/amarok_importer-clementine.so
%{_kf6_qtplugindir}/amarok_importer-fastforward.so
%{_kf6_qtplugindir}/amarok_importer-itunes.so
%{_kf6_qtplugindir}/amarok_importer-rhythmbox.so
%{_kf6_qtplugindir}/amarok_service_*.so
%{_kf6_qtplugindir}/amarok_storage-mysqlestorage.so
%{_kf6_qtplugindir}/amarok_storage-mysqlserverstorage.so
%{_kf6_qtplugindir}/kcm_amarok_service*.so
%{_kf5_qtplugindir}/amarok_collection-mysqlcollection.so
%{_kf5_qtplugindir}/amarok_collection-playdarcollection.so
%{_kf5_qtplugindir}/amarok_collection-umscollection.so
%{_kf5_qtplugindir}/amarok_importer-amarok.so
%{_kf5_qtplugindir}/amarok_importer-banshee.so
%{_kf5_qtplugindir}/amarok_importer-clementine.so
%{_kf5_qtplugindir}/amarok_importer-fastforward.so
%{_kf5_qtplugindir}/amarok_importer-itunes.so
%{_kf5_qtplugindir}/amarok_importer-rhythmbox.so
%{_kf5_qtplugindir}/amarok_service_*.so
%{_kf5_qtplugindir}/amarok_storage-mysqlestorage.so
%{_kf5_qtplugindir}/amarok_storage-mysqlserverstorage.so
%{_kf5_qtplugindir}/kcm_amarok_service*.so
%files libs
%{_kf6_libdir}/libamarokcore.so.1*
%{_kf6_libdir}/libamaroklib.so.1*
%{_kf6_libdir}/libamarokshared.so.1*
%{_kf6_libdir}/libamarok-sqlcollection.so.1*
%{_kf6_libdir}/libamarok-transcoding.so.1*
%{_kf6_libdir}/libampache_account_login.so
%{_kf6_libdir}/libamarok-sqlcollection.so
%{_kf6_libdir}/libamarok-transcoding.so
%{_kf6_libdir}/libamarokcore.so
%{_kf6_libdir}/libamaroklib.so
%{_kf6_libdir}/libamarokpud.so
%{_kf6_libdir}/libamarokshared.so
%{_kf5_libdir}/libamarokcore.so.1*
%{_kf5_libdir}/libamaroklib.so.1*
%{_kf5_libdir}/libamarokshared.so.1*
%{_kf5_libdir}/libamarok-sqlcollection.so.1*
%{_kf5_libdir}/libamarok-transcoding.so.1*
%{_kf5_libdir}/libampache_account_login.so
%{_kf5_libdir}/libamarok-sqlcollection.so
%{_kf5_libdir}/libamarok-transcoding.so
%{_kf5_libdir}/libamarokcore.so
%{_kf5_libdir}/libamaroklib.so
%{_kf5_libdir}/libamarokpud.so
%{_kf5_libdir}/libamarokshared.so
%if 0%{?fedora}
%{_kf6_libdir}/libamarok_service_lastfm_config.so
%{_kf6_libdir}/libgpodder_service_config.so
%{_kf5_libdir}/libamarok_service_lastfm_config.so
%{_kf5_libdir}/libgpodder_service_config.so
%endif
%files utils -f amarokcollectionscanner_qt.lang
%{_kf6_bindir}/amarokcollectionscanner
%{_kf5_bindir}/amarokcollectionscanner
%files doc -f amarok-doc.lang
%changelog
* Thu Oct 30 2025 Steve Cossette <farchord@gmail.com> - 3.3.1-2
- Bump for Qt 6.10 rebuild
* Thu Oct 23 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 3.3.1-1
- 3.3.1
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

View file

@ -6,7 +6,7 @@ index abe2c9f2b6..8bd28f82c1 100644
#include "core/playlists/PlaylistProvider.h"
#include "core/podcasts/PodcastMeta.h"
-#include <mygpo-qt6/ApiRequest.h>
-#include <mygpo-qt5/ApiRequest.h>
+#include <mygpo-qt/ApiRequest.h>
namespace Podcasts {
@ -19,7 +19,7 @@ index c56ec1942f..2b65e5d5df 100644
#define GPODDERPODCASTREQUESTHANDLER_H_
#include "GpodderServiceModel.h"
-#include <mygpo-qt6/PodcastList.h>
-#include <mygpo-qt5/PodcastList.h>
+#include <mygpo-qt/PodcastList.h>
#include <QModelIndex>
@ -32,7 +32,7 @@ index 91323fb770..1c5fd45c0c 100644
#define GPODDERPODCASTTREEITEM_H_
#include "GpodderTreeItem.h"
-#include <mygpo-qt6/Podcast.h>
-#include <mygpo-qt5/Podcast.h>
+#include <mygpo-qt/Podcast.h>
class GpodderPodcastTreeItem: public GpodderTreeItem
@ -45,8 +45,8 @@ index 9551a97a69..bfddcb1ff7 100644
#include "core/podcasts/PodcastProvider.h"
#include "core/podcasts/PodcastReader.h"
#include "GpodderPodcastMeta.h"
-#include <mygpo-qt6/ApiRequest.h>
-#include <mygpo-qt6/EpisodeActionList.h>
-#include <mygpo-qt5/ApiRequest.h>
-#include <mygpo-qt5/EpisodeActionList.h>
+#include <mygpo-qt/ApiRequest.h>
+#include <mygpo-qt/EpisodeActionList.h>
#include "playlistmanager/file/KConfigSyncRelStore.h"
@ -60,8 +60,8 @@ index b2d51ea807..841942e9d7 100644
#include "GpodderServiceModel.h"
#include "GpodderServiceView.h"
#include "GpodderSortFilterProxyModel.h"
-#include <mygpo-qt6/ApiRequest.h>
-#include <mygpo-qt6/Podcast.h>
-#include <mygpo-qt5/ApiRequest.h>
-#include <mygpo-qt5/Podcast.h>
+#include <mygpo-qt/ApiRequest.h>
+#include <mygpo-qt/Podcast.h>
#include "playlistmanager/PlaylistManager.h"
@ -75,8 +75,8 @@ index 6eb979ca07..76bc61da7b 100644
#define GPODDERSERVICEMODEL_H_
#include "GpodderTreeItem.h"
-#include <mygpo-qt6/ApiRequest.h>
-#include <mygpo-qt6/TagList.h>
-#include <mygpo-qt5/ApiRequest.h>
-#include <mygpo-qt5/TagList.h>
+#include <mygpo-qt/ApiRequest.h>
+#include <mygpo-qt/TagList.h>
#include "NetworkAccessManagerProxy.h"
@ -86,15 +86,15 @@ diff --git a/src/services/gpodder/GpodderServiceSettings.h b/src/services/gpodde
index 5d75f07e52..e7f773ae02 100644
--- a/src/services/gpodder/GpodderServiceSettings.h
+++ b/src/services/gpodder/GpodderServiceSettings.h
@@ -22,7 +22,7 @@
@@ -23,7 +23,7 @@
#include "GpodderServiceConfig.h"
-#include <mygpo-qt6/ApiRequest.h>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-#include <mygpo-qt5/ApiRequest.h>
+#include <mygpo-qt/ApiRequest.h>
#include <KCModule>
#else
#include <mygpo-qt6/ApiRequest.h>
#endif
diff --git a/src/services/gpodder/GpodderTagTreeItem.h b/src/services/gpodder/GpodderTagTreeItem.h
index 63cc965d89..8941cb8fc3 100644
--- a/src/services/gpodder/GpodderTagTreeItem.h
@ -103,7 +103,7 @@ index 63cc965d89..8941cb8fc3 100644
#define GPODDERTAGTREEITEM_H_
#include "GpodderTreeItem.h"
-#include <mygpo-qt6/Tag.h>
-#include <mygpo-qt5/Tag.h>
+#include <mygpo-qt/Tag.h>
#include <QObject>
@ -116,8 +116,8 @@ index 642e1cb371..ce1d4d070a 100644
#ifndef GPODDERTREEITEM_H_
#define GPODDERTREEITEM_H_
-#include <mygpo-qt6/ApiRequest.h>
-#include <mygpo-qt6/TagList.h>
-#include <mygpo-qt5/ApiRequest.h>
-#include <mygpo-qt5/TagList.h>
+#include <mygpo-qt/ApiRequest.h>
+#include <mygpo-qt/TagList.h>

View file

@ -1,14 +0,0 @@
diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
--- ./CMakeLists.txt.orig 2025-10-23 13:37:33.366264984 -0400
+++ ./CMakeLists.txt 2025-10-23 14:05:34.305924931 -0400
@@ -199,8 +199,8 @@ endif()
add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_TO_ASCII)
if( WITH_LASTFM )
- find_package( LibLastFm 1.2.0 )
- set( LIBLASTFM_MIN_VERSION "1.2.0" )
+ find_package( LibLastFm 1.1.0 )
+ set( LIBLASTFM_MIN_VERSION "1.1.0" )
if( LIBLASTFM_FOUND )
if ( ${LIBLASTFM_MIN_VERSION} VERSION_LESS ${LIBLASTFM_VERSION} )
set( LIBLASTFM_FOUND TRUE )

View file

@ -1 +1 @@
SHA512 (amarok-3.3.1.tar.xz) = d39f974f05d71ea11d5aab71fb5f51ac8273f989f10a79d8b630f54c4011b791f8e8e7bc958d529d6a1cfa8f0f6b323b6ffb9707e7bf10dc1cd375b3092a4821
SHA512 (amarok-3.2.2.tar.xz) = 918b4fd03a2de717cb1f5968e4ba3eda391c881de384ebabeec423303e84ac6f5a8dbbb8816668d3de52c77d57f1ab9fef6580a8111a9507c9082a8ca25097aa