From 747aa6c46baeb02bb75e5c199dd005eb9dd52785 Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <tim.gesthuizen@yahoo.de>
Date: Tue, 15 Oct 2019 19:45:13 +0200
Subject: gnu: pwsafe: Update to 3.5.0

* gnu/packages/password-utils.scm (pwsafe): Update to 3.5.0.
[source]: Use git-file-name.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/password-utils.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/password-utils.scm')

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ff13be24db..ba488dde27 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
-;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
+;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -183,16 +183,17 @@ (define-public keepassx
 (define-public pwsafe
   (package
     (name "pwsafe")
-    (version "3.48.0")
-    (home-page "https://www.pwsafe.org/" )
+    (version "3.50.0")
+    (home-page "https://www.pwsafe.org/")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/pwsafe/pwsafe.git")
              (commit version)))
-       (sha256 (base32 "0hxv23yh76liggxbjn4m132z15sklra8ms341xgzl4n5vjx30ihi"))
-       (file-name (string-append name "-" version "-checkout"))))
+       (sha256
+        (base32 "01kfssd2vr64yh4dqhch58x36n3aj3hpj5n560f41rsxym69c6qs"))
+       (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (native-inputs `(("gettext" ,gettext-minimal)
                      ("perl" ,perl)
-- 
cgit v1.2.3


From 50bfb70b73b5137fa156d25cc7b54f700cc91f08 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Tue, 15 Oct 2019 22:30:49 +0300
Subject: gnu: pwsafe: Move googletest to native-inputs.

* gnu/packages/password-utils.scm (pwsafe)[inputs]: Move googletest ...
[native-inputs]: ... to here.
---
 gnu/packages/password-utils.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/password-utils.scm')

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index ba488dde27..efca02ff68 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -195,12 +195,13 @@ (define-public pwsafe
         (base32 "01kfssd2vr64yh4dqhch58x36n3aj3hpj5n560f41rsxym69c6qs"))
        (file-name (git-file-name name version))))
     (build-system cmake-build-system)
-    (native-inputs `(("gettext" ,gettext-minimal)
-                     ("perl" ,perl)
-                     ("zip" ,zip)))
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("gtest" ,googletest)
+       ("perl" ,perl)
+       ("zip" ,zip)))
     (inputs `(("curl" ,curl)
               ("file" ,file)
-              ("gtest" ,googletest)
               ("libuuid" ,util-linux)
               ("libxt" ,libxt)
               ("libxtst" ,libxtst)
-- 
cgit v1.2.3