From patchwork Thu Jan 9 21:38:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36826 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 C232727BBEC; Thu, 9 Jan 2025 22:31:05 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 BB84627BBEA for ; Thu, 9 Jan 2025 22:31:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tW12W-0007sQ-IA; Thu, 09 Jan 2025 17:30:08 -0500 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 1tW12V-0007qP-3L for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:07 -0500 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 1tW12U-0004Ot-Q3 for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=S3sylkAukZrrEyVvBHBT+Q2qj2iDhzvu/tOAotoMitQ=; b=fjiyijGTK42GOGndleQXkyJ0OAxnisP/Kr+EMyb530yMvOnD3btpZS1oZbIe1UBrE0Z8W/BaLA0D52gNm34p/GQ7Q716M3fpFfa318pW//6Fs592yu4iz0124KGFBYIQclystbb08h2vBd1zmEtlJRdoqWut+BsnIvQ/M8M3cooVqFuYjqM+Duq78yGJcWO4pp5Iu+e2dySpOObgA7l6aVxa9oT9+SoS8zOzEimomoFin6BJt8DDXBjjVjkSwu3lLmg+HGB+w6sT0OzSpVslP0cOmsFL8Wq8SNRb7kNRseopuu2aNaCokZe/FKEkQiR20sh42iKnTcmw0kNLwrirjg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tW12T-0001SF-BO; Thu, 09 Jan 2025 17:30:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75470] [PATCH gnome-team 03/59] gnu: feedbackd: Update to 0.6.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2025 22:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75470@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75470-submit@debbugs.gnu.org id=B75470.17364617925406 (code B ref 75470); Thu, 09 Jan 2025 22:30:05 +0000 Received: (at 75470) by debbugs.gnu.org; 9 Jan 2025 22:29:52 +0000 Received: from localhost ([127.0.0.1]:54835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tW12F-0001Ox-5x for submit@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:51 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:44494) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tW12A-0001Nk-TL for 75470@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:47 -0500 Received: by mail-wm1-x342.google.com with SMTP id 5b1f17b1804b1-43618283d48so11441385e9.1 for <75470@debbugs.gnu.org>; Thu, 09 Jan 2025 14:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736461781; x=1737066581; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=S3sylkAukZrrEyVvBHBT+Q2qj2iDhzvu/tOAotoMitQ=; b=dQvyuUniabl+3bsN3zJNLUzpdqVwSsEDxJYYVwpRiedrVzvX9c5TK/excGZfdI6jXV RDBA0tX6SIE6I19ew6FDVqo1juVGzsrkPOESAZwAoUV8s9b1ShSTCJ9kr6M0fVg51aE0 tJBc3uqyj8KbJpVpj+tFCJ1Qi7EWhAnIppellgdcZOcPuGllwGdX9AFvqI7hiHHIyhYT gqHwNH38AkWHD/1nK7UvxoteiKp4VNfrFtmzJ//4wQrvMmhEjIxBdjvKUEu/aXPjoyp1 9yDK+iwq4I7bjXbjRPfadF3+RAsgBLkJdtqML995uUH5d1bdkrb7f2WvuT3Mr3RkkCUy 4NQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736461781; x=1737066581; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S3sylkAukZrrEyVvBHBT+Q2qj2iDhzvu/tOAotoMitQ=; b=gm/ZXjL8j4I79dNIFjA3cD99Z1IkwH/Qv+fpNGD/8qVI4k6FJpa1DprHCFVMkSaDm/ jZCW9iSr97FaGoFogxWuce2jUWhMpZUOQi3Y1U2WrdG0lRBAX0hFIDCORkLpriPAAX+y O75ThlXAKAr7VzFvnQ4X1UWXZ+hRj0vCuXIYYtr3doynod3Fj0NiHcX3PK9cwxLsbXoU olLYTfHw4lCSJp2N2TKl3q13IwzBRSpFO0d/U+Jq5B+PtUF876A47pQqaXSxxktfd5ws GhxvM11owEPa93UhvRcx4bgI4rjY3Vs1opohnv6kdl+6hWd50ZDFTlk/5TvQSluHE/XX 1xPw== X-Gm-Message-State: AOJu0YzqVQV0yvK4tOgdpvAx6Q0Fjs2B5qnntQ9njFAc1pk4q8Wz1F2A qHBt7XO7nbP2OeS/dW0dlbKwG1YBlPmO5dKICvDL2uWRSwUCznZcMCh4eu1E X-Gm-Gg: ASbGncvsaKfjbYXkjkI3PPgZUC/rezMXVKJdeigRbRTt2W5aLTq0VBerOHo0Sm1agRZ Pjctb/1WPdYWgIh4K7VicYyyI2t5AfZRbIdbBoenbuGx/ZAALm7ea74aggjIxCuWnWLvzdbvkO+ Wvc3WnuvQuhYzy9BiN3dyfB825ValDaka3XXRh8RIxuQYeu2cxuHEAgiKhldRHS6BSy8gbsdKcn zs1elsbmMkQf+W8CBMeDa/MJU68EPcOK5l5I90Xt9oJDdk482jYI1/1rIW/wC1DV0kFlq8X1AIM noF38Wr4hSVk3x2iJqHX2bQJ2WOZcFcb X-Google-Smtp-Source: AGHT+IHRUoqvdqCgOmmZJthDBWXMw51wQFiaB4S6jFUrH0NfWOjfuRgO6QGyzMAjavwhsTFyi0KdKA== X-Received: by 2002:a05:6000:1a8c:b0:382:6f3:a20f with SMTP id ffacd0b85a97d-38a872f6f9amr6946181f8f.11.1736461780756; Thu, 09 Jan 2025 14:29:40 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9dc895esm33120785e9.13.2025.01.09.14.29.40 for <75470@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 14:29:40 -0800 (PST) Message-ID: <163afbcae2a6460e26db1c3506e3f66fe5e44608.1736458798.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 9 Jan 2025 22:38:03 +0100 MIME-Version: 1.0 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: , 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.6.0. [source]: Drop patches. [#:phases]: Add ‘fix-meson’ [native-inputs]: Add umockdev. * gnu/packages/patches/feedbackd-use-system-gmobile.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it from here. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 16 ++++--- .../feedbackd-use-system-gmobile.patch | 42 ------------------- 3 files changed, 11 insertions(+), 48 deletions(-) delete mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 273c7e7e96..1501db038e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1255,7 +1255,6 @@ dist_patch_DATA = \ %D%/packages/patches/fbgemm-use-system-libraries.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 45d0de95e5..74b4afd4d8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13479,7 +13479,7 @@ (define-public gmobile (define-public feedbackd (package (name "feedbackd") - (version "0.2.1") + (version "0.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -13488,16 +13488,22 @@ (define-public feedbackd (file-name (git-file-name name version)) (sha256 (base32 - "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")) - (patches - (search-patches "feedbackd-use-system-gmobile.patch")) + "0gfh965rddmg9glyh0gzkzxi27c7kfdakwrkycc7hg7s68p03xgh")) (snippet #~(begin (use-modules (guix build utils)) (delete-file-recursively "subprojects"))))) (build-system meson-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-meson + (lambda _ + (substitute* "meson.build" + (("udev.get_variable\\('udevdir'\\)") + "prefix / 'lib' / 'udev'"))))))) (native-inputs - (list `(,glib "bin") gobject-introspection pkg-config vala)) + (list `(,glib "bin") gobject-introspection pkg-config umockdev vala)) (inputs (list dbus gmobile gsound json-glib libgudev)) (propagated-inputs diff --git a/gnu/packages/patches/feedbackd-use-system-gmobile.patch b/gnu/packages/patches/feedbackd-use-system-gmobile.patch deleted file mode 100644 index f0a0449472..0000000000 --- a/gnu/packages/patches/feedbackd-use-system-gmobile.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 -