From patchwork Sun Oct 29 16:32:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 18617 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 A2A7327BBEA; Sun, 29 Oct 2023 20:22:42 +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 82BF527BBE2 for ; Sun, 29 Oct 2023 20:22:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxCIu-0005yU-M1; Sun, 29 Oct 2023 16:22:37 -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 1qxCIn-0005tV-8C for guix-patches@gnu.org; Sun, 29 Oct 2023 16:22: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 1qxCIm-0006fy-S5 for guix-patches@gnu.org; Sun, 29 Oct 2023 16:22:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxCJJ-0002Of-IL for guix-patches@gnu.org; Sun, 29 Oct 2023 16:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 20:23: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: Liliana Marie Prikler Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com, 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.16986109269112 (code B ref 66823); Sun, 29 Oct 2023 20:23:01 +0000 Received: (at 66823) by debbugs.gnu.org; 29 Oct 2023 20:22:06 +0000 Received: from localhost ([127.0.0.1]:43430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxCIP-0002Mt-Cu for submit@debbugs.gnu.org; Sun, 29 Oct 2023 16:22:05 -0400 Received: from planete-kraus.eu ([89.234.140.182]:59382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxCIN-0002MZ-3i for 66823@debbugs.gnu.org; Sun, 29 Oct 2023 16:22:03 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id a04c794d; Sun, 29 Oct 2023 20:21: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=albinoniB; bh=cQcGlK3L6DmjYaDC60giN98MCi8=; b=y 4QHvC2vddHkJmeszZInCHklt6RQh3w5E/uvRYOtTSUdqmqlYPIhanvHOW8cUNpx7 1zvC6M5hYuZl2iecEdFtz1/QtKcPy6wAiFvFoFIeuvysKNKev54scMeMwn/XewpN ta2IXCb666NrHiFAcc2soegf/zQaQax465Tbe+S7HubplUwpVl7/jPgld6B62XX3 zS2VdLjxzMrpxbEbRgqt3Tg5rxMHeLVnIYIDgV5hlrXPYIBhrIsybJVvC/cW/URC fnNhVwM/pYmE406ticEeKLRvHpeHEoCzBgWgHL5c46pkCRziAIzGLgl4niHMeaCY JPrD7m6FYUKJ4NtkzhGhA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 79745f88 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 29 Oct 2023 20:21:29 +0000 (UTC) Message-ID: <342085efe49d5efdbd6524285a7dbdee85e4f1f9.1698610511.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sun, 29 Oct 2023 17:32:11 +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. [#: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 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 +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 +