From patchwork Thu Oct 12 08:19:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 54775 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 F071E27BBE9; Thu, 12 Oct 2023 13:37:11 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5003227BBE2 for ; Thu, 12 Oct 2023 13:37:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qquvi-00039d-Ls; Thu, 12 Oct 2023 08:36:42 -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 1qquvh-00039B-C8 for guix-patches@gnu.org; Thu, 12 Oct 2023 08:36:41 -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 1qquvh-0006Lm-3o for guix-patches@gnu.org; Thu, 12 Oct 2023 08:36:41 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qquw2-0000Qa-2c; Thu, 12 Oct 2023 08:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66488] [PATCH gnome-team 3/3] gnu: gitg: Update to 44. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Thu, 12 Oct 2023 12:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66488@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by 66488-submit@debbugs.gnu.org id=B66488.16971141961591 (code B ref 66488); Thu, 12 Oct 2023 12:37:02 +0000 Received: (at 66488) by debbugs.gnu.org; 12 Oct 2023 12:36:36 +0000 Received: from localhost ([127.0.0.1]:41235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qquvc-0000PX-01 for submit@debbugs.gnu.org; Thu, 12 Oct 2023 08:36:36 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:50450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qquvX-0000Oy-Ew for 66488@debbugs.gnu.org; Thu, 12 Oct 2023 08:36:32 -0400 Received: by mail-wr1-x441.google.com with SMTP id ffacd0b85a97d-32d895584f1so812382f8f.1 for <66488@debbugs.gnu.org>; Thu, 12 Oct 2023 05:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697114163; x=1697718963; 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=7LOTe1JShjTvsOhoI7Y6qv+wXPA9/hD+1eb1+rFIVE4=; b=EYGiab3Exuuw30hYm8L46okjPoWGve8oT/aQMhxUYnqIGezvqz6OKODK5AerH9qhvx 0B4bSh8K+1u3GrEuUguLpN+T9iXxK8pOv21PPDWte/vU589oXqig/i2IXx6F42IMM+dF 4o/pZQTq69bP8e3FwNLZzrQpANl2+RJngbbxpyWwHF9e0V/Um14riV8VaxpsueZVPbtR PHlyoOtJaZS9SGApVFK47QA9AkbFxhS9fyKIpcPQDp6z4y9n34FxV4hnaMzyhY5IcRVh yhMkANypf3LZqsloP27NcOBdxO13ojPq5aeJINhcMeToX9UAF9Ae4Qg8bg58bfttw17G hv2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697114163; x=1697718963; 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=7LOTe1JShjTvsOhoI7Y6qv+wXPA9/hD+1eb1+rFIVE4=; b=TYh8aHbFcXnqoXICoRFRNsUihotv5fnJlGGUHUUdP+dT2WgZBhgr1hNGAujcA7VaGV 9nZsgTcPzNqsFzx/1C5cll/fwpL868FJLGKt9tXD/FxYXdGAp0edjTLNMWYRjkCwt7b7 R53c64ZhipY94phQsHVW2GeWZ6aXiFS+l0DhRIwbYU/3XzDe26o6jmRJMFOi4/wgORfQ zJiB9i4zc0Xz3sOqcJTUngmhEg1QX8WACZBJlbhBH5qc1FxIbHMblY9wcupMSxCuJUhS xFBCRmibcqV19dk2YGNzGHRMYY41QncBe7qORCXJKqpGylwe9+1kfymcyiFtRrYRWvgJ yuOw== X-Gm-Message-State: AOJu0YxS+v6gKZEf/6I/TRIzxJnUHPrSJcWLa6S5cD2+jtqpPK0tcuXS I85+kUNMGTCE4iraAjKdAcPaSGCdqKPVqw== X-Google-Smtp-Source: AGHT+IHaLyUp5CvYGPXixYGypBkRPXGSGK+4JRL88j4HKkPU8de3VnVqIg2tFaeAiv+DsgwKtUn9GA== X-Received: by 2002:adf:a31e:0:b0:32d:888a:c2cf with SMTP id c30-20020adfa31e000000b0032d888ac2cfmr3997162wrb.7.1697114163218; Thu, 12 Oct 2023 05:36:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b0032d9548240fsm913309wrt.82.2023.10.12.05.36.00 for <66488@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 05:36:00 -0700 (PDT) Message-ID: <0885dce7b23d02521dcfa12eed500eecba62a34d.1697113419.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:19:35 +0200 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 (gitg): Update to 44. [source]: Remove “gitg-fix-positional-argument.patch”. [inputs]: Add gpgme and libhandy. * gnu/packages/patches/gitg-fix-positional-argument.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 7 ++-- .../gitg-fix-positional-argument.patch | 36 ------------------- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/gitg-fix-positional-argument.patch diff --git a/gnu/local.mk b/gnu/local.mk index be4c304e9b..0c0e587ae6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1276,7 +1276,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/gitg-fix-positional-argument.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 59acd8381d..fc815b25ec 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12027,7 +12027,7 @@ (define-public libgit2-glib (define-public gitg (package (name "gitg") - (version "41") + (version "44") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -12035,8 +12035,7 @@ (define-public gitg name "-" version ".tar.xz")) (sha256 (base32 - "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz")) - (patches (search-patches "gitg-fix-positional-argument.patch")))) + "0m135v2qm5kaa2jki0y2lbh0wa69bqfh9a4cm7db153v7smrj3jv")))) (build-system meson-build-system) (arguments (list @@ -12060,6 +12059,7 @@ (define-public gitg `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (inputs (list glib + gpgme gsettings-desktop-schemas gspell gtk+ @@ -12068,6 +12068,7 @@ (define-public gitg libdazzle libgee libgit2-glib + libhandy libpeas libsecret libsoup-minimal-2 diff --git a/gnu/packages/patches/gitg-fix-positional-argument.patch b/gnu/packages/patches/gitg-fix-positional-argument.patch deleted file mode 100644 index 1d3513921c..0000000000 --- a/gnu/packages/patches/gitg-fix-positional-argument.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 12:17:52 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:8:0: ERROR: Function does not take positional arguments. -data/meson.build:44:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index a8b90fd1..2413531d 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -6,7 +6,6 @@ desktop_config = configuration_data() - desktop_config.set('icon', application_id) - desktop_config.set('binary', gitg_name) - i18n.merge_file( -- desktop, - type: 'desktop', - input: configure_file( - input: desktop + '.in.in', -@@ -42,7 +41,6 @@ appdata_config = configuration_data() - appdata_config.set('app-id', application_id) - appdata_config.set('gettext', gitg_name) - i18n.merge_file( -- appdata, - type: 'xml', - input: configure_file( - input: appdata + '.in.in', --- -GitLab -