* [PR PATCH] Komikku: add patch from upstream
@ 2021-08-12 17:03 not-chicken
2021-08-13 22:54 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: not-chicken @ 2021-08-12 17:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 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/32471
Komikku: add patch from upstream
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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/32471.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-komikku-32471.patch --]
[-- Type: text/x-diff, Size: 4265 bytes --]
From d4ba83670a285c32dbcde385c021f4551a5d4ef2 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Thu, 12 Aug 2021 22:20:02 +0530
Subject: [PATCH] Komikku: add patch from upstream
---
srcpkgs/Komikku/patches/fix-mangadex.patch | 82 ++++++++++++++++++++++
srcpkgs/Komikku/template | 2 +-
2 files changed, 83 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Komikku/patches/fix-mangadex.patch
diff --git a/srcpkgs/Komikku/patches/fix-mangadex.patch b/srcpkgs/Komikku/patches/fix-mangadex.patch
new file mode 100644
index 000000000000..acccfd956a91
--- /dev/null
+++ b/srcpkgs/Komikku/patches/fix-mangadex.patch
@@ -0,0 +1,82 @@
+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 7a612602214d..954a910382b7 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,7 +1,7 @@
# Template file for 'Komikku'
pkgname=Komikku
version=0.30.0
-revision=1
+revision=2
wrksrc=Komikku-v${version}
build_style=meson
hostmakedepends="gettext glib-devel gobject-introspection pkg-config"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: Komikku: add patch from upstream
2021-08-12 17:03 [PR PATCH] Komikku: add patch from upstream not-chicken
@ 2021-08-13 22:54 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2021-08-13 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]
There's a merged pull request on the void-packages repository
Komikku: add patch from upstream
https://github.com/void-linux/void-packages/pull/32471
Description:
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-13 22:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-12 17:03 [PR PATCH] Komikku: add patch from upstream not-chicken
2021-08-13 22:54 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).