From beb1906cfcc1c5863aa144b779b1fd801c02c86b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 15 Aug 2022 20:21:50 +0200
Subject: [PATCH] spice-gtk: port to libsoup 3

---
 pkgs/applications/networking/remote/remmina/default.nix  | 7 +++++--
 pkgs/applications/virtualization/virt-viewer/default.nix | 9 +++++----
 pkgs/development/libraries/spice-gtk/default.nix         | 7 +++++--
 pkgs/top-level/all-packages.nix                          | 2 ++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index 20496f38e868..8a39e31aa9c6 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -3,7 +3,7 @@
 , freerdp, libssh, libgcrypt, gnutls, vte
 , pcre2, libdbusmenu-gtk3, libappindicator-gtk3
 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
-, libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core
+, libsecret, libsoup, spice-protocol, spice-gtk_libsoup2, libepoxy, at-spi2-core
 , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
 # The themes here are soft dependencies; only icons are missing without them.
 , gnome
@@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
     freerdp libssh libgcrypt gnutls
     pcre2 libdbusmenu-gtk3 libappindicator-gtk3
     libvncserver libpthreadstubs libXdmcp libxkbcommon
-    libsoup spice-protocol spice-gtk libepoxy at-spi2-core
+    libsoup spice-protocol
+    # https://gitlab.com/Remmina/Remmina/-/issues/2754
+    spice-gtk_libsoup2
+    libepoxy at-spi2-core
     openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk
     harfbuzz python3
   ] ++ optionals withLibsecret [ libsecret ]
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 95909e36d0c0..ed882709aa14 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -19,7 +19,8 @@
 , pkg-config
 , python3
 , shared-mime-info
-, spice-gtk ? null
+# https://gitlab.com/virt-viewer/virt-viewer/-/issues/88
+, spice-gtk_libsoup2 ? null
 , spice-protocol ? null
 , spiceSupport ? true
 , vte
@@ -29,7 +30,7 @@
 assert spiceSupport -> (
   gdbm != null
   && libcap != null
-  && spice-gtk != null
+  && spice-gtk_libsoup2 != null
   && spice-protocol != null
 );
 
@@ -78,12 +79,12 @@ stdenv.mkDerivation rec {
   ] ++ optionals spiceSupport [
     gdbm
     libcap
-    spice-gtk
+    spice-gtk_libsoup2
     spice-protocol
   ];
 
   # Required for USB redirection PolicyKit rules file
-  propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
+  propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2;
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 7a647084f9cd..2564162c3bf1 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -17,13 +17,16 @@
 , libdrm
 , libjpeg_turbo
 , libopus
+, withLibsoup2 ? false
 , libsoup
+, libsoup_3
 , libusb1
 , lz4
 , meson
 , ninja
 , openssl
 , perl
+, phodav_2_0
 , phodav
 , pixman
 , pkg-config
@@ -84,7 +87,6 @@ stdenv.mkDerivation rec {
     gettext
     gobject-introspection
     gtk-doc
-    libsoup
     meson
     ninja
     perl
@@ -108,10 +110,11 @@ stdenv.mkDerivation rec {
     libcacard
     libjpeg_turbo
     libopus
+    (if withLibsoup2 then libsoup else libsoup_3)
     libusb1
     lz4
     openssl
-    phodav
+    (if withLibsoup2 then phodav_2_0 else phodav)
     pixman
     spice-protocol
     usbredir
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 143eef9cf2f4..7f06a91b7e05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22097,6 +22097,8 @@ with pkgs;
 
   spice-gtk = callPackage ../development/libraries/spice-gtk { };
 
+  spice-gtk_libsoup2 = spice-gtk.override { withLibsoup2 = true; };
+
   spice-protocol = callPackage ../development/libraries/spice-protocol { };
 
   spice-up = callPackage ../applications/office/spice-up { };