Date: Tuesday, November 1, 2022 @ 09:42:46
  Author: arojas
Revision: 1340063

upgpkg: gnome-passwordsafe 7.0-1: Update to 7.0

Modified:
  gnome-passwordsafe/trunk/PKGBUILD
Deleted:
  gnome-passwordsafe/trunk/pykeepass-4.0.3.patch

-----------------------+
 PKGBUILD              |   19 ++++++-------------
 pykeepass-4.0.3.patch |   39 ---------------------------------------
 2 files changed, 6 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-01 09:34:07 UTC (rev 1340062)
+++ PKGBUILD    2022-11-01 09:42:46 UTC (rev 1340063)
@@ -1,19 +1,17 @@
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gnome-passwordsafe
-pkgver=6.5
-pkgrel=2
+pkgver=7.0
+pkgrel=1
 pkgdesc="Password manager for GNOME which makes use of the KeePass v.4 format"
 arch=(any)
 url="https://gitlab.gnome.org/World/PasswordSafe";
 license=(GPL3)
-depends=(gtk4 libadwaita libpwquality python-gobject python-pykeepass 
python-pyotp python-cairo)
+depends=(gtk4 libadwaita libpwquality python-gobject python-pykeepass 
python-pyotp python-cairo python-validators python-zxcvbn)
 makedepends=(git gobject-introspection meson)
-_commit=2103661272e0f9b6b63db7103b08c818478debde
-source=("git+https://gitlab.gnome.org/World/PasswordSafe.git/#commit=$_commit";
-         pykeepass-4.0.3.patch)
-sha256sums=('SKIP'
-            '93baa0b0435f6c527b834ebf389ded9bae3033f7061c3f28faef8dd6582be124')
+_commit=6e0c69d87653fa6b83a5cfda2e8bb9f4398d9eee
+source=("git+https://gitlab.gnome.org/World/PasswordSafe.git/#commit=$_commit";)
+sha256sums=('SKIP')
 
 pkgver() {
   cd PasswordSafe
@@ -20,11 +18,6 @@
   git describe --tags | sed 's/-/+/g'
 }
 
-prepare() {
-  cd PasswordSafe
-  patch -p1 -i ../pykeepass-4.0.3.patch # Port to pykeepass 4.0.3
-}
-
 build() {
   arch-meson PasswordSafe build
   ninja -C build

Deleted: pykeepass-4.0.3.patch
===================================================================
--- pykeepass-4.0.3.patch       2022-11-01 09:34:07 UTC (rev 1340062)
+++ pykeepass-4.0.3.patch       2022-11-01 09:42:46 UTC (rev 1340063)
@@ -1,39 +0,0 @@
-From 4c1702c78d24f7357c082a409dc4ac78d5ec2dae Mon Sep 17 00:00:00 2001
-From: Maximiliano Sandoval R <[email protected]>
-Date: Mon, 4 Jul 2022 19:34:39 +0200
-Subject: [PATCH] Update pykeepass to 4.0.3
-
----
-diff --git a/gsecrets/safe_element.py b/gsecrets/safe_element.py
-index cef76f7dc..8bf79fb06 100644
---- a/gsecrets/safe_element.py
-+++ b/gsecrets/safe_element.py
-@@ -393,8 +393,7 @@ class SafeEntry(SafeElement):
-         self._url: str = entry.url or ""
-         self._username: str = entry.username or ""
- 
--        otp_uri = entry.get_custom_property("otp")
--        if otp_uri:
-+        if (otp_uri := entry.otp):
-             try:
-                 self._otp = parse_uri(otp_uri)
-             except ValueError as err:
-@@ -624,7 +623,7 @@ class SafeEntry(SafeElement):
-         if not otp and self._otp:
-             # Delete existing
-             self._otp = None
--            self._element.delete_custom_property("otp")
-+            self._element.otp = None
-             self.updated()
-         elif self._otp and self._otp.secret != otp:
-             # Changing an existing OTP
-@@ -636,7 +635,7 @@ class SafeEntry(SafeElement):
-             updated = True
- 
-         if updated:
--            self._element.set_custom_property("otp", 
self._otp.provisioning_uri())
-+            self._element.otp = self._otp.provisioning_uri()
-             self.updated()
- 
-     def otp_interval(self) -> int:
-

Reply via email to