diff --git a/0001-Fix-build-with-taglib-2.patch b/0001-Fix-build-with-taglib-2.patch deleted file mode 100644 index f778a1b..0000000 --- a/0001-Fix-build-with-taglib-2.patch +++ /dev/null @@ -1,41 +0,0 @@ -From db3bab2c24c3d75a11ddbbe3d2d8bfc920f19299 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Wed, 24 Jan 2024 17:40:16 +0100 -Subject: [PATCH] Fix build with taglib 2 - -Drop unused includes that no longer exist - -(cherry picked from commit 5389ae860ca4c672c022cad7e51c48bc699fcba3) ---- - mediafiles.cpp | 1 - - mediafiles.h | 2 -- - 2 files changed, 3 deletions(-) - -diff --git a/mediafiles.cpp b/mediafiles.cpp -index 8a4fc38f..086bf48d 100644 ---- a/mediafiles.cpp -+++ b/mediafiles.cpp -@@ -29,7 +29,6 @@ - #include - - #include --#include - #include - #include - #include -diff --git a/mediafiles.h b/mediafiles.h -index 81ab4b8a..41decb34 100644 ---- a/mediafiles.h -+++ b/mediafiles.h -@@ -28,8 +28,6 @@ namespace TagLib { - class File; - } - --#include -- - /** - * A namespace for file JuK's file related functions. The goal is to hide - * all specific knowledge of mimetypes and file extensions here. --- -2.43.1 - diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/juk-23.08.4.tar.xz b/juk-23.08.4.tar.xz deleted file mode 100644 index 1f62266..0000000 --- a/juk-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:595d2138756ab360929d3f9fc9faca0c2f65090511e86847105e8720512029ab -size 2081852 diff --git a/juk-23.08.4.tar.xz.sig b/juk-23.08.4.tar.xz.sig deleted file mode 100644 index d454988..0000000 --- a/juk-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7wgACgkQu0YzUNbv -Me/igQ/+Igb4YOuDYHksNcJaCon+yBjKwRI3D8LR9XDQ4y7wsbwuPZswS3LJiSsT -YjPbzpZ0FW/ewJ2EUcWIpYUsDdsB+mRkUWibIQQ9lL6opNN8WTL5nA7yoiPtn59o -MSZprzqfOd+nK0r92TqtPKwx4aPCaIXoCDQq75xfiKAZOGhA/jYy0wtyrjsla/R+ -RHnn1ATWy+xqtxhqjagBl87u5sx9YNsy3zXlgA0AD/ykdYk0up0jsVixWDg673/G -Pie42z/2SmnitE3ZTLJA6bDCn19/HUdpgjOcC5RiflNiXEvOW6LPRMk39BSMEhdk -+z7H3AJ2ah/aU1saNsrmyEFk1V4C/HCgngHeuqltV1GbCiH/nMvwlvWEBxR2Zih+ -0EDLWtFKHBLRXZ5aEKgnWXxRyvlxq47bFgfcDlle6//rXZT3WWqhnWs52SAwuC7v -+Ykd/c0UZkQBw5PbZDsQ2/JJev2a7np1UApaB7jeAvt29auwHHb6a7J3AkShB6Wg -POnLotHda51h3B6yJI2dD9FRKj6Ycw0EK2DuHD0DXgyi7cf2RP7uxKtWjWhuaFCQ -/vnwX8vTiWS+WjuSftGsCCqmuF++/6XAHWNvuhQR6PFDec7BUH9XPSck/6InaCFj -wANVqnRV9CBatzcbz3i+xqA9vRJtphPJ3qlLOhgLoSJKDdUi3yo= -=TVKT ------END PGP SIGNATURE----- diff --git a/juk-24.02.0.tar.xz b/juk-24.02.0.tar.xz new file mode 100644 index 0000000..f903224 --- /dev/null +++ b/juk-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62f0dfcacbd3249f2f9b13f151d4d16ee2c29675af049c409edeacb7e9f18881 +size 2018400 diff --git a/juk-24.02.0.tar.xz.sig b/juk-24.02.0.tar.xz.sig new file mode 100644 index 0000000..083cb75 --- /dev/null +++ b/juk-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrEAACgkQu0YzUNbv +Me9V+RAAhDjDHDo3uVl+kLsqwC/TlsyPmJaRDDdVtBM7gcFTFUH7rgak0qxB+U2A +lzQiWyJLzTskDPLpFRXG/7xxM3uuHnvxsLbmWABiLAGQ3/h9aYcsVT6/m1OrXlRL +2TIOrh5+gYATHDe6GB9uFEt34ZKMRIfBSXUW58MAKqQx8+EOhaaac/5JpHSePdkd +hHnrV1hRNyKwBcpllo6W2kn6Xnitq6qT8eClOHO6IjNSIPwwrFe1PaxbJI86nKzk +wygSeGz/sPhZA+iJBct3gh/1QemKywH9oCotMWQb26gbVnCfUOQqnaVUkhAIGVgj +/BkHXmIrqCtR1Yjq/GKnJWm+wXOPPjty97VCOD1F9itIFVkMb2EvD5kR0zel0xJP +XjvI503dgjv9XqUysu3n58PKHDPRYfMY1UvZBWhxfaFdlJwfXsR94Dk11RRbjXc0 +DGG+jleJWuAhwU9UXQ2KfFoZ3U8WbGVzr1i7lOCHl0tViqV884Cs5UPyAqWnqQ+M +iudsI/+WDIOm39VItbS/WuPYv55EJJdZ50S/yVnIsukIzAYHvKi40HAdpt0f2g6i +VF2Pc6uhBFN7mOM/m2kYDfuOazgWXUyCQvJgVsau1/LqOiDIUpfDXsU+BEwxg/Fm +XrrkV+xl4jPdQ6sL/AyUDDNh2KtIsIV1ZJecFk5wLNs6iB9LBUE= +=jCEu +-----END PGP SIGNATURE----- diff --git a/juk.changes b/juk.changes index 10bb858..5af59c3 100644 --- a/juk.changes +++ b/juk.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Feb 23 13:58:30 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Wed Feb 21 09:51:52 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ +- Drop patch, merged upstream: + * 0001-Fix-build-with-taglib-2.patch + ------------------------------------------------------------------- Tue Feb 20 16:00:54 UTC 2024 - Christophe Marin diff --git a/juk.spec b/juk.spec index a9da4ff..dae2578 100644 --- a/juk.spec +++ b/juk.spec @@ -16,46 +16,50 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: juk -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: Jukebox License: GPL-2.0-or-later URL: https://apps.kde.org/juk -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -# PATCH-FIX-UPSTREAM -Patch0: 0001-Fix-build-with-taglib-2.patch -BuildRequires: extra-cmake-modules -BuildRequires: libtag-devel -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GlobalAccel) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5TextWidgets) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: pkgconfig +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6GlobalAccel) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6StatusNotifierItem) >= %{kf6_version} +BuildRequires: cmake(KF6TextWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6Wallet) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Phonon4Qt6) +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Network) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: pkgconfig(taglib) %description Jukebox and music manager by KDE @@ -66,32 +70,30 @@ Jukebox and music manager by KDE %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} - -%suse_update_desktop_file org.kde.juk AudioVideo Player +%find_lang %{name} --with-html --all-name %files %license COPYING -%doc %lang(en) %{_kf5_htmldir}/en/juk/ -%dir %{_kf5_sharedir}/kio -%dir %{_kf5_sharedir}/kio/servicemenus -%{_kf5_applicationsdir}/org.kde.juk.desktop -%{_kf5_appsdir}/juk/ -%{_kf5_appstreamdir}/org.kde.juk.appdata.xml -%{_kf5_bindir}/juk -%{_kf5_dbusinterfacesdir}/org.kde.juk.* -%{_kf5_iconsdir}/hicolor/*/apps/juk.* -%{_kf5_kxmlguidir}/juk -%{_kf5_notifydir}/juk.notifyrc -%{_kf5_sharedir}/kio/servicemenus/jukservicemenu.desktop +%doc %lang(en) %{_kf6_htmldir}/en/juk/ +%{_kf6_applicationsdir}/org.kde.juk.desktop +%{_kf6_appstreamdir}/org.kde.juk.appdata.xml +%{_kf6_bindir}/juk +%{_kf6_dbusinterfacesdir}/org.kde.juk.* +%{_kf6_iconsdir}/hicolor/*/apps/juk.* +%{_kf6_notificationsdir}/juk.notifyrc +%{_kf6_sharedir}/juk/ +%dir %{_kf6_sharedir}/kio +%dir %{_kf6_sharedir}/kio/servicemenus +%{_kf6_sharedir}/kio/servicemenus/jukservicemenu.desktop %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/juk/ %changelog