01/03: gnu: gnome-boxes: Add Guix logo support.

[guix-commits]

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit 3466c055e66c2aa0dd8cbeb52a11701e1928a373
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sat Nov 27 13:42:12 2021 +0100

    gnu: gnome-boxes: Add Guix logo support.
    
    * gnu/packages/patches/gnome-boxes-add-guix-logo.patch: New patch.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/gnome.scm (gnome-boxes): Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/gnome.scm                             |  4 ++-
 .../patches/gnome-boxes-add-guix-logo.patch        | 32 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 46f6800..1063269 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1168,6 +1168,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/gmp-arm-asm-nothumb.patch               \
   %D%/packages/patches/gmp-faulty-test.patch                   \
   %D%/packages/patches/gnash-fix-giflib-version.patch          \
+  %D%/packages/patches/gnome-boxes-add-guix-logo.patch         \
   %D%/packages/patches/gnome-online-miners-tracker-3.patch     \
   %D%/packages/patches/gnome-screenshot-meson-0.60.patch       \
   %D%/packages/patches/gnome-settings-daemon-gc.patch          \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d20650c..8e0e750 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11774,7 +11774,9 @@ integrate seamlessly with the GNOME desktop.")
                            (version-major version) "/"
                            "gnome-boxes-" version ".tar.xz"))
        (sha256
-        (base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"))))
+        (base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h"))
+       (patches
+        (search-patches "gnome-boxes-add-guix-logo.patch"))))
     (build-system meson-build-system)
     (arguments
      `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
diff --git a/gnu/packages/patches/gnome-boxes-add-guix-logo.patch 
b/gnu/packages/patches/gnome-boxes-add-guix-logo.patch
new file mode 100644
index 0000000..e570675
--- /dev/null
+++ b/gnu/packages/patches/gnome-boxes-add-guix-logo.patch
@@ -0,0 +1,32 @@
+Taken from upstream commit: 9091c6849652fa083297bc12645d8c57a962874a.
+
+diff --git a/data/osinfo/guix-1.3.xml b/data/osinfo/guix-1.3.xml
+new file mode 100644
+index 00000000..d4e1c167
+--- /dev/null
++++ b/data/osinfo/guix-1.3.xml
+@@ -0,0 +1,9 @@
++<libosinfo version="0.0.1">
++
++  <!-- Please read README.logos for any questions about usage of product 
logos in Boxes. !-->
++
++  <os id="http://guix.gnu.org/guix/1.3";>
++    
<logo>https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/guix.svg</logo>
++  </os>
++
++</libosinfo>
+diff --git a/data/osinfo/meson.build b/data/osinfo/meson.build
+index 46ff1570..d5531e60 100644
+--- a/data/osinfo/meson.build
++++ b/data/osinfo/meson.build
+@@ -7,6 +7,7 @@ osinfo_db = [
+   ['freedos-1.2.xml', 'gnome-boxes/osinfo/os/freedos.org'],
+   ['gnome-nightly.xml', 'gnome-boxes/osinfo/os/gnome.org'],
+   ['gnome-3.38.xml', 'gnome-boxes/osinfo/os/gnome.org'],
++  ['guix-1.3.xml', 'gnome-boxes/osinfo/os/guix.gnu.org'],
+   ['manjaro-19.0.xml', 'gnome-boxes/osinfo/os/manjaro.org'],
+   ['nixos-20.03.xml', 'gnome-boxes/osinfo/os/nixos.org'],
+   ['opensuse-10.2.xml', 'gnome-boxes/osinfo/os/opensuse.org'],
+-- 
+2.34.0
+