diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | newer_libhandy.patch | 165 |
3 files changed, 10 insertions, 180 deletions
@@ -1,7 +1,7 @@ pkgbase = komikku pkgdesc = Online/offline Manga reader for GNOME, built for the Librem 5 - pkgver = 0.17.0 - pkgrel = 4 + pkgver = 0.18.0 + pkgrel = 1 url = https://gitlab.com/valos/Komikku arch = any license = GPL3 @@ -9,22 +9,20 @@ pkgbase = komikku makedepends = meson depends = gtk3 depends = libhandy1 - depends = libsecret depends = python depends = python-beautifulsoup4 depends = python-cairo depends = python-cloudscraper depends = python-dateparser depends = python-gobject + depends = python-keyring depends = python-lxml depends = python-magic depends = python-pillow depends = python-pure-protobuf depends = python-unidecode - source = https://gitlab.com/valos/Komikku/-/archive/v0.17.0/Komikku-v0.17.0.tar.gz - source = newer_libhandy.patch - sha256sums = 4deb5a90ed80c1ee98266f4f3bdff4d2ffb6610b42975ce96209b3c2be14a734 - sha256sums = 0b4e541c22ea716f3ceea253dd0bf9bc01ee79f053ac5be639e07f6ccf695216 + source = https://gitlab.com/valos/Komikku/-/archive/v0.18.0/Komikku-v0.18.0.tar.gz + sha256sums = 1173b332b4d05ec2cc2c366f028219f3694fcbdc87cab7d76ef5b26dba0a01db pkgname = komikku @@ -3,8 +3,8 @@ pkgname=komikku _author=valos _gitname=Komikku -pkgver=0.17.0 -pkgrel=4 +pkgver=0.18.0 +pkgrel=1 pkgdesc='Online/offline Manga reader for GNOME, built for the Librem 5' arch=(any) url=https://gitlab.com/valos/Komikku @@ -12,13 +12,13 @@ license=(GPL3) depends=( gtk3 libhandy1 - libsecret python python-beautifulsoup4 python-cairo python-cloudscraper python-dateparser python-gobject + python-keyring python-lxml python-magic python-pillow @@ -29,14 +29,11 @@ makedepends=( gobject-introspection meson ) -source=("https://gitlab.com/$_author/$_gitname/-/archive/v$pkgver/$_gitname-v$pkgver.tar.gz" - "newer_libhandy.patch") -sha256sums=('4deb5a90ed80c1ee98266f4f3bdff4d2ffb6610b42975ce96209b3c2be14a734' - '0b4e541c22ea716f3ceea253dd0bf9bc01ee79f053ac5be639e07f6ccf695216') +source=("https://gitlab.com/$_author/$_gitname/-/archive/v$pkgver/$_gitname-v$pkgver.tar.gz") +sha256sums=('1173b332b4d05ec2cc2c366f028219f3694fcbdc87cab7d76ef5b26dba0a01db') prepare() { cd $_gitname-v$pkgver - patch --forward --strip=1 --input="${srcdir}/newer_libhandy.patch" cd .. } diff --git a/newer_libhandy.patch b/newer_libhandy.patch deleted file mode 100644 index 8aa8e09194e8..000000000000 --- a/newer_libhandy.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/data/ui/add_dialog.ui b/data/ui/add_dialog.ui -index 5f2953ac15f4680bd67d7edd2291afab8a42bb91..ef3df813058f4d79b834dc51337bd2c7a80c0165 100644 ---- a/data/ui/add_dialog.ui -+++ b/data/ui/add_dialog.ui -@@ -2,7 +2,7 @@ - <!-- Generated with glade 3.22.2 --> - <interface> - <requires lib="gtk+" version="3.20"/> -- <requires lib="libhandy" version="0.0"/> -+ <requires lib="libhandy" version="1.0"/> - <object class="GtkDialog" id="dialog"> - <property name="can_focus">False</property> - <property name="modal">True</property> -@@ -173,10 +173,10 @@ - <property name="can_focus">False</property> - <property name="shadow_type">none</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">720</property> -+ <property name="maximum_size">720</property> - <child> - <object class="GtkListBox" id="servers_page_listbox"> - <property name="visible">True</property> -@@ -204,10 +204,10 @@ - <property name="can_focus">False</property> - <property name="shadow_type">none</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">720</property> -+ <property name="maximum_size">720</property> - <child> - <object class="GtkListBox" id="search_page_listbox"> - <property name="visible">True</property> -@@ -236,10 +236,10 @@ - <property name="can_focus">False</property> - <property name="shadow_type">none</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">720</property> -+ <property name="maximum_size">720</property> - <child> - <object class="GtkGrid" id="manga_page_grid"> - <property name="visible">True</property> -diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui -index eb7ebe44068e0e20238699031cd6fdab1293df71..64e163a03ed3058b9a520e88a670dd5aff363102 100644 ---- a/data/ui/main_window.ui -+++ b/data/ui/main_window.ui -@@ -2,7 +2,7 @@ - <!-- Generated with glade 3.22.2 --> - <interface> - <requires lib="gtk+" version="3.20"/> -- <requires lib="libhandy" version="0.0"/> -+ <requires lib="libhandy" version="1.0"/> - <object class="GtkGrid" id="first_start_grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> -@@ -143,10 +143,10 @@ - <property name="can_focus">False</property> - <property name="shadow_type">none</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">800</property> -+ <property name="maximum_size">800</property> - <child> - <object class="GtkGrid" id="card_page_grid"> - <property name="visible">True</property> -@@ -402,10 +402,10 @@ - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">800</property> -+ <property name="maximum_size">800</property> - <child> - <object class="GtkListBox" id="chapters_listbox"> - <property name="visible">True</property> -diff --git a/data/ui/download_manager_dialog.ui b/data/ui/download_manager_dialog.ui -index ce57ea022e10b7fb17e62db73a07121bb88897ca..ee774dc07cc3b568a983d9b80ebba6f5f90e98c5 100644 ---- a/data/ui/download_manager_dialog.ui -+++ b/data/ui/download_manager_dialog.ui -@@ -2,7 +2,7 @@ - <!-- Generated with glade 3.22.2 --> - <interface> - <requires lib="gtk+" version="3.20"/> -- <requires lib="libhandy" version="0.0"/> -+ <requires lib="libhandy" version="1.0"/> - <template class="DownloadManagerDialog" parent="GtkDialog"> - <property name="can_focus">False</property> - <property name="modal">True</property> -@@ -118,10 +118,10 @@ - <property name="can_focus">False</property> - <property name="shadow_type">none</property> - <child> -- <object class="HdyColumn"> -+ <object class="HdyClamp"> - <property name="visible">True</property> - <property name="can_focus">False</property> -- <property name="maximum_width">700</property> -+ <property name="maximum_size">700</property> - <child> - <object class="GtkStack" id="stack"> - <property name="visible">True</property> -diff --git a/data/ui/preferences_servers_window.ui b/data/ui/preferences_servers_window.ui -index d904c075ae4e8c352e593c9be67c76f5b2376dc3..6b5048d0fc157163d09d15b8ecfeab8b5e0ec6df 100644 ---- a/data/ui/preferences_servers_window.ui -+++ b/data/ui/preferences_servers_window.ui -@@ -2,7 +2,7 @@ - <!-- Generated with glade 3.22.2 --> - <interface> - <requires lib="gtk+" version="3.20"/> -- <requires lib="libhandy" version="0.0"/> -+ <requires lib="libhandy" version="1.0"/> - <template class="PreferencesServersWindow" parent="HdyPreferencesWindow"> - <property name="can_focus">False</property> - <property name="default_width">640</property> -diff --git a/data/ui/preferences_window.ui b/data/ui/preferences_window.ui -index e5a05b0a6c5a527f95a107fdb1995ee6c7e73f92..0c2c9558abc6f9186e0aecb3f18c5b980d9caafc 100644 ---- a/data/ui/preferences_window.ui -+++ b/data/ui/preferences_window.ui -@@ -2,7 +2,7 @@ - <!-- Generated with glade 3.22.2 --> - <interface> - <requires lib="gtk+" version="3.22"/> -- <requires lib="libhandy" version="0.0"/> -+ <requires lib="libhandy" version="1.0"/> - <template class="PreferencesWindow" parent="HdyPreferencesWindow"> - <property name="width_request">300</property> - <property name="can_focus">False</property> -diff --git a/komikku/application.py b/komikku/application.py -index 478a3ffabd634fd0a57c44e8b1773f692f9a9347..b5b7567d2a96efd1e5ef0cd78bcd4d8693499e06 100644 ---- a/komikku/application.py -+++ b/komikku/application.py -@@ -21,7 +21,7 @@ - - CREDITS = dict( - developers=('Valéry Febvre (valos)', ), -- contributors=('Gerben Droogers (Tijder)', 'GrownNed', 'Mufeed Ali (lastweakness)', 'Romain Vaudois', 'Arthur Williams (TAAPArthur)', ), -+ contributors=('Gerben Droogers (Tijder)', 'GrownNed', 'Mufeed Ali (fushinari)', 'Romain Vaudois', 'Arthur Williams (TAAPArthur)', ), - translators=('GrownNed (Russian)', 'Heimen Stoffels (Dutch)', 'VaGNaroK (Brazilian Portuguese)', 'Valéry Febvre (French)', ), - ) - -@@ -46,7 +46,7 @@ - GLib.set_application_name(_('Komikku')) - GLib.set_prgname(self.application_id) - -- Handy.Column() # Init Handy -+ Handy.init() # Init Handy - Notify.init(_('Komikku')) - - def do_activate(self): |