From 13dcdd56db874a9fa6b58eb6f79b36b0258c2f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 5 Aug 2024 20:23:16 +0000 Subject: [PATCH] gnome-boxes: add support for trisquel logo from osinfo-db. --- .../001_add_trisquel_gnome-boxes_logo.patch | 29 +++++++++++++++++++ helpers/make-gnome-boxes | 14 +++------ 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch diff --git a/helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch b/helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch new file mode 100644 index 0000000..8f5b0ca --- /dev/null +++ b/helpers/DATA/gnome-boxes/001_add_trisquel_gnome-boxes_logo.patch @@ -0,0 +1,29 @@ +diff --git a/data/osinfo/meson.build b/data/osinfo/meson.build +index acf27962..158af16b 100644 +--- a/data/osinfo/meson.build ++++ b/data/osinfo/meson.build +@@ -16,7 +16,8 @@ osinfo_db = [ + ['popos-17.10.xml', 'gnome-boxes/osinfo/os/system76.com'], + ['rhel-8.0.xml', 'gnome-boxes/osinfo/os/redhat.com'], + ['rocky-8.4.xml', 'gnome-boxes/osinfo/os/rockylinux.org'], +- ['silverblue-28.xml', 'gnome-boxes/osinfo/os/fedoraproject.org'] ++ ['silverblue-28.xml', 'gnome-boxes/osinfo/os/fedoraproject.org'], ++ ['trisquel-9.xml', 'gnome-boxes/osinfo/os/trisquel.info'] + ] + + foreach os: osinfo_db +diff --git a/data/osinfo/trisquel-11.xml b/data/osinfo/trisquel-11.xml +new file mode 100644 +index 00000000..ce9b4b36 +--- /dev/null ++++ b/data/osinfo/trisquel-9.xml +@@ -0,0 +1,9 @@ ++ ++ ++ ++ ++ ++ https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/trisquel.svg ++ ++ ++ diff --git a/helpers/make-gnome-boxes b/helpers/make-gnome-boxes index 1d4d72a..2b16ac6 100644 --- a/helpers/make-gnome-boxes +++ b/helpers/make-gnome-boxes @@ -2,7 +2,7 @@ # # Copyright (C) 2022 Trisquel GNU/Linux developers # -# Copyright (C) 2022 Luis Guzman +# Copyright (C) 2024 Luis Guzman # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,18 +19,12 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=4 +VERSION=5 . ./config -remove_patch Update-recommended-downloads.patch - -#Disable ubuntu artwork -rm data/osinfo/ubuntu-4.10.xml -sed -i '/ubuntu-4.10.xml/d' data/osinfo/meson.build - -#Required dependencies not in upstream. -sed -i 's|libvirt-dev,|libvirt-dev, cmake, libsasl2-dev, libpulse-dev,|' debian/control* +# Add trisquel logo patch. +patch_p1 $DATA/001_add_trisquel_gnome-boxes_logo.patch cat << recommended-os > data/recommended-downloads.xml