From patchwork Tue Dec 28 21:09:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 35755 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 493F027BBEA; Tue, 28 Dec 2021 21:10:58 +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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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 BCCF527BBE9 for ; Tue, 28 Dec 2021 21:10:57 +0000 (GMT) Received: from localhost ([::1]:50868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n2JkG-00013b-TY for patchwork@mira.cbaines.net; Tue, 28 Dec 2021 16:10:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2JjO-00013A-Da for guix-patches@gnu.org; Tue, 28 Dec 2021 16:10:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36025) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n2JjO-0007l5-04 for guix-patches@gnu.org; Tue, 28 Dec 2021 16:10:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n2JjN-00055c-MX for guix-patches@gnu.org; Tue, 28 Dec 2021 16:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52858] [PATCH] gnu: passwordsafe: Update to 5.1. Resent-From: raingloom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Dec 2021 21:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52858 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52858@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.164072577519527 (code B ref -1); Tue, 28 Dec 2021 21:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2021 21:09:35 +0000 Received: from localhost ([127.0.0.1]:47571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2Jix-00054t-CQ for submit@debbugs.gnu.org; Tue, 28 Dec 2021 16:09:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:52476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n2Jis-00054i-Bu for submit@debbugs.gnu.org; Tue, 28 Dec 2021 16:09:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2Jir-0000vJ-Uy for guix-patches@gnu.org; Tue, 28 Dec 2021 16:09:30 -0500 Received: from mx1.riseup.net ([198.252.153.129]:38710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n2Jip-0007hp-Px for guix-patches@gnu.org; Tue, 28 Dec 2021 16:09:29 -0500 Received: from fews1.riseup.net (fews1-pn.riseup.net [10.0.1.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4JNnGZ0bsvzDqRy for ; Tue, 28 Dec 2021 13:09:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1640725766; bh=d9LzlYiIPFjdrmELH1JCDQz3bWjYcuJST9ebEtBlu+E=; h=Date:From:To:Subject:From; b=mOt/yMs3mGErZtlAzRTgFxoU8vFmsUL+TB3D4I/WEZmaBw9trrFuctJOo6Xt3g2jI cazhaetXE22zuwrzr5KU3wvy9dFAuaQ9hi2Fd5iX+hWYhVRqYjCx0KhNThFK0StmG7 1Gw7qooaiDcO5UWbjxhc9EO/ki4XCnGESaJsleFQ= X-Riseup-User-ID: 5D38265F5C7C3783676B87306FCF6F00E1BE614446E721CDB8BEEB9CDF01D5AC Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4JNnGY4FP8z5vbc for ; Tue, 28 Dec 2021 13:09:25 -0800 (PST) Date: Tue, 28 Dec 2021 22:09:13 +0100 From: raingloom Message-ID: <20211228220913.72c185d5@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (passwordsafe): Update to 5.1. * gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 7 ++++--- ...wordsafe-meson-remove-extra-argument.patch | 20 +++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch %D%/packages/patches/pciutils-hurd-fix.patch \ %D%/packages/patches/pitivi-fix-build-with-meson-0.60.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 47178a9de9..d98d1968e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10707,16 +10707,17 @@ (define-public cheese (define-public passwordsafe (package (name "passwordsafe") - (version "5.0") + (version "5.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.gnome.org/World/PasswordSafe") + (url "https://gitlab.gnome.org/World/secrets") (commit version))) (file-name (git-file-name name version)) + (patches (search-patches "passwordsafe-meson-remove-extra-argument.patch")) (sha256 - (base32 "1xh64bbg10gnfzlck5jvqy2zk6hbk9cyqgv85xc9kbdvs8n4lhgh")))) + (base32 "0kd43j6i017wdsqj6d5gnxhfv4ijnh3xahlw7md2gh51i8p682j6")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch b/gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch new file mode 100644 index 0000000000..3cb61a364a --- /dev/null +++ b/gnu/packages/patches/passwordsafe-meson-remove-extra-argument.patch @@ -0,0 +1,20 @@ +diff --git a/data/meson.build b/data/meson.build +index 46f6373..26a2c18 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -35,7 +35,6 @@ if get_option('profile') == 'development' + endif + desktop_conf.set('ICON', application_id) + desktop = i18n.merge_file( +- 'desktop', + input: configure_file( + input: files('org.gnome.PasswordSafe.desktop.in.in'), + output: 'org.gnome.PasswordSafe.desktop.in', +@@ -65,7 +64,6 @@ if get_option('profile') == 'development' + endif + appdata_conf.set('APPID', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.PasswordSafe.appdata.xml.in.in'), + output: 'org.gnome.PasswordSafe.appdata.xml.in', diff --git a/gnu/local.mk b/gnu/local.mk index 72fa405e17..0cac2b5508 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1570,6 +1570,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ + %D%/packages/patches/passwordsafe-meson-remove-extra-argument.patch \ %D%/packages/patches/pciutils-hurd-configure.patch \