[rpms/cantata] rawhide: rhbz#2491757

[rpms/cantata] rawhide: rhbz#2491757

[Gerald B Cox]

A new commit has been pushed.

Repo   : rpms/cantata
Branch : rawhide
Commit : d08a2348165f7cf7ca274c9b4f7063a7d65c8d4a
Author : Gerald B Cox <gbcox@fedoraproject.org>
Date   : 2026-06-24T11:30:48-07:00
Stats  : +36/-4 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/cantata/c/d08a2348165f7cf7ca274c9b4f7063a7d65c8d4a?branch=rawhide

Log:
rhbz#2491757

---
diff --git a/cantata.spec b/cantata.spec
index 992166c..b7b2b33 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -1,17 +1,20 @@
+%global license_expression GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
 %global forgeurl https://github.com/nullobsi/cantata/
 %global commit 3ab7cf06aecf6fc5e096c245270c52cd8c65ae75
 
 Name:    cantata
 Summary: Music Player Daemon (MPD) graphical client
 Version: 3.5.0
-Release: %autorelease
-License: GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
+Release: %{autorelease}
+License: %{license_expression}
 
 %{forgemeta}
 
 Url:            %{forgeurl}
 Source0:        %{forgesource}
 Patch0:         pr127-tray-icon.patch
+# Use FontAwesome 6 instead of 7 (< F45)
+Patch1:         rhbz_2491757.patch
 
 BuildRequires:  kf6-kitemviews-devel
 BuildRequires:  kf6-karchive-devel
@@ -50,6 +53,7 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  desktop-file-utils
 Requires:       media-player-info
 Requires:       hicolor-icon-theme
+Requires:       font(fontawesome)
 %if 0%{?fedora} < 45
 Requires:       font(fontawesome6brands)
 Requires:       font(fontawesome6free)
@@ -58,14 +62,13 @@ Requires:       font(fontawesome7brands)
 Requires:       font(fontawesome7free)
 %endif
 
-
 %description
 Cantata is a graphical client for the music player daemon (MPD).
 
 %prep
 %forgeautosetup -N
 %autopatch -M0 -p1
-%if 0%{?fedora} >= 45
+%if 0%{?fedora} < 45
 %patch -P 1 -p1
 %endif
 

diff --git a/rhbz_2491757.patch b/rhbz_2491757.patch
new file mode 100644
index 0000000..cb424ea
--- /dev/null
+++ b/rhbz_2491757.patch
@@ -0,0 +1,29 @@
+diff -Naur cantata-3ab7cf06aecf6fc5e096c245270c52cd8c65ae75/support/QtAwesome.cpp cantata-3ab7cf06aecf6fc5e096c245270c52cd8c65ae75_patched/support/QtAwesome.cpp
+--- cantata-3ab7cf06aecf6fc5e096c245270c52cd8c65ae75/support/QtAwesome.cpp	2026-06-12 18:57:59.000000000 -0700
++++ cantata-3ab7cf06aecf6fc5e096c245270c52cd8c65ae75_patched/support/QtAwesome.cpp	2026-06-24 10:49:31.516473959 -0700
+@@ -224,9 +224,9 @@
+ 
+ //---------------------------------------------------------------------------------------
+ 
+-const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 7 Brands-Regular-400.otf";
+-const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 7 Free-Regular-400.otf";
+-const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 7 Free-Solid-900.otf";
++const QString QtAwesome::FA_BRANDS_FONT_FILENAME = "Font Awesome 6 Brands-Regular-400.otf";
++const QString QtAwesome::FA_REGULAR_FONT_FILENAME = "Font Awesome 6 Free-Regular-400.otf";
++const QString QtAwesome::FA_SOLID_FONT_FILENAME = "Font Awesome 6 Free-Solid-900.otf";
+ const QString QtAwesome::FA_BRANDS_FONT_STYLE = "Regular";
+ const QString QtAwesome::FA_REGULAR_FONT_STYLE = "Regular";
+ const QString QtAwesome::FA_SOLID_FONT_STYLE = "Solid";
+@@ -247,9 +247,9 @@
+ 	_fontDetails.insert(fa::fa_brands, QtAwesomeFontData(FA_BRANDS_FONT_FILENAME, FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
+ #else
+ 	// use "filename" to store font family name...
+-	_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 7 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
+-	_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 7 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
+-	_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 7 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
++	_fontDetails.insert(fa::fa_solid, QtAwesomeFontData("Font Awesome 6 Free Solid", FA_SOLID_FONT_WEIGHT, FA_SOLID_FONT_STYLE));
++	_fontDetails.insert(fa::fa_regular, QtAwesomeFontData("Font Awesome 6 Free Regular", FA_REGULAR_FONT_WEIGHT, FA_REGULAR_FONT_STYLE));
++	_fontDetails.insert(fa::fa_brands, QtAwesomeFontData("Font Awesome 6 Brands Regular", FA_BRANDS_FONT_WEIGHT, FA_BRANDS_FONT_STYLE));
+ #endif
+ 
+ #ifdef USE_COLOR_SCHEME