diff --git a/helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch b/helpers/DATA/gnome-boxes/patch_changes/001_add_trisquel_gnome-boxes_logo.patch similarity index 100% rename from helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch rename to helpers/DATA/gnome-boxes/patch_changes/001_add_trisquel_gnome-boxes_logo.patch diff --git a/helpers/DATA/gnome-boxes/patch_changes/002_allow_recommended-downloads_parsing_handle_empty.patch b/helpers/DATA/gnome-boxes/patch_changes/002_allow_recommended-downloads_parsing_handle_empty.patch new file mode 100644 index 0000000..1b57e3b --- /dev/null +++ b/helpers/DATA/gnome-boxes/patch_changes/002_allow_recommended-downloads_parsing_handle_empty.patch @@ -0,0 +1,30 @@ +From 333dfad568ba77456ff3b00e6c2750d6a2cf0d73 Mon Sep 17 00:00:00 2001 +From: Felipe Borges +Date: Wed, 10 Aug 2022 09:54:41 +0200 +Subject: [PATCH] util-app: Make recommended-downloads parsing handle empty + media lists + +--- + src/util-app.vala | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/util-app.vala b/src/util-app.vala +index c0a42a94d..c5f47ae22 100644 +--- a/src/util-app.vala ++++ b/src/util-app.vala +@@ -250,7 +250,11 @@ private async GLib.List? parse_recommended_downloads_file (string + continue; + } + +- var media = os.get_media_list ().get_nth (0) as Osinfo.Media; ++ var media_list = os.get_media_list (); ++ if (media_list == null || media_list.get_length () == 0) ++ continue; ++ ++ var media = media_list.get_nth (0) as Osinfo.Media; + if (media.url != null || os_id.has_prefix ("http://redhat.com")) + list.append (media); + +-- +GitLab + diff --git a/helpers/make-gnome-boxes b/helpers/make-gnome-boxes index 967651f..5e869c2 100644 --- a/helpers/make-gnome-boxes +++ b/helpers/make-gnome-boxes @@ -19,13 +19,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=5 +VERSION=6 . ./config -# Add trisquel logo patch. -patch_p1 $DATA/001_add_trisquel_gnome-boxes_logo.patch - remove_patch Update-recommended-downloads.patch #Required dependencies not in upstream. @@ -44,7 +41,6 @@ cat << recommended-os > data/recommended-downloads.xml --> http://trisquel.info/trisquel/11 - http://trisquel.info/trisquel/10 http://guix.gnu.org/guix/1.3 http://hyperbola.info/hyperbola/03 http://pureos.net/pureos/8 @@ -54,6 +50,9 @@ recommended-os # Remove gnome recommendation. grep -rl ".*.iso.*" data/osinfo/|xargs -r sed -i "/.iso/d" +# Apply patch_changes +apply_patch_changes + changelog "Replace recommended downloads." package