[bug#52858] [PATCH] gnu: passwordsafe: Update to 5.1.

[bug#52858] [PATCH] gnu: passwordsafe: Update to 5.1.

[raingloom]

* 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

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		\
%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',
-- 
2.34.0

bug#52858: [PATCH] gnu: passwordsafe: Update to 5.1.

[Ludovic Courtès]

Hi,

raingloom <raingloom@riseup.net> skribis:

> * 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.

Applied, thanks!

Please use ‘git send-email’ or attach the patch next time; this one got
mangled and I had to “repair” it, which is a bit tedious.

Ludo’.