Update to 0.29.1

3 files changed, 5 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f632d95c0c77..11097952c32a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = komikku
 	pkgdesc = Online/offline Manga reader for GNOME, built for the Librem 5
-	pkgver = 0.29.0
+	pkgver = 0.29.1
 	pkgrel = 1
 	url = https://gitlab.com/valos/Komikku
 	arch = any
@@ -26,7 +26,7 @@ pkgbase = komikku
 	depends = python-wheel
 	depends = webkit2gtk
 	optdepends = org.freedesktop.secrets: store passwords safely
-	source = https://gitlab.com/valos/Komikku/-/archive/v0.29.0/Komikku-v0.29.0.tar.gz
-	sha256sums = 3fc60bd2568f4db36252457be9b4c2f2cd05a4652542418bd268b9e7159315dd
+	source = https://gitlab.com/valos/Komikku/-/archive/v0.29.1/Komikku-v0.29.1.tar.gz
+	sha256sums = a811d31dde0e6bd7d3cfb8167edd2fbc9d3237ca69d1e9e21345c52706b9620a
 
 pkgname = komikku
diff --git a/PKGBUILD b/PKGBUILD
index aef66e012ffa..fba4a6956f4f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=komikku
 _author=valos
 _gitname=Komikku
-pkgver=0.29.0
+pkgver=0.29.1
 pkgrel=1
 pkgdesc='Online/offline Manga reader for GNOME, built for the Librem 5'
 arch=(any)
@@ -35,7 +35,7 @@ makedepends=(
 )
 optdepends=('org.freedesktop.secrets: store passwords safely')
 source=("https://gitlab.com/$_author/$_gitname/-/archive/v$pkgver/$_gitname-v$pkgver.tar.gz")
-sha256sums=('3fc60bd2568f4db36252457be9b4c2f2cd05a4652542418bd268b9e7159315dd')
+sha256sums=('a811d31dde0e6bd7d3cfb8167edd2fbc9d3237ca69d1e9e21345c52706b9620a')
 
 build() {
   arch-meson $_gitname-v$pkgver build
diff --git a/keyring.patch b/keyring.patch
deleted file mode 100644
index 5f6d4855d3fb..000000000000
--- a/keyring.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/komikku/utils.py b/komikku/utils.py
-index 23b584c..efbc9e5 100644
---- a/komikku/utils.py
-+++ b/komikku/utils.py
-@@ -292,7 +292,7 @@ class KeyringHelper:
- 
-     @property
-     def has_recommended_backend(self):
--        return not isinstance(self.keyring, keyring.backends.fail.Keyring)
-+        return self.keyring is not None and not isinstance(self.keyring, keyring.backends.fail.Keyring)
- 
-     @property
-     def is_disabled(self):
-@@ -300,7 +300,17 @@ class KeyringHelper:
- 
-     @property
-     def keyring(self):
--        return keyring.get_keyring()
-+        current_keyring_backend = keyring.get_keyring()
-+
-+        if isinstance(current_keyring_backend, keyring.backends.chainer.ChainerBackend):
-+            # Search SecretService backend
-+            for backend in current_keyring_backend.backends:
-+                if isinstance(backend, keyring.backends.SecretService.Keyring):
-+                    return backend
-+
-+            return None
-+
-+        return current_keyring_backend
- 
-     def get(self, service):
-         if self.is_disabled:
-@@ -322,6 +332,7 @@ class KeyringHelper:
-                     if username:
-                         credential = CustomCredential(username, item.get_secret().decode('utf-8'), item.get_attributes().get('address'))
-         else:
-+            # Fallback on PlaintextKeyring
-             credential = self.keyring.get_credential(service, None)
- 
-         if credential is None or credential.username is None:
-@@ -334,6 +345,15 @@ class KeyringHelper:
-             return
- 
-         if isinstance(self.keyring, keyring.backends.SecretService.Keyring):
-+            # At this time, SecretService is the only backend that support a collection of items with arbitrary attributes
-+            # Known working implementations are:
-+            # - GNOME Keyring
-+            # - KeePassXC Secret Service integration (tested, work well)
-+
-+            # Freedesktop.org Secret Service specification was written by both GNOME and KDE projects together
-+            # but it’s supported by the GNOME Keyring only
-+            # ksecretservice (https://community.kde.org/KDE_Utils/ksecretsservice) exists but is unfinished and seems unmaintained
-+
-             collection = self.keyring.get_preferred_collection()
- 
-             label = f'{self.appid}: {username}@{service}'
-@@ -353,6 +373,7 @@ class KeyringHelper:
- 
-                 collection.create_item(label, attributes, password)
-         else:
-+            # Fallback on PlaintextKeyring
-             self.keyring.set_password(service, username, password, address)
- 
- 
-@@ -364,6 +385,9 @@ class PlaintextKeyring(keyring.backend.KeyringBackend):
- 
-     priority = 1
- 
-+    def __init__(self):
-+        super().__init__()
-+
-     @property
-     def filename(self):
-         return os.path.join(self.folder, 'plaintext.keyring')