[gnome-build-meta/abderrahim/3.37.92: 19/23] build gvfs with all daemons and correctly split client and daemons

[Abderrahim Kitouni <akitouni src gnome org>]

commit 6fe89485b8b845f86070eb9c77231ec061bad270
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Sep 1 14:30:24 2020 +0100

    build gvfs with all daemons and correctly split client and daemons
    
    We only need the client in the flatpak runtimes

 elements/{world => core-deps}/libbluray.bst        |  0
 elements/{world => core-deps}/libcdio-paranoia.bst |  5 ++-
 elements/{world => core-deps}/libcdio.bst          |  0
 elements/{world => core-deps}/libgphoto2.bst       |  0
 elements/{world => core-deps}/libimobiledevice.bst | 14 +++---
 elements/{world => core-deps}/libmtp.bst           |  2 +-
 elements/{world => core-deps}/libnfs.bst           |  0
 elements/{world => core-deps}/libusbmuxd.bst       |  7 ++-
 elements/{world => core-deps}/plist.bst            | 12 ++---
 elements/core/gnome-builder.bst                    | 10 ++---
 elements/core/gnome-music.bst                      |  8 ++--
 elements/core/gvfs-daemon.bst                      | 37 +++++++++++++++
 elements/core/meta-gnome-core-shell.bst            |  2 +-
 elements/sdk-deps/gvfs.bst                         | 52 ++++++++++++++++++++++
 elements/sdk-platform.bst                          |  4 +-
 elements/sdk/gvfs-client.bst                       | 13 ++++++
 elements/world/gnome-games.bst                     |  7 ++-
 17 files changed, 143 insertions(+), 30 deletions(-)
---
diff --git a/elements/world/libbluray.bst b/elements/core-deps/libbluray.bst
similarity index 100%
rename from elements/world/libbluray.bst
rename to elements/core-deps/libbluray.bst
diff --git a/elements/world/libcdio-paranoia.bst b/elements/core-deps/libcdio-paranoia.bst
similarity index 89%
rename from elements/world/libcdio-paranoia.bst
rename to elements/core-deps/libcdio-paranoia.bst
index 9e7bec3e..04d1ae14 100644
--- a/elements/world/libcdio-paranoia.bst
+++ b/elements/core-deps/libcdio-paranoia.bst
@@ -1,9 +1,12 @@
 kind: autotools
+
 sources:
 - kind: tar
   url: ftp_gnu_org:libcdio/libcdio-paranoia-10.2+0.94+2.tar.gz
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
-- world/libcdio.bst
+- core-deps/libcdio.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/libcdio.bst b/elements/core-deps/libcdio.bst
similarity index 100%
rename from elements/world/libcdio.bst
rename to elements/core-deps/libcdio.bst
diff --git a/elements/world/libgphoto2.bst b/elements/core-deps/libgphoto2.bst
similarity index 100%
rename from elements/world/libgphoto2.bst
rename to elements/core-deps/libgphoto2.bst
diff --git a/elements/world/libimobiledevice.bst b/elements/core-deps/libimobiledevice.bst
similarity index 60%
rename from elements/world/libimobiledevice.bst
rename to elements/core-deps/libimobiledevice.bst
index 2781a0b0..b0f3440b 100644
--- a/elements/world/libimobiledevice.bst
+++ b/elements/core-deps/libimobiledevice.bst
@@ -1,14 +1,16 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: http://www.libimobiledevice.org/downloads/libimobiledevice-1.2.0.tar.bz2
-
-variables:
-  conf-local: >-
-    --without-cython
+  url: 
https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
-- world/libusbmuxd.bst
+- core-deps/libusbmuxd.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  conf-local: >-
+    --without-cython
diff --git a/elements/world/libmtp.bst b/elements/core-deps/libmtp.bst
similarity index 73%
rename from elements/world/libmtp.bst
rename to elements/core-deps/libmtp.bst
index c0bfb93d..20bd32e8 100644
--- a/elements/world/libmtp.bst
+++ b/elements/core-deps/libmtp.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: downloads.sourceforge.net:libmtp/libmtp/1.1.15/libmtp-1.1.15.tar.gz
+  url: downloads.sourceforge.net:libmtp/libmtp/1.1.17/libmtp-1.1.17.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/world/libnfs.bst b/elements/core-deps/libnfs.bst
similarity index 100%
rename from elements/world/libnfs.bst
rename to elements/core-deps/libnfs.bst
diff --git a/elements/world/libusbmuxd.bst b/elements/core-deps/libusbmuxd.bst
similarity index 56%
rename from elements/world/libusbmuxd.bst
rename to elements/core-deps/libusbmuxd.bst
index c3852697..a197d4d2 100644
--- a/elements/world/libusbmuxd.bst
+++ b/elements/core-deps/libusbmuxd.bst
@@ -1,9 +1,12 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: http://www.libimobiledevice.org/downloads/libusbmuxd-1.0.10.tar.bz2
+  url: https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
-- world/plist.bst
+- core-deps/plist.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/plist.bst b/elements/core-deps/plist.bst
similarity index 68%
rename from elements/world/plist.bst
rename to elements/core-deps/plist.bst
index 5e6a36f4..33bcdc1b 100644
--- a/elements/world/plist.bst
+++ b/elements/core-deps/plist.bst
@@ -1,13 +1,15 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: http://www.libimobiledevice.org/downloads/libplist-2.0.0.tar.bz2
-
-variables:
-  conf-local: >-
-    --without-cython
+  url: https://github.com/libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  conf-local: >-
+    --without-cython
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index afbb650f..3c020f5e 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -11,21 +11,21 @@ runtime-depends:
 - sdk/pygobject.bst
 - sdk/vala.bst
 depends:
