From 78425032ee0dde61cad8ddf91d276166dda68736 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Feb 2023 21:27:49 -0800 Subject: [PATCH] Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose --- 0001-Strip-some-things-from-gtk4.patch | 31 ++++++++++++++++++++++++++ lorax.spec | 10 ++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Strip-some-things-from-gtk4.patch diff --git a/0001-Strip-some-things-from-gtk4.patch b/0001-Strip-some-things-from-gtk4.patch new file mode 100644 index 0000000..215da43 --- /dev/null +++ b/0001-Strip-some-things-from-gtk4.patch @@ -0,0 +1,31 @@ +From 633af4499c1387692fbd5e5760d0a42bb5fb70a2 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Wed, 15 Feb 2023 21:20:34 -0800 +Subject: [PATCH] Strip some things from gtk4 + +gtk4 is now getting sucked into installer images because mutter +depends on it (since 44-beta). Strip some stuff the installer +env currently doesn't need. The /usr/bin/* removal may not be +safe long-term, but it should be OK for now. + +Signed-off-by: Adam Williamson +--- + share/templates.d/99-generic/runtime-cleanup.tmpl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl +index 31dd44ee..6e0d8e88 100644 +--- a/share/templates.d/99-generic/runtime-cleanup.tmpl ++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl +@@ -179,6 +179,8 @@ removefrom google-noto-sans-cjk-fonts /usr/share/fonts/google-noto-sans-cjk-font + removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf + removefrom grep /etc/* /usr/share/locale/* + removefrom gtk3 /usr/${libdir}/gtk-3.0/* ++removefrom gtk4 /usr/${libdir}/gtk-4.0/* ++removefrom gtk4 /usr/bin/* + removefrom guile22 /usr/${libdir}/guile/2.2/ccache* + removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} + removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids +-- +2.39.1 + diff --git a/lorax.spec b/lorax.spec index 1b3ee29..682c1ec 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 38.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for creating the anaconda install images License: GPL-2.0-or-later @@ -14,6 +14,11 @@ URL: https://github.com/weldr/lorax # git checkout -b archive-branch lorax-%%{version}-%%{release} # tito build --tgz Source0: %{name}-%{version}.tar.gz +# Strip some stuff from gtk4, necessary for compose to work since +# gtk4-launch requires libtiff which is stripped itself +# https://github.com/weldr/lorax/pull/1309 +# https://pagure.io/releng/failed-composes/issue/4611 +Patch0: 0001-Strip-some-things-from-gtk4.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -168,6 +173,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %{_datadir}/lorax/templates.d/* %changelog +* Wed Feb 15 2023 Adam Williamson - 38.6-2 +- Backport PR #1309 to strip stuff from gtk4, fix Rawhide compose + * Tue Feb 14 2023 Brian C. Lane 38.6-1 - templates.d/99-generic/live: Enable automatic persistence for live media (ngompa@fedoraproject.org) - Update for Noto CJK Variable Fonts (pwu@redhat.com)