Subject: [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1.

From: Vivien Kraus <[email-masked]>
Date: Tue, 31 Oct 2023 20:34:35 +0100

* gnu/packages/gnome.scm (feedbackd): Update to 0.2.1.
[#:phases]: Add 'unpack-gmobile.
(inputs): Add gmobile.
* gnu/packages/patches/feedbackd-use-system-gmobile.patch: New file.
* gnu/packages/gnome.scm (feedbackd) [patches]: Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/gnome.scm (feedbackd) [snippet]: Remove the gmobile submodule.

Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gnome.scm                        | 12 ++++--
 .../feedbackd-use-system-gmobile.patch        | 40 +++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 92b56289f2..fc3e36fc18 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1155,6 +1155,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/fasthenry-spFactor.patch			\
   %D%/packages/patches/fbreader-curl-7.62.patch		\
   %D%/packages/patches/fbreader-fix-icon.patch		\
+  %D%/packages/patches/feedbackd-use-system-gmobile.patch	\
   %D%/packages/patches/fenics-dolfin-algorithm.patch		\
   %D%/packages/patches/fenics-dolfin-demo-init.patch		\
   %D%/packages/patches/fenics-dolfin-boost.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0933bf7d34..8159d0d792 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12945,7 +12945,7 @@ (define-public gmobile
 (define-public feedbackd
   (package
     (name "feedbackd")
-    (version "0.0.0+git20200527")
+    (version "0.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -12954,12 +12954,18 @@ (define-public feedbackd
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y"))))
+                "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q"))
+              (patches
+               (search-patches "feedbackd-use-system-gmobile.patch"))
+              (snippet
+               #~(begin
+                   (use-modules (guix build utils))
+                   (delete-file-recursively "subprojects")))))
     (build-system meson-build-system)
     (native-inputs
      (list `(,glib "bin") gobject-introspection pkg-config vala))
     (inputs
-     (list dbus gsound json-glib libgudev))
+     (list dbus gmobile gsound json-glib libgudev))
     (propagated-inputs
      (list glib)) ; in Requires of libfeedback-0.0.pc
     (synopsis "Haptic/visual/audio feedback via DBus")
diff --git a/gnu/packages/patches/feedbackd-use-system-gmobile.patch b/gnu/packages/patches/feedbackd-use-system-gmobile.patch
new file mode 100644
index 0000000000..206a7c57ec
--- /dev/null
+++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch
@@ -0,0 +1,40 @@
+From af9e72124b12ca481fd3592f9c8ea2649f7e4c80 Mon Sep 17 00:00:00 2001
+Message-ID: <[email-masked]>
+From: Vivien Kraus <[email-masked]>
+Date: Sun, 29 Oct 2023 19:12:27 +0100
+Subject: [PATCH] Look for a system-installed gmobile first.
+
+Meson lets projects use a dependency with fallback to a submodule, in
+case the dependency is not installed.
+
+* meson.build (gmobile_subp): Convert to a dependency with subproject
+fallback.
+---
+ meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 8725e76..e5504be 100644
+--- a/meson.build
++++ b/meson.build
+@@ -14,13 +14,13 @@ gio_unix       = dependency('gio-unix-2.0', version: '>=2.50.0')
+ glib           = dependency('glib-2.0', version: '>=2.50.0')
+ if get_option('daemon')
+   gobject        = dependency('gobject-2.0', version: '>=2.50.0')
+-  gmobile_subp   = subproject('gmobile',
++  gmobile        = dependency('gmobile',
++                              fallback: ['gmobile', 'gmobile_dep'],
+                               default_options: [
+                                 'examples=false',
+                                 'gtk_doc=false',
+                                 'tests=false',
+                               ])
+-  gmobile        = gmobile_subp.get_variable('gmobile_dep')
+   gsound         = dependency('gsound')
+   gudev          = dependency('gudev-1.0', version: '>=232')
+   json_glib      = dependency('json-glib-1.0')
+
+base-commit: 853bd6d7ea8455efea063ba7c4f29ce8c203285f
+-- 
+2.41.0
+
-- 
2.41.0