[gnome-build-meta/abderrahim/update-fdsdk: 2/3] core-deps/phodav: it now depends on soup3

[Jordan Petridis <jpetridis src gnome org>]

commit 85c1aa3045bd77a4694d5ce997998bf7424c7273
Author: Jordan Petridis <jordan centricular com>
Date:   Fri Jul 1 15:34:37 2022 +0300

    core-deps/phodav: it now depends on soup3

 elements/core-deps/phodav.bst    |  2 +-
 elements/core-deps/spice-gtk.bst |  5 +++-
 files/phodav/105.patch           | 51 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index cbb9c2c12..3dbb5f9aa 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -10,7 +10,7 @@ build-depends:
 depends:
 - core-deps/avahi-gobject.bst
 - sdk/glib.bst
-- sdk/libsoup-2.4.bst
+- sdk/libsoup.bst
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/systemd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index 93e3b3b4c..cf8164214 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -3,6 +3,8 @@ kind: meson
 sources:
 - kind: tar
   url: spice:gtk/spice-gtk-0.40.tar.xz
+- kind: patch
+  path: files/phodav/105.patch
 
 build-depends:
 - core-deps/python-pyparsing.bst
@@ -12,13 +14,14 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/usbredir.bst
 - core-deps/phodav.bst
 - core-deps/spice-protocol.bst
+- core-deps/usbredir.bst
 - sdk/glib.bst
 - sdk/gst-plugins-base.bst
 - sdk/gtk+-3.bst
 - sdk/json-glib.bst
+- sdk/libsoup.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/cyrus-sasl.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
diff --git a/files/phodav/105.patch b/files/phodav/105.patch
new file mode 100644
index 000000000..8948efa64
--- /dev/null
+++ b/files/phodav/105.patch
@@ -0,0 +1,51 @@
+From c8d3b51070ef2c6b1c030f4064a0b36a3c035932 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre lureau redhat com>
+Date: Fri, 1 Jul 2022 12:27:46 +0400
+Subject: [PATCH] build-sys: build against phodav-3.0/soup-3.0 if possible
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Prefer libsoup 3.0 over 2.0, when available.
+
+Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
+---
+ meson.build | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 00aff30e..dd462940 100644
+--- a/meson.build
++++ b/meson.build
+@@ -184,11 +184,17 @@ endif
+ 
+ # webdav
+ spice_gtk_has_phodav = false
+-phodav_dep = dependency('libphodav-2.0', required: get_option('webdav'))
+-summary_info += {'webdav': phodav_dep.found()}
++phodav_dep = dependency('libphodav-3.0', required: false)
++if not phodav_dep.found()
++  phodav_dep = dependency('libphodav-2.0', required: get_option('webdav'))
++endif
+ if phodav_dep.found()
+   spice_glib_deps += phodav_dep
+-  d = dependency('libsoup-2.4', version : '>= 2.49.91', required: get_option('webdav'))
++  if phodav_dep.name() == 'libphodav-3.0'
++    d = dependency('libsoup-3.0', version : '>= 3.0', required: get_option('webdav'))
++  else
++    d = dependency('libsoup-2.4', version : '>= 2.49.91', required: get_option('webdav'))
++  endif
+   if d.found()
+     spice_glib_deps += d
+     spice_gtk_config_data.set('USE_PHODAV', '1')
+@@ -198,6 +204,7 @@ if phodav_dep.found()
+     endif
+   endif
+ endif
++summary_info += {'webdav': spice_gtk_has_phodav}
+ 
+ gstreamer_version = '1.10'
+ gstreamer_version_info = '>= @0@'.format(gstreamer_version)
+-- 
+GitLab
+