[gnome-build-meta/valentindavid/snapd: 15/16] gnome-software: Add support for snapd




commit 33304e5ede2250bd4e0e44ea34ce8717aaec8907
Author: Valentin David <me valentindavid com>
Date:   Wed Oct 13 15:20:21 2021 +0200

    gnome-software: Add support for snapd
    
    The plugin is only installed in the development tree.

 elements/core-deps/snapd-glib.bst     | 19 ++++++++++++
 elements/core/gnome-software-all.bst  | 57 +++++++++++++++++++++++++++++++++++
 elements/core/gnome-software-snap.bst | 13 ++++++++
 elements/core/gnome-software.bst      | 30 +++++-------------
 elements/vm/deps-devel.bst            |  1 +
 5 files changed, 98 insertions(+), 22 deletions(-)
---
diff --git a/elements/core-deps/snapd-glib.bst b/elements/core-deps/snapd-glib.bst
new file mode 100644
index 000000000..5d74d14e6
--- /dev/null
+++ b/elements/core-deps/snapd-glib.bst
@@ -0,0 +1,19 @@
+kind: meson
+
+sources:
+- kind: tar
+  url: github_com:snapcore/snapd-glib/releases/download/1.59/snapd-glib-1.59.tar.xz
+
+build-depends:
+- sdk/gobject-introspection.bst
+- sdk/gtk-doc.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+depends:
+- sdk/json-glib.bst
+- sdk/libsoup-2.4.bst
+- sdk/vala.bst
+
+variables:
+  meson-local: >-
+    -Dqt-bindings=false
diff --git a/elements/core/gnome-software-all.bst b/elements/core/gnome-software-all.bst
new file mode 100644
index 000000000..d55a0cd5e
--- /dev/null
+++ b/elements/core/gnome-software-all.bst
@@ -0,0 +1,57 @@
+kind: meson
+
+sources:
+- kind: git_tag
+  url: gitlab_gnome_org:GNOME/gnome-software.git
+  track: main
+
+build-depends:
+- sdk/gtk-doc.bst
+- sdk/sysprof-minimal.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
+# Runtime depenencies
+- core-deps/appstream.bst
+- core-deps/eos-updater.bst
+- core-deps/flatpak.bst
+- core-deps/fwupd.bst
+- core-deps/gnome-online-accounts.bst
+- core-deps/gspell.bst
+- core-deps/liboauth.bst
+- core-deps/malcontent.bst
+- core-deps/snapd-glib.bst
+- core-deps/xmlb.bst
+- core/gnome-desktop.bst
+- sdk/adwaita-icon-theme.bst
+- sdk/glib.bst
+- sdk/gsettings-desktop-schemas.bst
+- sdk/gtk+-3.bst
+- sdk/libhandy.bst
+- sdk/libsecret.bst
+- sdk/libsoup-2.4.bst
+- freedesktop-sdk.bst:components/libgudev.bst
+- freedesktop-sdk.bst:components/polkit.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+
+variables:
+  meson-local: >-
+    -Dfwupd=true
+    -Dvalgrind=false
+    -Dpolkit=true
+    -Dflatpak=true
+    -Deos_updater=true
+    -Dpackagekit=false
+    -Dsnap=true
+
+config:
+  configure-commands:
+    (<):
+    #FIXME: fix eos-updater and gnome-software upstream to use the "osname"
+    - |
+      sed -i 's/Endless OS/GNOME OS/' plugins/eos-updater/gs-plugin-eos-updater.c po/*.po
+
+public:
+  bst:
+    split-rules:
+      snap-plugin:
+      - "%{libdir}/gnome-software/plugins-*/libgs_plugin_snap.so"
diff --git a/elements/core/gnome-software-snap.bst b/elements/core/gnome-software-snap.bst
new file mode 100644
index 000000000..fa8b84dde
--- /dev/null
+++ b/elements/core/gnome-software-snap.bst
@@ -0,0 +1,13 @@
+kind: filter
+
+build-depends:
+- core/gnome-software-all.bst
+
+runtime-depends:
+- core/gnome-software.bst
+- core-deps/snapd-glib.bst
+
+config:
+  include-orphans: false
+  include:
+  - snap-plugin
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index ae9e8c4d2..fb264668d 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -1,13 +1,9 @@
-kind: meson
-sources:
-- kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-software.git
-  track: main
+kind: filter
+
 build-depends:
-- sdk/gtk-doc.bst
-- sdk/sysprof-minimal.bst
-- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
-depends:
+- core/gnome-software-all.bst
+
+runtime-depends:
 - core-deps/appstream.bst
 - core-deps/eos-updater.bst
 - core-deps/flatpak.bst
@@ -28,17 +24,7 @@ depends:
 - freedesktop-sdk.bst:components/libgudev.bst
 - freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
-variables:
-  meson-local: >-
-    -Dfwupd=true
-    -Dvalgrind=false
-    -Dpolkit=true
-    -Dflatpak=true
-    -Deos_updater=true
-    -Dpackagekit=false
+
 config:
-  configure-commands:
-    (<):
-    #FIXME: fix eos-updater and gnome-software upstream to use the "osname"
-    - |
-      sed -i 's/Endless OS/GNOME OS/' plugins/eos-updater/gs-plugin-eos-updater.c po/*.po
+  exclude:
+  - snap-plugin
diff --git a/elements/vm/deps-devel.bst b/elements/vm/deps-devel.bst
index c02e207fb..a5b326e71 100644
--- a/elements/vm/deps-devel.bst
+++ b/elements/vm/deps-devel.bst
@@ -2,6 +2,7 @@ kind: stack
 
 depends:
 - sdk.bst
+- core/gnome-software-snap.bst
 - core/meta-gnome-core-developer-tools.bst
 - vm/buildstream/bst-external.bst
 - vm/buildstream/buildstream.bst


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]