gnu: gnome-boxes: Update to 42.3.

* gnu/packages/gnome.scm (gnome-boxes): Update to 42.3.
[source]: Delete patches field.
[configure-flags]: Use gexps.
[phases]: New argument.
[native-inputs]: Replace intltool with gettext-minimal.  Delete gtk+:bin.
Sort.
[inputs]: Sort.
* gnu/packages/patches/gnome-boxes-add-guix-logo.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
This commit is contained in:
Maxim Cournoyer 2022-09-08 11:41:26 -04:00
parent 89a340ebad
commit cad5c7543a
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 22 additions and 55 deletions

View File

@ -1207,7 +1207,6 @@ dist_patch_DATA = \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \
%D%/packages/patches/gnome-boxes-add-guix-logo.patch \
%D%/packages/patches/gnome-builder-update-libportal.patch \ %D%/packages/patches/gnome-builder-update-libportal.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \

View File

@ -11896,7 +11896,7 @@ integrate seamlessly with the GNOME desktop.")
(define-public gnome-boxes (define-public gnome-boxes
(package (package
(name "gnome-boxes") (name "gnome-boxes")
(version "41.1") (version "42.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -11904,34 +11904,35 @@ integrate seamlessly with the GNOME desktop.")
(version-major version) "/" (version-major version) "/"
"gnome-boxes-" version ".tar.xz")) "gnome-boxes-" version ".tar.xz"))
(sha256 (sha256
(base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h")) (base32 "1lv0bdh935qj6wkv3ixg2pcv8yrapj79z02gw4fal3rhz3xggvsn"))))
(patches
(search-patches "gnome-boxes-add-guix-logo.patch"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t (list #:glib-or-gtk? #t
#:meson ,meson-0.60 #:configure-flags #~(list "-Drdp=false"
#:configure-flags (list "-Drdp=false" (string-append "-Dc_link_args=-Wl,-rpath="
(string-append "-Dc_link_args=-Wl,-rpath=" #$output
(assoc-ref %outputs "out") "/lib/gnome-boxes"))
"/lib/gnome-boxes")))) #:phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-gtk-update-icon-cache
(lambda _
(setenv "DESTDIR" "/"))))))
(native-inputs (native-inputs
(list `(,glib "bin") ;for glib-compile-resources (list desktop-file-utils ;for update-desktop-database
`(,gtk+ "bin") ;for gtk-update-icon-cache gettext-minimal
desktop-file-utils ;for update-desktop-database `(,glib "bin") ;for glib-compile-resources
itstool itstool
intltool
vala
pkg-config pkg-config
python)) python
vala))
(inputs (inputs
(list libarchive (list glib-networking ;for TLS support
glib-networking ;for TLS support
gsettings-desktop-schemas gsettings-desktop-schemas
gtk+ gtk+
gtk-vnc gtk-vnc
gtksourceview gtksourceview
json-glib json-glib
libarchive
libgudev
libhandy libhandy
libosinfo libosinfo
libsecret libsecret
@ -11940,12 +11941,11 @@ integrate seamlessly with the GNOME desktop.")
libvirt libvirt
libvirt-glib libvirt-glib
libxml2 libxml2
spice-gtk
sparql-query sparql-query
vte spice-gtk
webkitgtk-with-libsoup2 ;for webkit2gtk-4.0
tracker tracker
libgudev)) vte
webkitgtk-with-libsoup2)) ;for webkit2gtk-4.0
(home-page "https://wiki.gnome.org/Apps/Boxes") (home-page "https://wiki.gnome.org/Apps/Boxes")
(synopsis "View, access, and manage remote and virtual systems") (synopsis "View, access, and manage remote and virtual systems")
(description "GNOME Boxes is a simple application to view, access, and (description "GNOME Boxes is a simple application to view, access, and

View File

@ -1,32 +0,0 @@
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