Backport PR #1334 to fix installer with latest librsvg2

This commit is contained in:
Adam Williamson 2023-07-22 10:06:12 -07:00
parent 3d87c95d48
commit ce70ae7edb
2 changed files with 50 additions and 1 deletions

View File

@ -0,0 +1,43 @@
From c1a8a65a98eaee8543f103ad6f02435ccc3372ea Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 21 Jul 2023 15:45:50 -0700
Subject: [PATCH] runtime-install: install rsvg-pixbuf-loader
This was split out of librsvg2 as a subpackage recently, and
is only Recommended by the parent (not Required). For size's
sake, we don't pull Recommends into the installer env by
default. But we do really need this package, because quite a
lot of icons used in the installer are only present as SVGs in
the installer environment, so if we don't have the SVG loader we
can't show the icons.
Right now anaconda actually crashes if the SVG renderer isn't
present, which wasn't an expected outcome, but even if the crash
is fixed, the result would be that anaconda would run but not
show a lot of icons, which obviously isn't what we want. So we
should add this regardless of a fix for the crash.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
share/templates.d/99-generic/runtime-install.tmpl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
index 15177467..7ceec8f8 100644
--- a/share/templates.d/99-generic/runtime-install.tmpl
+++ b/share/templates.d/99-generic/runtime-install.tmpl
@@ -105,6 +105,11 @@ installpkg kbd kbd-misc
## required for anaconda-dracut (img-lib etc.)
installpkg tar xz curl bzip2
+## this is only recommended by librsvg2 since 2023-07, but in the
+## installer environment many icons used are only present as SVGs,
+## so we really need it
+installpkg rsvg-pixbuf-loader
+
## basic system stuff
installpkg systemd-sysv systemd-units
installpkg rsyslog
--
2.41.0

View File

@ -4,7 +4,7 @@
Name: lorax
Version: 39.2
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Tool for creating the anaconda install images
License: GPL-2.0-or-later
@ -14,6 +14,9 @@ URL: https://github.com/weldr/lorax
# git checkout -b archive-branch lorax-%%{version}-%%{release}
# tito build --tgz
Source0: %{name}-%{version}.tar.gz
# https://github.com/weldr/lorax/pull/1334
# Ensure we have SVG pixbuf loader now it's split out of librsvg2
Patch0: 0001-runtime-install-install-rsvg-pixbuf-loader.patch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@ -168,6 +171,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
%{_datadir}/lorax/templates.d/*
%changelog
* Sat Jul 22 2023 Adam Williamson <awilliam@redhat.com> - 39.2-4
- Backport PR #1334 to fix installer with latest librsvg2
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 39.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild