gnome.gnome-boxes: 42.1 → 42.2

https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/42.1...42.2

Tarball no longer contains gtk-frdp subproject and it is going to be dropped in the future:
https://gitlab.gnome.org/GNOME/gnome-boxes/-/merge_requests/532
This commit is contained in:
Jan Tojnar 2022-07-01 22:24:45 +00:00
parent bd9e9f512d
commit 5e2d29c7f2
2 changed files with 3 additions and 17 deletions

View file

@ -13,7 +13,6 @@
, gtk3 , gtk3
, gtksourceview4 , gtksourceview4
, gtk-vnc , gtk-vnc
, freerdp
, libvirt , libvirt
, spice-gtk , spice-gtk
, python3 , python3
@ -55,16 +54,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-boxes"; pname = "gnome-boxes";
version = "42.1"; version = "42.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA="; sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU=";
}; };
patches = [ patches = [
# Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option) # Fix path to libgovf-0.1.so in the gir file. We patch gobject-introspection to hardcode absolute paths but
# in the gir file. We patch gobject-introspection to hardcode absolute paths but
# our Meson patch will only pass the info when install_dir is absolute as well. # our Meson patch will only pass the info when install_dir is absolute as well.
./fix-gir-lib-path.patch ./fix-gir-lib-path.patch
]; ];
@ -93,7 +91,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
acl acl
cyrus_sasl cyrus_sasl
freerdp
gdbm gdbm
glib glib
glib-networking glib-networking

View file

@ -9,14 +9,3 @@
) )
govf_dep = declare_dependency( govf_dep = declare_dependency(
--- a/subprojects/gtk-frdp/src/meson.build
+++ b/subprojects/gtk-frdp/src/meson.build
@@ -50,7 +50,7 @@ gtk_frdp_lib = shared_library('gtk-frdp-' + api_version,
gtk_frdp_sources,
dependencies: gtk_frdp_deps,
install: true,
- install_dir: libdir
+ install_dir: get_option ('prefix') / libdir
)
gtk_frdp_dep = declare_dependency(