-- core-deps/flatpak.bst
 - core-deps/flatpak-builder.bst
+- core-deps/flatpak.bst
 - core-deps/gspell.bst
-- core-deps/libdazzle.bst
-- core-deps/libpeas.bst
-- core-deps/vte.bst
 - core-deps/jsonrpc-glib.bst
+- core-deps/libdazzle.bst
 - core-deps/libgit2-glib.bst
+- core-deps/libpeas.bst
 - core-deps/template-glib.bst
+- core-deps/vte.bst
 - core/devhelp.bst
+- core/gvfs-daemon.bst
 - core/sysprof.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
-- sdk/gvfs.bst
 - sdk/librsvg.bst
 - freedesktop-sdk.bst:components/libportal.bst
 - freedesktop-sdk.bst:components/llvm.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index 7bc0ce39..d043b7f0 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -1,21 +1,23 @@
 kind: meson
+
 sources:
 - kind: tar
   url: gnome_downloads:gnome-music/3.37/gnome-music-3.37.3.tar.xz
   ref: 248bc8585963271a4d2ff7f249c9f792aaf0b4dfde1e94abb68c91501015cebe
+
 build-depends:
+- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
 - core-deps/libdazzle.bst
 - core-deps/libmediaart.bst
 - core-deps/tracker-miners.bst
+- core/gvfs-daemon.bst
 - sdk/adwaita-icon-theme.bst
-- sdk/gobject-introspection.bst
 - sdk/gtk+-3.bst
-- sdk/gvfs.bst
 - sdk/pygobject.bst
 - sdk/tracker.bst
-- freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core/gvfs-daemon.bst b/elements/core/gvfs-daemon.bst
new file mode 100644
index 00000000..3d3a7e7a
--- /dev/null
+++ b/elements/core/gvfs-daemon.bst
@@ -0,0 +1,37 @@
+kind: filter
+
+build-depends:
+- sdk-deps/gvfs.bst
+
+runtime-depends:
+- sdk/gvfs-client.bst
+- core-deps/gnome-online-accounts.bst
+- core-deps/libbluray.bst
+- core-deps/libcdio-paranoia.bst
+- core-deps/libgdata.bst
+- core-deps/libgphoto2.bst
+- core-deps/libimobiledevice.bst
+- core-deps/libmtp.bst
+- core-deps/libnfs.bst
+- core-deps/plist.bst
+- core-deps/samba.bst
+- core-deps/udisks2.bst
+- sdk/gcr.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- freedesktop-sdk.bst:components/avahi.bst
+- freedesktop-sdk.bst:components/dbus.bst
+- freedesktop-sdk.bst:components/fuse3.bst
+- freedesktop-sdk.bst:components/libarchive.bst
+- freedesktop-sdk.bst:components/libgudev.bst
+- freedesktop-sdk.bst:components/libusb.bst
+- freedesktop-sdk.bst:components/openssh.bst
+- freedesktop-sdk.bst:components/polkit.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+config:
+  exclude:
+  - gvfs-client
diff --git a/elements/core/meta-gnome-core-shell.bst b/elements/core/meta-gnome-core-shell.bst
index 19994b42..34013163 100644
--- a/elements/core/meta-gnome-core-shell.bst
+++ b/elements/core/meta-gnome-core-shell.bst
@@ -21,6 +21,7 @@ depends:
 - core/gnome-tour.bst
 - core/gnome-user-docs.bst
 - core/gnome-user-share.bst
