[-- Attachment #1: Type: text/plain, Size: 1596 bytes --]
There is a new pull request by not-chicken against master on the void-packages repository
https://github.com/not-chicken/void-packages komikku
https://github.com/void-linux/void-packages/pull/33031
Komikku: update to 0.32.0.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33031.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-komikku-33031.patch --]
[-- Type: text/x-diff, Size: 4666 bytes --]
From 64733115a693465ee00069b027d942ea2febb3ce Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Mon, 20 Sep 2021 11:08:05 +0530
Subject: [PATCH] Komikku: update to 0.32.0.
---
srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ----------------------
srcpkgs/Komikku/template | 6 +-
2 files changed, 3 insertions(+), 85 deletions(-)
delete mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
deleted file mode 100644
index acccfd956a91..000000000000
--- a/srcpkgs/Komikku/patches/fix-mangadex.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Taken from upstream commit: https://gitlab.com/valos/Komikku/-/commit/35393c0
-diff --git a/komikku/servers/mangadex/__init__.py b/komikku/servers/mangadex/__init__.py
-index 22bfbe96ce48b45b035cb715c3ec478f73eb6939..c7250b4cb5f847d8edc67e8f577710a7676f2e29 100644
---- a/komikku/servers/mangadex/__init__.py
-+++ b/komikku/servers/mangadex/__init__.py
-@@ -82,6 +82,26 @@ class Mangadex(Server):
-
- return None
-
-+ def _manga_title_from_attributes(self, attributes):
-+ if self.lang_code in attributes['title']:
-+ return attributes['title'][self.lang_code]
-+ elif 'en' in attributes['title']:
-+ return attributes['title']['en']
-+
-+ else:
-+ lang_code_alt_name = None
-+ en_alt_name = None
-+
-+ for alt_title in attributes['altTitles']:
-+ if not lang_code_alt_name and self.lang_code in alt_title:
-+ lang_code_alt_name = alt_title['en']
-+
-+ if not en_alt_name and 'en' in alt_title:
-+ en_alt_name = alt_title['en']
-+
-+ return lang_code_alt_name or en_alt_name
-+
-+
- def get_manga_data(self, initial_data):
- """
- Returns manga data from API
-@@ -117,7 +137,9 @@ class Mangadex(Server):
- attributes = resp_json['data']['attributes']
-
- # FIXME: Should probably be lang_code, but the API returns weird stuff
-- data['name'] = html.unescape(attributes['title']['en'])
-+ _name = self._manga_title_from_attributes(attributes)
-+ data['name'] = html.unescape(_name)
-+ assert data['name'] is not None
-
- for relationship in resp_json['relationships']:
- if relationship['type'] == 'author':
-@@ -137,8 +159,14 @@ class Mangadex(Server):
- elif attributes['status'] == 'hiatus':
- data['status'] = 'hiatus'
-
-- # FIXME: lang_code
-- data['synopsis'] = html.unescape(attributes['description']['en'])
-+ if self.lang_code in attributes['description']:
-+ data['synopsis'] = html.unescape(attributes['description'][self.lang_code])
-+ elif 'en' in attributes['description']:
-+ # Fall back to english synopsis
-+ data['synopsis'] = html.unescape(attributes['description']['en'])
-+ else:
-+ logger.warn('{}: No synopsis', data['name'])
-+
-
- data['chapters'] += self.resolve_chapters(data['slug'])
-
-@@ -280,11 +308,16 @@ class Mangadex(Server):
- if result['type'] != 'manga':
- continue
-
-- results.append(dict(
-- slug=result['id'],
-- # FIXME: lang_code
-- name=result['attributes']['title']['en'],
-- ))
-+ name = self._manga_title_from_attributes(result['attributes'])
-+
-+ if name:
-+ results.append(dict(
-+ slug=result['id'],
-+ # FIXME: lang_code
-+ name=name,
-+ ))
-+ else:
-+ logger.warn("ignoring result {}, missing name".format(result['id']))
-
- return results
-
diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 954a910382b7..94d81e5f18ad 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
-version=0.30.0
-revision=2
+version=0.32.0
+revision=1
wrksrc=Komikku-v${version}
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
homepage="https://gitlab.com/valos/Komikku"
distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=07c45f458a485d50220c71028f71ab27e86058fce1bfd9334b9859e601b7f7e6
+checksum=2c980fbe9139cb2eadb7ad2deb7a92e088afbc61a02c9a3e3cb7143bb94ca1a2