From 5e2d29c7f2cfa964153d60095c3fa08584b5a928 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Jul 2022 22:24:45 +0000
Subject: [PATCH] =?UTF-8?q?gnome.gnome-boxes:=2042.1=20=E2=86=92=2042.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 pkgs/desktops/gnome/apps/gnome-boxes/default.nix      |  9 +++------
 .../gnome/apps/gnome-boxes/fix-gir-lib-path.patch     | 11 -----------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 9b770c0680e7..ebf80a2ab504 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
@@ -13,7 +13,6 @@
 , gtk3
 , gtksourceview4
 , gtk-vnc
-, freerdp
 , libvirt
 , spice-gtk
 , python3
@@ -55,16 +54,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "42.1";
+  version = "42.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "lvXQEbdQjbVhvw0WbA6p6LEhgFxA5dnzYRkkXBUXIIA=";
+    sha256 = "98K8oU3K4oONsR+iyA4jQI41SBeK+GGg1NDcxql4ABU=";
   };
 
   patches = [
-    # Fix path to libgovf-0.1.so (and libgtk-frdp-0.1.so when enabling rdp meson option)
-    # in the gir file. We patch gobject-introspection to hardcode absolute paths but
+    # Fix path to libgovf-0.1.so 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.
     ./fix-gir-lib-path.patch
   ];
@@ -93,7 +91,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     acl
     cyrus_sasl
-    freerdp
     gdbm
     glib
     glib-networking
diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
index 6b0ba4732997..ec2a4285cc0f 100644
--- a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
+++ b/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch
@@ -9,14 +9,3 @@
  )
  
  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(