public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cantata] f44: Rebuild for FontAwesome 7.2.0
Date: Sat, 13 Jun 2026 18:04:00 GMT [thread overview]
Message-ID: <178137384003.1.6877027217747747482.rpms-cantata-21a0fd38f9c9@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cantata
Branch : f44
Commit : 21a0fd38f9c944ca513794b2a78b44981c37a0e3
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-05-27T11:33:46-06:00
Stats : +27/-1 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/cantata/c/21a0fd38f9c944ca513794b2a78b44981c37a0e3?branch=f44
Log:
Rebuild for FontAwesome 7.2.0
- Add patch to migrate from FontAwesome 6 to 7
---
diff --git a/cantata.spec b/cantata.spec
index 1b7cff0..c7dd99a 100644
--- a/cantata.spec
+++ b/cantata.spec
@@ -12,6 +12,8 @@ License: GPL-2.0-or-later AND (GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-or-late
Url: %{forgeurl}
Source0: %{forgesource}
Patch0: pr127-tray-icon.patch
+# Use FontAwesome 7 instead of 6
+Patch1: fontawesome7.patch
BuildRequires: kf6-kitemviews-devel
BuildRequires: kf6-karchive-devel
@@ -50,15 +52,24 @@ BuildRequires: pkgconfig(zlib)
BuildRequires: desktop-file-utils
Requires: media-player-info
Requires: hicolor-icon-theme
+%if 0%{?fedora} < 45
Requires: font(fontawesome6brands)
Requires: font(fontawesome6free)
+%else
+Requires: font(fontawesome7brands)
+Requires: font(fontawesome7free)
+%endif
%description
Cantata is a graphical client for the music player daemon (MPD).
%prep
-%forgeautosetup -p1
+%forgeautosetup -N
+%autopatch -M0 -p1
+%if 0%{?fedora} >= 45
+%patch -P 1 -p1
+%endif
%build
%cmake -DCMAKE_BUILD_TYPE=Release \
diff --git a/fontawesome7.patch b/fontawesome7.patch
new file mode 100644
index 0000000..6d71081
--- /dev/null
+++ b/fontawesome7.patch
@@ -0,0 +1,15 @@
+--- a/support/QtAwesome.cpp
++++ b/support/QtAwesome.cpp
+@@ -247,9 +247,9 @@ QtAwesome::QtAwesome(QObject* parent)
+ _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 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));
++ _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));
+ #endif
+
+ #ifdef USE_COLOR_SCHEME
reply other threads:[~2026-06-13 18:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178137384003.1.6877027217747747482.rpms-cantata-21a0fd38f9c9@fedoraproject.org \
--to=loganjerry@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox