From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: 66823@debbugs.gnu.org,
Liliana Marie Prikler <liliana.prikler@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: rg@raghavgururajan.name
Subject: [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1.
Date: Tue, 31 Oct 2023 20:34:35 +0100 [thread overview]
Message-ID: <42ba9cc64b721fd4cab8e86043644c8b27078094.1698944849.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1698944848.git.vivien@planete-kraus.eu>
* gnu/packages/gnome.scm (feedbackd): Update to 0.2.1.
(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 | 42 +++++++++++++++++++
3 files changed, 52 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..f0a0449472
--- /dev/null
+++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch
@@ -0,0 +1,42 @@
+From af9e72124b12ca481fd3592f9c8ea2649f7e4c80 Mon Sep 17 00:00:00 2001
+Message-ID: <af9e72124b12ca481fd3592f9c8ea2649f7e4c80.1698775513.git.vivien@planete-kraus.eu>
+From: Vivien Kraus <vivien@planete-kraus.eu>
+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.
+---
+I am waiting for Purism to approve my account before I can report this.
+
+ 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
next prev parent reply other threads:[~2023-11-02 17:16 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via
2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via
2023-10-29 17:09 ` Liliana Marie Prikler
2023-10-31 14:21 ` Maxim Cournoyer
2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via
2023-10-29 17:10 ` Liliana Marie Prikler
2023-10-31 13:54 ` Maxim Cournoyer
2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via
2023-10-29 17:13 ` Liliana Marie Prikler
2023-10-31 14:00 ` Maxim Cournoyer
2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio Vivien Kraus via Guix-patches via
2023-10-31 14:02 ` Maxim Cournoyer
2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via
2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via
2023-10-31 14:43 ` Maxim Cournoyer
2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via
2023-10-31 14:38 ` Maxim Cournoyer
2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team v2 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via
2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team v2 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via
2023-10-29 18:34 ` [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via
2023-10-31 14:30 ` Maxim Cournoyer
2023-10-29 19:05 ` [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via
2023-10-31 14:40 ` Maxim Cournoyer
2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls Vivien Kraus via Guix-patches via
2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via
2023-11-01 3:06 ` Maxim Cournoyer
2023-11-01 11:44 ` Liliana Marie Prikler
2023-11-01 15:30 ` Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via
2023-11-01 3:09 ` Maxim Cournoyer
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls Vivien Kraus via Guix-patches via
2023-11-01 3:15 ` Maxim Cournoyer
2023-11-01 15:32 ` Vivien Kraus via Guix-patches via
2023-11-01 19:26 ` Maxim Cournoyer
2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` Vivien Kraus via Guix-patches via [this message]
2023-11-02 18:08 ` [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1 Liliana Marie Prikler
2023-11-07 15:45 ` Maxim Cournoyer
2023-11-07 16:54 ` Liliana Marie Prikler
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via
2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via
2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 6/6] gnu: Add calls Vivien Kraus via Guix-patches via
2023-11-02 18:11 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Liliana Marie Prikler
2023-11-04 7:01 ` bug#66823: " Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42ba9cc64b721fd4cab8e86043644c8b27078094.1698944849.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=66823@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.