>From ecf259f0cd98cff7ca72adc59a93cd469e5271c2 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Mon, 4 May 2026 19:36:54 +0200 Subject: [PATCH] Use packaged Font Awesome over abandoned Fork Awesome This is closer to the original than the current replacement. The svg, eot and woff versions are not provided. Closes: #1134686 --- debian/control | 4 +-- debian/libminion-perl.links | 14 +++++----- .../partial_upgrade_to_bootstrap5.patch | 2 +- debian/patches/series | 1 - .../patches/use-linked-fonts-in-pg-admin-test | 27 +++++++------------ 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/debian/control b/debian/control index b8803f4..4eb160e 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), dh-strip-nondeterminism, Build-Depends-Indep: - fonts-fork-awesome , + node-fortawesome-fontawesome-free , libjs-bootstrap5 , libjs-d3 , libjs-jquery , @@ -27,7 +27,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, fonts-fork-awesome, - libjs-bootstrap5, + node-fortawesome-fontawesome-free, libjs-d3, libjs-jquery, libjs-moment, diff --git a/debian/libminion-perl.links b/debian/libminion-perl.links index b1e2361..d33f2e5 100644 --- a/debian/libminion-perl.links +++ b/debian/libminion-perl.links @@ -11,13 +11,13 @@ usr/share/javascript/d3/d3.min.js usr/share/perl5/Mo usr/share/javascript/moment/moment.min.js usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/moment/moment.js # Font Awesome -usr/share/fonts-fork-awesome/css/fork-awesome.css usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fontawesome/fork-awesome.css -usr/share/fonts-fork-awesome/css/v5-compat.css usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fontawesome/v5-compat.css -usr/share/fonts-fork-awesome/fonts/forkawesome-webfont.ttf usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/forkawesome-webfont.ttf -usr/share/fonts-fork-awesome/fonts/forkawesome-webfont.eot usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/forkawesome-webfont.eot -usr/share/fonts-fork-awesome/fonts/forkawesome-webfont.svg usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/forkawesome-webfont.svg -usr/share/fonts-fork-awesome/fonts/forkawesome-webfont.woff usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/forkawesome-webfont.woff -usr/share/fonts-fork-awesome/fonts/forkawesome-webfont.woff2 usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/forkawesome-webfont.woff2 +usr/share/nodejs/@fortawesome/fontawesome-free/css/fontawesome.css usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/fonts/fontawesome.css +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-brands-400.ttf +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2 usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-brands-400.woff2 +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-regular-400.ttf +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2 usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-regular-400.woff2 +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-solid-900.ttf +usr/share/nodejs/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2 usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/webfonts/fa-solid-900.woff2 # jQuery usr/share/javascript/jquery/jquery.min.js usr/share/perl5/Mojolicious/Plugin/Minion/resources/public/minion/jquery/jquery.js diff --git a/debian/patches/partial_upgrade_to_bootstrap5.patch b/debian/patches/partial_upgrade_to_bootstrap5.patch index 790e4c8..4799648 100644 --- a/debian/patches/partial_upgrade_to_bootstrap5.patch +++ b/debian/patches/partial_upgrade_to_bootstrap5.patch @@ -90,7 +90,7 @@ Last-Update: 2026-05-04
@@ -78,7 +78,7 @@ diff --git a/debian/patches/series b/debian/patches/series index a039470..b860148 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ use-linked-fonts-in-pg-admin-test -use-font-fork-awesome-in-templates partial_upgrade_to_bootstrap5.patch diff --git a/debian/patches/use-linked-fonts-in-pg-admin-test b/debian/patches/use-linked-fonts-in-pg-admin-test index 90f3927..cadc8a3 100644 --- a/debian/patches/use-linked-fonts-in-pg-admin-test +++ b/debian/patches/use-linked-fonts-in-pg-admin-test @@ -1,38 +1,31 @@ Description: Use linked fonts in pg admin test - Update pg_admin.t tests to use packaged Fork Awesome fonts + Update pg_admin.t tests to use packaged Font Awesome fonts. The fonts referenced in the test are removed during source repacking and - replaced with links to fonts from the fonts-fork-awesome package + replaced with links to fonts from the node-fortawesome-fontawesome-free package. Forwarded: not-needed Author: Nick Morrott -Reviewed-by: gregor herrmann -Last-Update: 2026-01-25 +Last-Update: 2026-05-04 --- a/t/pg_admin.t +++ b/t/pg_admin.t -@@ -126,21 +126,11 @@ +@@ -126,20 +126,11 @@ subtest 'Bundled static files' => sub { $t->get_ok('/minion/epoch/epoch.js')->status_is(200)->content_type_is('application/javascript'); $t->get_ok('/minion/epoch/epoch.css')->status_is(200)->content_type_is('text/css'); $t->get_ok('/minion/fontawesome/fontawesome.css')->status_is(200)->content_type_is('text/css'); - $t->get_ok('/minion/webfonts/fa-brands-400.eot')->status_is(200); - $t->get_ok('/minion/webfonts/fa-brands-400.svg')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-brands-400.ttf')->status_is(200); + $t->get_ok('/minion/webfonts/fa-brands-400.ttf')->status_is(200); - $t->get_ok('/minion/webfonts/fa-brands-400.woff')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-brands-400.woff2')->status_is(200); + $t->get_ok('/minion/webfonts/fa-brands-400.woff2')->status_is(200); - $t->get_ok('/minion/webfonts/fa-regular-400.eot')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-regular-400.ttf')->status_is(200); + $t->get_ok('/minion/webfonts/fa-regular-400.ttf')->status_is(200); - $t->get_ok('/minion/webfonts/fa-regular-400.svg')->status_is(200); - $t->get_ok('/minion/webfonts/fa-regular-400.woff')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-regular-400.woff2')->status_is(200); + $t->get_ok('/minion/webfonts/fa-regular-400.woff2')->status_is(200); - $t->get_ok('/minion/webfonts/fa-solid-900.eot')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-solid-900.ttf')->status_is(200); + $t->get_ok('/minion/webfonts/fa-solid-900.ttf')->status_is(200); - $t->get_ok('/minion/webfonts/fa-solid-900.svg')->status_is(200); - $t->get_ok('/minion/webfonts/fa-solid-900.woff')->status_is(200); -- $t->get_ok('/minion/webfonts/fa-solid-900.woff2')->status_is(200); -+ $t->get_ok('/minion/fonts/forkawesome-webfont.eot')->status_is(200); -+ $t->get_ok('/minion/fonts/forkawesome-webfont.svg')->status_is(200); -+ $t->get_ok('/minion/fonts/forkawesome-webfont.ttf')->status_is(200); -+ $t->get_ok('/minion/fonts/forkawesome-webfont.woff')->status_is(200); -+ $t->get_ok('/minion/fonts/forkawesome-webfont.woff2')->status_is(200); + $t->get_ok('/minion/webfonts/fa-solid-900.woff2')->status_is(200); $t->get_ok('/minion/moment/moment.js')->status_is(200)->content_type_is('application/javascript'); $t->get_ok('/minion/app.js')->status_is(200)->content_type_is('application/javascript'); - $t->get_ok('/minion/app.css')->status_is(200)->content_type_is('text/css');