diff mbox series

[bug#66823,gnome-team,v2,2/6] gnu: feedbackd: Update to 0.2.1.

Message ID 342085efe49d5efdbd6524285a7dbdee85e4f1f9.1698610511.git.vivien@planete-kraus.eu
State New
Headers
Series Add GNOME Calls, slightly better |

Commit Message

Vivien Kraus Oct. 29, 2023, 4:32 p.m. UTC 
* 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        | 39 +++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch

Comments

Maxim Cournoyer Oct. 31, 2023, 2:38 p.m. UTC | #1 
Hi,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * 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.

[...]

> 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..4dc3534a07
> --- /dev/null
> +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch
> @@ -0,0 +1,39 @@
> +From 9a967f056379b0f024ceeff45fcb8889a3fe093e Mon Sep 17 00:00:00 2001
> +Message-ID: <9a967f056379b0f024ceeff45fcb8889a3fe093e.1698603600.git.vivien@planete-kraus.eu>
> +From: Vivien Kraus <vivien@planete-kraus.eu>
> +Date: Sun, 29 Oct 2023 19:12:27 +0100
> +Subject: [PATCH] Use a system-installed gmodule.
> +
> +* meson.build (gmobile_subp): Remove.
> +(gmobile): Make it a pkg-config dependency.
> +---
> + meson.build                | 8 +-------
> + subprojects/gmobile/.empty | 0
> + 2 files changed, 1 insertion(+), 7 deletions(-)
> + delete mode 100644 subprojects/gmobile/.empty
> +
> +diff --git a/meson.build b/meson.build
> +index 8725e76..347ded1 100644
> +--- a/meson.build
> ++++ b/meson.build
> +@@ -14,13 +14,7 @@ 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',
> +-                              default_options: [
> +-                                'examples=false',
> +-                                'gtk_doc=false',
> +-                                'tests=false',
> +-                              ])
> +-  gmobile        = gmobile_subp.get_variable('gmobile_dep')
> ++  gmobile        = dependency('gmobile')

There is a better way to accomplish the above, documented at [0].
Implemented as such, I think upstream would probably be interested in
merging it as-is, which we should do (forward the patch).  The
alternative is maintaining custom patches ad vitam aeternam, which is a
lot of work :-).

[0] https://mesonbuild.com/Subprojects.html#toggling-between-system-libraries-and-embedded-sources
diff mbox series

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..4dc3534a07
--- /dev/null
+++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch
@@ -0,0 +1,39 @@ 
+From 9a967f056379b0f024ceeff45fcb8889a3fe093e Mon Sep 17 00:00:00 2001
+Message-ID: <9a967f056379b0f024ceeff45fcb8889a3fe093e.1698603600.git.vivien@planete-kraus.eu>
+From: Vivien Kraus <vivien@planete-kraus.eu>
+Date: Sun, 29 Oct 2023 19:12:27 +0100
+Subject: [PATCH] Use a system-installed gmodule.
+
+* meson.build (gmobile_subp): Remove.
+(gmobile): Make it a pkg-config dependency.
+---
+ meson.build                | 8 +-------
+ subprojects/gmobile/.empty | 0
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+ delete mode 100644 subprojects/gmobile/.empty
+
+diff --git a/meson.build b/meson.build
+index 8725e76..347ded1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -14,13 +14,7 @@ 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',
+-                              default_options: [
+-                                'examples=false',
+-                                'gtk_doc=false',
+-                                'tests=false',
+-                              ])
+-  gmobile        = gmobile_subp.get_variable('gmobile_dep')
++  gmobile        = dependency('gmobile')
+   gsound         = dependency('gsound')
+   gudev          = dependency('gudev-1.0', version: '>=232')
+   json_glib      = dependency('json-glib-1.0')
+index e69de29..0000000
+
+base-commit: 853bd6d7ea8455efea063ba7c4f29ce8c203285f
+-- 
+2.41.0
+