+- core/gvfs-daemon.bst
 - core/mutter.bst
 - core/orca.bst
 - core/rygel.bst
@@ -28,4 +29,3 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/glib-networking.bst
 - sdk/gsettings-desktop-schemas.bst
-- sdk/gvfs.bst
diff --git a/elements/sdk-deps/gvfs.bst b/elements/sdk-deps/gvfs.bst
new file mode 100644
index 00000000..c51e5f4b
--- /dev/null
+++ b/elements/sdk-deps/gvfs.bst
@@ -0,0 +1,52 @@
+kind: meson
+
+sources:
+- kind: git_tag
+  url: gitlab_gnome_org:GNOME/gvfs.git
+  track: master
+
+build-depends:
+- freedesktop-sdk.bst:components/systemd.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- core-deps/gnome-online-accounts.bst
+- core-deps/libbluray.bst
+- core-deps/libcdio-paranoia.bst
+- core-deps/libgdata.bst
+- core-deps/libgphoto2.bst
+- core-deps/libimobiledevice.bst
+- core-deps/libmtp.bst
+- core-deps/libnfs.bst
+- core-deps/plist.bst
+- core-deps/samba.bst
+- core-deps/udisks2.bst
+- sdk/gcr.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/libsecret.bst
+- sdk/libsoup.bst
+- freedesktop-sdk.bst:components/avahi.bst
+- freedesktop-sdk.bst:components/dbus.bst
+- freedesktop-sdk.bst:components/fuse3.bst
+- freedesktop-sdk.bst:components/libarchive.bst
+- freedesktop-sdk.bst:components/libgudev.bst
+- freedesktop-sdk.bst:components/libusb.bst
+- freedesktop-sdk.bst:components/openssh.bst
+- freedesktop-sdk.bst:components/polkit.bst
+- freedesktop-sdk.bst:components/systemd-libs.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+public:
+  bst:
+    split-rules:
+      gvfs-client:
+      - '%{includedir}'
+      - '%{includedir}/**'
+      - '%{libdir}/gio/**'
+      - '%{libdir}/gvfs/libgvfscommon.so'
+      - '%{debugdir}%{libdir}/gio/**'
+      - '%{debugdir}%{libdir}/gvfs/libgvfscommon.so.debug'
+      - '%{debugdir}/dwz/**'
+      - '%{sourcedir}/%{element-name}/common/**'
+      - '%{sourcedir}/%{element-name}/client/**'
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 61356448..cc5fd102 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -1,8 +1,8 @@
 kind: stack
 depends:
 - sdk/WebKitGTK.bst
-- sdk/adwaita-icon-theme.bst
 - sdk/adobe-source-code-pro-fonts.bst
+- sdk/adwaita-icon-theme.bst
 - sdk/appstream-glib.bst
 - sdk/at-spi2-atk.bst
 - sdk/at-spi2-core.bst
@@ -30,7 +30,7 @@ depends:
 - sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
 - sdk/gtksourceview.bst
-- sdk/gvfs.bst
+- sdk/gvfs-client.bst
 - sdk/json-glib.bst
 - sdk/krb5.bst
 - sdk/libgee.bst
diff --git a/elements/sdk/gvfs-client.bst b/elements/sdk/gvfs-client.bst
new file mode 100644
index 00000000..505d2254
--- /dev/null
+++ b/elements/sdk/gvfs-client.bst
@@ -0,0 +1,13 @@
+kind: filter
+
+build-depends:
+- sdk-deps/gvfs.bst
+
+runtime-depends:
+- sdk/glib.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+config:
+  include:
+  - gvfs-client
+  include-orphans: false
diff --git a/elements/world/gnome-games.bst b/elements/world/gnome-games.bst
index 84d878a3..c637bf02 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -5,21 +5,20 @@ sources:
   track: master
 
 build-depends:
+- sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-
 depends:
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
 - core-deps/libhandy.bst
-- core-deps/tracker-miners-2.bst
 - core-deps/tracker-2.bst
+- core-deps/tracker-miners-2.bst
+- core/gvfs-daemon.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
-- sdk/gvfs.bst
 - sdk/librsvg.bst
 - sdk/libsoup.bst
-- sdk/vala.bst
 - world/gnome-themes-extra.bst
 - world/libmanette.bst
 - world/retro-gtk.bst