From patchwork Tue Oct 31 19:34:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55854 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A723727BBE2; Thu, 2 Nov 2023 17:16:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 64E3827BBEC for ; Thu, 2 Nov 2023 17:16:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qybIG-0001B0-5d; Thu, 02 Nov 2023 13:15:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qybI0-0000xB-Dm for guix-patches@gnu.org; Thu, 02 Nov 2023 13:15:29 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qybHz-0008WM-U4 for guix-patches@gnu.org; Thu, 02 Nov 2023 13:15:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qybIX-0001UZ-TT for guix-patches@gnu.org; Thu, 02 Nov 2023 13:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Nov 2023 17:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66823@debbugs.gnu.org, Liliana Marie Prikler , Maxim Cournoyer Cc: rg@raghavgururajan.name Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.16989453105595 (code B ref 66823); Thu, 02 Nov 2023 17:16:01 +0000 Received: (at 66823) by debbugs.gnu.org; 2 Nov 2023 17:15:10 +0000 Received: from localhost ([127.0.0.1]:55936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qybHi-0001SA-1t for submit@debbugs.gnu.org; Thu, 02 Nov 2023 13:15:10 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qybHf-0001Ry-53 for 66823@debbugs.gnu.org; Thu, 02 Nov 2023 13:15:08 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 42be4d0c; Thu, 2 Nov 2023 17:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=+mZOtlG2I18aizXbJgPWdQVFX4g=; b=S TKzq8yBjgBA8mcFjWDeVXoXM9fL7kNAvR3Ob6AyCxxz6wtmdfUUa4g+Hnu8hOTtM CsTg8QwLCMw1fePlRPiZlVVFjx/f2tPzXK0+OkobKj31bXOuny0xrlHSFq/GR9Tt jVTuI0cRERTE2rMSzt/BOQhRTOM+nd6yXd6F7Wx+L5DY+bKa3MtlQtZDv/0fEQRn qbT1JjcXQNx2XspkFVkJA4uD5Az5N3vXABavdkjPZ7RHN3oKRwvArzNUFdm8m+Oy C17B/rbw/GdBid4VWJiC6pSL8oBVdNtfcjfeGGAo1mKkgqyScuL4heILOTf1x37z zgFV3siBaOgtxDMeNk5Eg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 8aad167d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 2 Nov 2023 17:14:28 +0000 (UTC) Message-ID: <42ba9cc64b721fd4cab8e86043644c8b27078094.1698944849.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 31 Oct 2023 20:34:35 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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: +From: Vivien Kraus +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 +