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