From a40a3b8e5f7692038527876eb0fc2b1373f0f6e1 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 20 Dec 2020 23:23:23 +0100 Subject: [PATCH 01/41] Update to v0.7.8 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a054c5..f9b5528 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cozy-0.7.3.tar.gz /cozy-0.7.5.tar.gz /cozy-0.7.7.tar.gz +/cozy-0.7.8.tar.gz diff --git a/cozy.spec b/cozy.spec index 43ffe11..21632f1 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ and ASL 2.0 -Version: 0.7.7 +Version: 0.7.8 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -131,6 +131,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun Dec 20 2020 Artur Frenszek-Iwicki - 0.7.8-1 +- Update to latest release + * Mon Nov 30 2020 Artur Frenszek-Iwicki - 0.7.7-1 - Update to latest release diff --git a/sources b/sources index 5f1c642..f78a9ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.7.7.tar.gz) = ac95e833cdf23eac24c2d0e97f65eb734d8a169c461c847cbff4407769becd94818850db66cdebef4aea1438a79905ca531875623aba51d7ac183cdeb2326658 +SHA512 (cozy-0.7.8.tar.gz) = a8bccb8e94fc56e58005c5e7369785780e7f44cfcc26c49a973bbe726d8227a56474c680e1a3d2931ea650b3982b18ffc5799dc5b5ca77f14a5fce79ee401a91 From a98144fe172a3662c5eeeb763aa06ede5c539971 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:36:21 +0000 Subject: [PATCH 02/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 21632f1..4b6f9df 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ and ASL 2.0 Version: 0.7.8 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -131,6 +131,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.7.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Dec 20 2020 Artur Frenszek-Iwicki - 0.7.8-1 - Update to latest release From 521f053fbb630d14fe019a57f7e38682aa52cf7a Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 8 Feb 2021 12:12:39 +0100 Subject: [PATCH 03/41] Update to v0.8.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 378 ++++++++++++++++++++---------------- cozy.spec | 15 +- sources | 2 +- 4 files changed, 222 insertions(+), 174 deletions(-) diff --git a/.gitignore b/.gitignore index f9b5528..26e19c4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cozy-0.7.5.tar.gz /cozy-0.7.7.tar.gz /cozy-0.7.8.tar.gz +/cozy-0.8.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 17fe046..053197c 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -r -U4 cozy-0.7.7--orig/cozy/app_controller.py cozy-0.7.7--patched/cozy/app_controller.py ---- cozy-0.7.7--orig/cozy/app_controller.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/app_controller.py 2020-11-30 18:04:36.858089048 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app_controller.py +--- cozy-0.8.1--orig/cozy/app_controller.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/app_controller.py 2021-02-08 12:07:35.528713507 +0100 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/app_controller.py cozy-0.7.7--patched/cozy/app from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -r -U4 cozy-0.7.7--orig/cozy/application_settings.py cozy-0.7.7--patched/cozy/application_settings.py ---- cozy-0.7.7--orig/cozy/application_settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/application_settings.py 2020-11-30 18:04:36.835089013 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/cozy/application_settings.py +--- cozy-0.8.1--orig/cozy/application_settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/application_settings.py 2021-02-08 12:07:35.497713413 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/application_settings.py cozy-0.7.7--patched/co class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -r -U4 cozy-0.7.7--orig/cozy/control/artwork_cache.py cozy-0.7.7--patched/cozy/control/artwork_cache.py ---- cozy-0.7.7--orig/cozy/control/artwork_cache.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/artwork_cache.py 2020-11-30 18:04:36.639088715 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/cozy/control/artwork_cache.py +--- cozy-0.8.1--orig/cozy/control/artwork_cache.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/artwork_cache.py 2021-02-08 12:07:35.222712577 +0100 @@ -7,9 +7,9 @@ from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir @@ -37,9 +37,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/artwork_cache.py cozy-0.7.7--patched/c from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -r -U4 cozy-0.7.7--orig/cozy/control/db.py cozy-0.7.7--patched/cozy/control/db.py ---- cozy-0.7.7--orig/cozy/control/db.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/db.py 2020-11-30 18:04:36.641088718 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control/db.py +--- cozy-0.8.1--orig/cozy/control/db.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/db.py 2021-02-08 12:07:35.226712589 +0100 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/db.py cozy-0.7.7--patched/cozy/control from cozy.control.db_updater import update_db from cozy.db.artwork_cache import ArtworkCache from cozy.db.book import Book -diff -r -U4 cozy-0.7.7--orig/cozy/control/filesystem_monitor.py cozy-0.7.7--patched/cozy/control/filesystem_monitor.py ---- cozy-0.7.7--orig/cozy/control/filesystem_monitor.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/filesystem_monitor.py 2020-11-30 18:04:36.634088708 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patched/cozy/control/filesystem_monitor.py +--- cozy-0.8.1--orig/cozy/control/filesystem_monitor.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/filesystem_monitor.py 2021-02-08 12:07:35.212712547 +0100 @@ -1,8 +1,8 @@ import logging from typing import List @@ -64,9 +64,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/filesystem_monitor.py cozy-0.7.7--patc from cozy.architecture.event_sender import EventSender from cozy.control.db import get_tracks -diff -r -U4 cozy-0.7.7--orig/cozy/control/offline_cache.py cozy-0.7.7--patched/cozy/control/offline_cache.py ---- cozy-0.7.7--orig/cozy/control/offline_cache.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/offline_cache.py 2020-11-30 18:04:36.660088747 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/control/offline_cache.py cozy-0.8.1--patched/cozy/control/offline_cache.py +--- cozy-0.8.1--orig/cozy/control/offline_cache.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/offline_cache.py 2021-02-08 12:07:35.245712647 +0100 @@ -12,9 +12,9 @@ from cozy.db.book import Book @@ -78,23 +78,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/offline_cache.py cozy-0.7.7--patched/c log = logging.getLogger("offline_cache") -diff -r -U4 cozy-0.7.7--orig/cozy/control/playback_speed.py cozy-0.7.7--patched/cozy/control/playback_speed.py ---- cozy-0.7.7--orig/cozy/control/playback_speed.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/playback_speed.py 2020-11-30 18:04:36.658088744 +0100 -@@ -3,9 +3,9 @@ - import cozy.ui - - import gi - --from cozy.ext import inject -+import inject - from cozy.media.player import Player - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk -diff -r -U4 cozy-0.7.7--orig/cozy/control/player.py cozy-0.7.7--patched/cozy/control/player.py ---- cozy-0.7.7--orig/cozy/control/player.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/player.py 2020-11-30 18:04:36.651088733 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/control/player.py cozy-0.8.1--patched/cozy/control/player.py +--- cozy-0.8.1--orig/cozy/control/player.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/control/player.py 2021-02-08 12:07:35.238712626 +0100 @@ -1,8 +1,8 @@ import threading import time @@ -105,23 +91,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/control/player.py cozy-0.7.7--patched/cozy/con import gi -diff -r -U4 cozy-0.7.7--orig/cozy/control/sleep_timer.py cozy-0.7.7--patched/cozy/control/sleep_timer.py ---- cozy-0.7.7--orig/cozy/control/sleep_timer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/control/sleep_timer.py 2020-11-30 18:04:36.644088723 +0100 -@@ -8,9 +8,9 @@ - - import gi - - from cozy.application_settings import ApplicationSettings --from cozy.ext import inject -+import inject - - gi.require_version('Gtk', '3.0') - gi.require_version('Gst', '1.0') - from gi.repository import Gtk, Gst, Gdk, GLib -diff -r -U4 cozy-0.7.7--orig/cozy/media/files.py cozy-0.7.7--patched/cozy/media/files.py ---- cozy-0.7.7--orig/cozy/media/files.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/files.py 2020-11-30 18:04:36.666088756 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/files.py +--- cozy-0.8.1--orig/cozy/media/files.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/files.py 2021-02-08 12:07:35.254712674 +0100 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -133,9 +105,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/files.py cozy-0.7.7--patched/cozy/media/ from cozy.model.settings import Settings from cozy.report import reporter -diff -r -U4 cozy-0.7.7--orig/cozy/media/importer.py cozy-0.7.7--patched/cozy/media/importer.py ---- cozy-0.7.7--orig/cozy/media/importer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/importer.py 2020-11-30 18:04:36.695088801 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/media/importer.py cozy-0.8.1--patched/cozy/media/importer.py +--- cozy-0.8.1--orig/cozy/media/importer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/importer.py 2021-02-08 12:07:35.281712756 +0100 @@ -12,9 +12,9 @@ from cozy.media.media_file import MediaFile from cozy.model.library import Library @@ -147,10 +119,10 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/importer.py cozy-0.7.7--patched/cozy/med from cozy.report import reporter log = logging.getLogger("importer") -diff -r -U4 cozy-0.7.7--orig/cozy/media/player.py cozy-0.7.7--patched/cozy/media/player.py ---- cozy-0.7.7--orig/cozy/media/player.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/media/player.py 2020-11-30 18:04:36.676088771 +0100 -@@ -4,9 +4,9 @@ +diff -U4 -r cozy-0.8.1--orig/cozy/media/player.py cozy-0.8.1--patched/cozy/media/player.py +--- cozy-0.8.1--orig/cozy/media/player.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/media/player.py 2021-02-08 12:07:35.263712702 +0100 +@@ -5,9 +5,9 @@ from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender @@ -161,9 +133,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/media/player.py cozy-0.7.7--patched/cozy/media from cozy.model.chapter import Chapter from cozy.model.library import Library from cozy.report import reporter -diff -r -U4 cozy-0.7.7--orig/cozy/model/book.py cozy-0.7.7--patched/cozy/model/book.py ---- cozy-0.7.7--orig/cozy/model/book.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/book.py 2020-11-30 18:04:36.853089041 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/book.py +--- cozy-0.8.1--orig/cozy/model/book.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/book.py 2021-02-08 12:07:35.522713489 +0100 @@ -6,9 +6,9 @@ from cozy.architecture.observable import Observable from cozy.db.book import Book as BookModel @@ -175,9 +147,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/book.py cozy-0.7.7--patched/cozy/model/b from cozy.model.settings import Settings from cozy.model.track import Track -diff -r -U4 cozy-0.7.7--orig/cozy/model/library.py cozy-0.7.7--patched/cozy/model/library.py ---- cozy-0.7.7--orig/cozy/model/library.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/library.py 2020-11-30 18:04:36.842089024 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/model/library.py +--- cozy-0.8.1--orig/cozy/model/library.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/library.py 2021-02-08 12:07:35.508713446 +0100 @@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -189,9 +161,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/library.py cozy-0.7.7--patched/cozy/mode from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -r -U4 cozy-0.7.7--orig/cozy/model/settings.py cozy-0.7.7--patched/cozy/model/settings.py ---- cozy-0.7.7--orig/cozy/model/settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/settings.py 2020-11-30 18:04:36.838089018 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/model/settings.py +--- cozy-0.8.1--orig/cozy/model/settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/settings.py 2021-02-08 12:07:35.501713425 +0100 @@ -1,8 +1,8 @@ import logging from typing import List @@ -202,9 +174,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/settings.py cozy-0.7.7--patched/cozy/mod from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -r -U4 cozy-0.7.7--orig/cozy/model/storage_block_list.py cozy-0.7.7--patched/cozy/model/storage_block_list.py ---- cozy-0.7.7--orig/cozy/model/storage_block_list.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/model/storage_block_list.py 2020-11-30 18:04:36.855089044 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/model/storage_block_list.py cozy-0.8.1--patched/cozy/model/storage_block_list.py +--- cozy-0.8.1--orig/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/model/storage_block_list.py 2021-02-08 12:07:35.525713498 +0100 @@ -1,8 +1,8 @@ from peewee import SqliteDatabase @@ -215,9 +187,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/model/storage_block_list.py cozy-0.7.7--patche class StorageBlockList: _db = cache = inject.attr(SqliteDatabase) -diff -r -U4 cozy-0.7.7--orig/cozy/report/report_to_loki.py cozy-0.7.7--patched/cozy/report/report_to_loki.py ---- cozy-0.7.7--orig/cozy/report/report_to_loki.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/report/report_to_loki.py 2020-11-30 18:04:36.876089076 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/cozy/report/report_to_loki.py +--- cozy-0.8.1--orig/cozy/report/report_to_loki.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/report/report_to_loki.py 2021-02-08 12:07:35.553713583 +0100 @@ -6,9 +6,9 @@ import distro import platform @@ -229,9 +201,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/report/report_to_loki.py cozy-0.7.7--patched/c from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -r -U4 cozy-0.7.7--orig/cozy/ui/album_element.py cozy-0.7.7--patched/cozy/ui/album_element.py ---- cozy-0.7.7--orig/cozy/ui/album_element.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/album_element.py 2020-11-30 18:04:36.721088840 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/album_element.py cozy-0.8.1--patched/cozy/ui/album_element.py +--- cozy-0.8.1--orig/cozy/ui/album_element.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/album_element.py 2021-02-08 12:07:35.311712848 +0100 @@ -2,9 +2,9 @@ from cozy.control import player as player @@ -243,9 +215,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/album_element.py cozy-0.7.7--patched/cozy/u class AlbumElement(Gtk.Box): -diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_detail_view.py cozy-0.7.7--patched/cozy/ui/book_detail_view.py ---- cozy-0.7.7--orig/cozy/ui/book_detail_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/book_detail_view.py 2020-11-30 18:04:36.737088864 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/cozy/ui/book_detail_view.py +--- cozy-0.8.1--orig/cozy/ui/book_detail_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/book_detail_view.py 2021-02-08 12:07:35.342712942 +0100 @@ -3,9 +3,9 @@ import gi @@ -257,9 +229,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_detail_view.py cozy-0.7.7--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.disk_element import DiskElement -diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_element.py cozy-0.7.7--patched/cozy/ui/book_element.py ---- cozy-0.7.7--orig/cozy/ui/book_element.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/book_element.py 2020-11-30 18:04:36.706088817 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui/book_element.py +--- cozy-0.8.1--orig/cozy/ui/book_element.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/book_element.py 2021-02-08 12:07:35.288712778 +0100 @@ -1,8 +1,8 @@ import os import subprocess @@ -270,9 +242,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/book_element.py cozy-0.7.7--patched/cozy/ui import cozy.tools as tools import cozy.ui -diff -r -U4 cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py cozy-0.7.7--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/file_not_found_dialog.py 2020-11-30 18:04:36.711088825 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py 2021-02-08 12:07:35.297712805 +0100 @@ -3,9 +3,9 @@ from gi.repository import Gtk import cozy.control.player as player @@ -284,9 +256,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/file_not_found_dialog.py cozy-0.7.7--patche class FileNotFoundDialog(): -diff -r -U4 cozy-0.7.7--orig/cozy/ui/library_view.py cozy-0.7.7--patched/cozy/ui/library_view.py ---- cozy-0.7.7--orig/cozy/ui/library_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/library_view.py 2020-11-30 18:04:36.727088849 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/headerbar.py +--- cozy-0.8.1--orig/cozy/ui/headerbar.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/headerbar.py 2021-02-08 12:07:35.293712793 +0100 +@@ -3,9 +3,9 @@ + import gi + + from cozy.control.artwork_cache import ArtworkCache + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover + from cozy.ui.widgets.seek_bar import SeekBar + from cozy.ui.widgets.sleep_timer import SleepTimer + from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState +diff -U4 -r cozy-0.8.1--orig/cozy/ui/library_view.py cozy-0.8.1--patched/cozy/ui/library_view.py +--- cozy-0.8.1--orig/cozy/ui/library_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/library_view.py 2021-02-08 12:07:35.324712887 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gtk from gi.repository.Gtk import Builder @@ -297,9 +283,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/library_view.py cozy-0.7.7--patched/cozy/ui from cozy.ui.widgets.filter_list_box import FilterListBox from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode -diff -r -U4 cozy-0.7.7--orig/cozy/ui/main_view.py cozy-0.7.7--patched/cozy/ui/main_view.py ---- cozy-0.7.7--orig/cozy/ui/main_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/main_view.py 2020-11-30 18:04:36.744088875 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/main_view.py +--- cozy-0.8.1--orig/cozy/ui/main_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/main_view.py 2021-02-08 12:07:35.355712981 +0100 @@ -1,7 +1,7 @@ import webbrowser @@ -309,9 +295,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/main_view.py cozy-0.7.7--patched/cozy/ui/ma from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db -diff -r -U4 cozy-0.7.7--orig/cozy/ui/search_view.py cozy-0.7.7--patched/cozy/ui/search_view.py ---- cozy-0.7.7--orig/cozy/ui/search_view.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/search_view.py 2020-11-30 18:04:36.729088852 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/search_view.py +--- cozy-0.8.1--orig/cozy/ui/search_view.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/search_view.py 2021-02-08 12:07:35.328712899 +0100 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -322,9 +308,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/search_view.py cozy-0.7.7--patched/cozy/ui/ import gi -diff -r -U4 cozy-0.7.7--orig/cozy/ui/settings.py cozy-0.7.7--patched/cozy/ui/settings.py ---- cozy-0.7.7--orig/cozy/ui/settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/settings.py 2020-11-30 18:04:36.700088808 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/settings.py +--- cozy-0.8.1--orig/cozy/ui/settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/settings.py 2021-02-08 12:07:35.286712772 +0100 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -336,23 +322,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/settings.py cozy-0.7.7--patched/cozy/ui/set from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow from cozy.view_model.settings_view_model import SettingsViewModel -diff -r -U4 cozy-0.7.7--orig/cozy/ui/titlebar.py cozy-0.7.7--patched/cozy/ui/titlebar.py ---- cozy-0.7.7--orig/cozy/ui/titlebar.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/titlebar.py 2020-11-30 18:04:36.747088879 +0100 -@@ -5,9 +5,9 @@ - from cozy.control.artwork_cache import ArtworkCache - from cozy.control.db import get_book_remaining, get_book_progress, get_track_from_book_time, get_book_duration - from cozy.control.string_representation import seconds_to_str - from cozy.db.settings import Settings --from cozy.ext import inject -+import inject - from cozy.media.files import Files - from cozy.media.importer import Importer, ScanStatus - from cozy.media.player import Player - from cozy.model.library import Library -diff -r -U4 cozy-0.7.7--orig/cozy/ui/warnings.py cozy-0.7.7--patched/cozy/ui/warnings.py ---- cozy-0.7.7--orig/cozy/ui/warnings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/warnings.py 2020-11-30 18:04:36.716088832 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/warnings.py +--- cozy-0.8.1--orig/cozy/ui/warnings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/warnings.py 2021-02-08 12:07:35.301712817 +0100 @@ -1,8 +1,8 @@ from gettext import gettext @@ -363,9 +335,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/warnings.py cozy-0.7.7--patched/cozy/ui/war from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py cozy-0.7.7--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/error_reporting.py 2020-11-30 18:04:36.763088904 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py 2021-02-08 12:07:35.391713091 +0100 @@ -2,9 +2,9 @@ import gi @@ -377,9 +349,21 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/error_reporting.py cozy-0.7.7--patc gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/search_results.py cozy-0.7.7--patched/cozy/ui/widgets/search_results.py ---- cozy-0.7.7--orig/cozy/ui/widgets/search_results.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/search_results.py 2020-11-30 18:04:36.751088885 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-02-08 12:07:35.366713015 +0100 +@@ -1,7 +1,7 @@ + import gi + +-from cozy.ext import inject ++import inject + from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel + + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patched/cozy/ui/widgets/search_results.py +--- cozy-0.8.1--orig/cozy/ui/widgets/search_results.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/search_results.py 2021-02-08 12:07:35.362713002 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -390,9 +374,21 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/search_results.py cozy-0.7.7--patch MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.7.7--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/storage_list_box_row.py 2020-11-30 18:04:36.754088890 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py 2021-02-08 12:07:35.384713069 +0100 +@@ -1,7 +1,7 @@ + import gi + +-from cozy.ext import inject ++import inject + from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl + + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-02-08 12:07:35.370713027 +0100 @@ -5,9 +5,9 @@ import cozy.ui @@ -404,9 +400,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.7.7- from cozy.model.storage_block_list import StorageBlockList log = logging.getLogger("settings") -diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py cozy-0.7.7--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/ui/widgets/whats_new_window.py 2020-11-30 18:04:36.778088927 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py 2021-02-08 12:07:35.404713130 +0100 @@ -3,9 +3,9 @@ import gi @@ -414,13 +410,13 @@ diff -r -U4 cozy-0.7.7--orig/cozy/ui/widgets/whats_new_window.py cozy-0.7.7--pat from cozy.application_settings import ApplicationSettings -from cozy.ext import inject +import inject + from cozy.ui.main_view import CozyUI from cozy.ui.widgets.error_reporting import ErrorReporting from cozy.ui.widgets.whats_new_importer import WhatsNewImporter from cozy.ui.widgets.whats_new_m4b import WhatsNewM4B, INTRODUCED - from cozy.version import __version__ as CozyVersion -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/book_detail_view_model.py 2020-11-30 18:04:36.800088960 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py 2021-02-08 12:07:35.444713252 +0100 @@ -4,9 +4,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -432,9 +428,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/book_detail_view_model.py cozy-0.7. from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/library_view_model.py cozy-0.7.7--patched/cozy/view_model/library_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/library_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/library_view_model.py 2020-11-30 18:04:36.805088968 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py 2021-02-08 12:07:35.435713224 +0100 +@@ -2,9 +2,9 @@ + + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable + from cozy.control.offline_cache import OfflineCache +-from cozy.ext import inject ++import inject + from cozy.media.files import Files + from cozy.media.importer import Importer, ScanStatus + from cozy.model.library import Library + +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/library_view_model.py cozy-0.8.1--patched/cozy/view_model/library_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/library_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/library_view_model.py 2021-02-08 12:07:35.446713258 +0100 @@ -1,7 +1,7 @@ from enum import Enum, auto @@ -444,9 +454,37 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/library_view_model.py cozy-0.7.7--p from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/search_view_model.py cozy-0.7.7--patched/cozy/view_model/search_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/search_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/search_view_model.py 2020-11-30 18:04:36.791088947 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py 2021-02-08 12:07:35.431713212 +0100 +@@ -1,9 +1,9 @@ + from typing import Optional + + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + from cozy.model.book import Book + from cozy.open_view import OpenView + +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py 2021-02-08 12:07:35.417713170 +0100 +@@ -1,9 +1,9 @@ + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable + from cozy.control import player + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + + + class PlaybackSpeedViewModel(Observable, EventSender): +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--patched/cozy/view_model/search_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/search_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/search_view_model.py 2021-02-08 12:07:35.426713197 +0100 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -454,9 +492,9 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/search_view_model.py cozy-0.7.7--pa from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -r -U4 cozy-0.7.7--orig/cozy/view_model/settings_view_model.py cozy-0.7.7--patched/cozy/view_model/settings_view_model.py ---- cozy-0.7.7--orig/cozy/view_model/settings_view_model.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/cozy/view_model/settings_view_model.py 2020-11-30 18:04:36.786088939 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1--patched/cozy/view_model/settings_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/settings_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/settings_view_model.py 2021-02-08 12:07:35.422713185 +0100 @@ -1,6 +1,6 @@ from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -465,23 +503,23 @@ diff -r -U4 cozy-0.7.7--orig/cozy/view_model/settings_view_model.py cozy-0.7.7-- from cozy.model.settings import Settings -diff -r -U4 cozy-0.7.7--orig/requirements.txt cozy-0.7.7--patched/requirements.txt ---- cozy-0.7.7--orig/requirements.txt 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/requirements.txt 2020-11-30 18:05:17.126150269 +0100 -@@ -1,7 +1,8 @@ - distro -+inject>=4.3.1 - mutagen - packaging - peewee>=3.9.6 - pytz - requests --PyGObject -\ No newline at end of file -+PyGObject -diff -r -U4 cozy-0.7.7--orig/test/cozy/media/test_importer.py cozy-0.7.7--patched/test/cozy/media/test_importer.py ---- cozy-0.7.7--orig/test/cozy/media/test_importer.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/media/test_importer.py 2020-11-30 18:04:36.887089092 +0100 +diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-02-08 12:07:35.413713157 +0100 +@@ -5,9 +5,9 @@ + + from cozy import tools + from cozy.application_settings import ApplicationSettings + from cozy.architecture.observable import Observable +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + from cozy.tools import IntervalTimer + + log = logging.getLogger("sleep_timer_view_model") +diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patched/test/cozy/media/test_importer.py +--- cozy-0.8.1--orig/test/cozy/media/test_importer.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/media/test_importer.py 2021-02-08 12:07:35.571713637 +0100 @@ -2,9 +2,9 @@ import pytest @@ -493,9 +531,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/media/test_importer.py cozy-0.7.7--patche from cozy.model.library import Library -diff -r -U4 cozy-0.7.7--orig/test/cozy/model/storage_block_list.py cozy-0.7.7--patched/test/cozy/model/storage_block_list.py ---- cozy-0.7.7--orig/test/cozy/model/storage_block_list.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/storage_block_list.py 2020-11-30 18:04:36.925089150 +0100 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--patched/test/cozy/model/storage_block_list.py +--- cozy-0.8.1--orig/test/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/storage_block_list.py 2021-02-08 12:07:35.604713738 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -506,9 +544,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/storage_block_list.py cozy-0.7.7--p @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_book.py cozy-0.7.7--patched/test/cozy/model/test_book.py ---- cozy-0.7.7--orig/test/cozy/model/test_book.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_book.py 2020-11-30 18:04:36.927089153 +0100 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_book.py cozy-0.8.1--patched/test/cozy/model/test_book.py +--- cozy-0.8.1--orig/test/cozy/model/test_book.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_book.py 2021-02-08 12:07:35.608713750 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -519,9 +557,9 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_book.py cozy-0.7.7--patched/te @pytest.fixture(autouse=True) def setup_inject(peewee_database): -diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_library.py cozy-0.7.7--patched/test/cozy/model/test_library.py ---- cozy-0.7.7--orig/test/cozy/model/test_library.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_library.py 2020-11-30 18:04:36.922089146 +0100 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_library.py cozy-0.8.1--patched/test/cozy/model/test_library.py +--- cozy-0.8.1--orig/test/cozy/model/test_library.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_library.py 2021-02-08 12:07:35.601713729 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -529,12 +567,12 @@ diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_library.py cozy-0.7.7--patched -from cozy.ext import inject +import inject from cozy.extensions.set import split_strings_to_set + from cozy.model.settings import Settings - @pytest.fixture(autouse=True) -diff -r -U4 cozy-0.7.7--orig/test/cozy/model/test_settings.py cozy-0.7.7--patched/test/cozy/model/test_settings.py ---- cozy-0.7.7--orig/test/cozy/model/test_settings.py 2020-11-29 23:34:11.000000000 +0100 -+++ cozy-0.7.7--patched/test/cozy/model/test_settings.py 2020-11-30 18:04:36.912089130 +0100 +diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_settings.py cozy-0.8.1--patched/test/cozy/model/test_settings.py +--- cozy-0.8.1--orig/test/cozy/model/test_settings.py 2021-01-31 15:17:11.000000000 +0100 ++++ cozy-0.8.1--patched/test/cozy/model/test_settings.py 2021-02-08 12:07:35.594713707 +0100 @@ -1,7 +1,7 @@ import pytest diff --git a/cozy.spec b/cozy.spec index 4b6f9df..7896add 100644 --- a/cozy.spec +++ b/cozy.spec @@ -2,10 +2,10 @@ Name: cozy %global rtld_name com.github.geigi.cozy Summary: Modern audiobook player -License: GPLv3+ and ASL 2.0 +License: GPLv3+ -Version: 0.7.8 -Release: 2%{?dist} +Version: 0.8.1 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -108,6 +108,9 @@ mv ./appdata.patched "data/%{rtld_name}.appdata.xml" %meson_install %find_lang %{rtld_name} +# Remove the "devel" icon +rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg + %check %if 0%{?with_tests} @@ -126,11 +129,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %{_datadir}/glib-2.0/schemas/%{rtld_name}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{rtld_name}.svg %{_datadir}/icons/hicolor/scalable/actions/*-symbolic.svg +%{_datadir}/icons/hicolor/symbolic/apps/%{rtld_name}-symbolic.svg %{_metainfodir}/%{rtld_name}.appdata.xml %{python3_sitelib}/%{name}/ %changelog +* Mon Feb 08 2021 Artur Frenszek-Iwicki - 0.8.1-1 +- Update to latest release +- Fix license tag - cozy is GPLv3, the "and ASL 2.0" part + came from a bundled library, which has been un-bundled + * Tue Jan 26 2021 Fedora Release Engineering - 0.7.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index f78a9ff..f8330ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.7.8.tar.gz) = a8bccb8e94fc56e58005c5e7369785780e7f44cfcc26c49a973bbe726d8227a56474c680e1a3d2931ea650b3982b18ffc5799dc5b5ca77f14a5fce79ee401a91 +SHA512 (cozy-0.8.1.tar.gz) = a6589968cd2acd2001c53d0d61c8ba5f28e5a2a773db99bf035684eb5fca458260f8541809a94119791c4adf39dd09dc1f6964228f93256d1e087078033dd36c From 1822ac6db6f8df88e501f054ab2a6d194bb5313f Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 19 Apr 2021 01:40:00 +0200 Subject: [PATCH 04/41] Update to v0.9.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 396 +++++++++++++++++++----------------- cozy.spec | 5 +- sources | 2 +- 4 files changed, 220 insertions(+), 184 deletions(-) diff --git a/.gitignore b/.gitignore index 26e19c4..20c2337 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cozy-0.7.7.tar.gz /cozy-0.7.8.tar.gz /cozy-0.8.1.tar.gz +/cozy-0.9.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 053197c..6bdca34 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app_controller.py ---- cozy-0.8.1--orig/cozy/app_controller.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/app_controller.py 2021-02-08 12:07:35.528713507 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/app_controller.py +--- cozy-0.9.1--orig/cozy/app_controller.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/app_controller.py 2021-04-19 01:31:38.733519002 +0200 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/app_controller.py cozy-0.8.1--patched/cozy/app from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/cozy/application_settings.py ---- cozy-0.8.1--orig/cozy/application_settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/application_settings.py 2021-02-08 12:07:35.497713413 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/cozy/application_settings.py +--- cozy-0.9.1--orig/cozy/application_settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/application_settings.py 2021-04-19 01:31:38.716518967 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/application_settings.py cozy-0.8.1--patched/co class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/cozy/control/artwork_cache.py ---- cozy-0.8.1--orig/cozy/control/artwork_cache.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/artwork_cache.py 2021-02-08 12:07:35.222712577 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/cozy/control/artwork_cache.py +--- cozy-0.9.1--orig/cozy/control/artwork_cache.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/artwork_cache.py 2021-04-19 01:31:38.583518698 +0200 @@ -7,9 +7,9 @@ from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir @@ -37,9 +37,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/artwork_cache.py cozy-0.8.1--patched/c from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control/db.py ---- cozy-0.8.1--orig/cozy/control/db.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/db.py 2021-02-08 12:07:35.226712589 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py +--- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/db.py cozy-0.8.1--patched/cozy/control from cozy.control.db_updater import update_db from cozy.db.artwork_cache import ArtworkCache from cozy.db.book import Book -diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patched/cozy/control/filesystem_monitor.py ---- cozy-0.8.1--orig/cozy/control/filesystem_monitor.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/filesystem_monitor.py 2021-02-08 12:07:35.212712547 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--patched/cozy/control/filesystem_monitor.py +--- cozy-0.9.1--orig/cozy/control/filesystem_monitor.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/filesystem_monitor.py 2021-04-19 01:31:38.577518686 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -64,36 +64,37 @@ diff -U4 -r cozy-0.8.1--orig/cozy/control/filesystem_monitor.py cozy-0.8.1--patc from cozy.architecture.event_sender import EventSender from cozy.control.db import get_tracks -diff -U4 -r cozy-0.8.1--orig/cozy/control/offline_cache.py cozy-0.8.1--patched/cozy/control/offline_cache.py ---- cozy-0.8.1--orig/cozy/control/offline_cache.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/offline_cache.py 2021-02-08 12:07:35.245712647 +0100 -@@ -12,9 +12,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py +--- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 +@@ -22,9 +22,9 @@ - from cozy.db.book import Book - from cozy.db.track import Track - from cozy.db.offline_cache import OfflineCache as OfflineCacheModel + import cozy.ui + from cozy.application_settings import ApplicationSettings + from cozy.control.artwork_cache import ArtworkCache -from cozy.ext import inject +import inject + from cozy.media.player import Player + from cozy.model.book import Book from cozy.report import reporter - log = logging.getLogger("offline_cache") +diff -U4 -rN cozy-0.9.1--orig/cozy/control/offline_cache.py cozy-0.9.1--patched/cozy/control/offline_cache.py +--- cozy-0.9.1--orig/cozy/control/offline_cache.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/control/offline_cache.py 2021-04-19 01:31:38.600518733 +0200 +@@ -12,9 +12,9 @@ -diff -U4 -r cozy-0.8.1--orig/cozy/control/player.py cozy-0.8.1--patched/cozy/control/player.py ---- cozy-0.8.1--orig/cozy/control/player.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/control/player.py 2021-02-08 12:07:35.238712626 +0100 -@@ -1,8 +1,8 @@ - import threading - import time - --import cozy.ext.inject as inject + from cozy.db.track import Track + from cozy.db.offline_cache import OfflineCache as OfflineCacheModel + from cozy.db.book import Book as BookDB +-from cozy.ext import inject +import inject - from gi.repository import Gst, GLib + from cozy.model.book import Book + from cozy.model.chapter import Chapter + from cozy.report import reporter - import gi - -diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/files.py ---- cozy-0.8.1--orig/cozy/media/files.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/files.py 2021-02-08 12:07:35.254712674 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media/files.py +--- cozy-0.9.1--orig/cozy/media/files.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/files.py 2021-04-19 01:31:38.606518745 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -105,41 +106,41 @@ diff -U4 -r cozy-0.8.1--orig/cozy/media/files.py cozy-0.8.1--patched/cozy/media/ from cozy.model.settings import Settings from cozy.report import reporter -diff -U4 -r cozy-0.8.1--orig/cozy/media/importer.py cozy-0.8.1--patched/cozy/media/importer.py ---- cozy-0.8.1--orig/cozy/media/importer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/importer.py 2021-02-08 12:07:35.281712756 +0100 -@@ -12,9 +12,9 @@ - from cozy.media.media_file import MediaFile - from cozy.model.library import Library +diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/media/importer.py +--- cozy-0.9.1--orig/cozy/media/importer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/importer.py 2021-04-19 01:31:38.622518777 +0200 +@@ -9,9 +9,9 @@ + from cozy.architecture.event_sender import EventSender + from cozy.architecture.profiler import timing from cozy.control.filesystem_monitor import FilesystemMonitor, StorageNotFound -from cozy.ext import inject +import inject + from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered + from cozy.media.media_file import MediaFile + from cozy.model.library import Library from cozy.model.settings import Settings - from cozy.report import reporter - - log = logging.getLogger("importer") -diff -U4 -r cozy-0.8.1--orig/cozy/media/player.py cozy-0.8.1--patched/cozy/media/player.py ---- cozy-0.8.1--orig/cozy/media/player.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/media/player.py 2021-02-08 12:07:35.263712702 +0100 -@@ -5,9 +5,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/media/player.py +--- cozy-0.9.1--orig/cozy/media/player.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/media/player.py 2021-04-19 01:31:38.611518755 +0200 +@@ -6,9 +6,9 @@ from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender - from cozy.control import player + from cozy.control.offline_cache import OfflineCache -from cozy.ext import inject +import inject + from cozy.media.gst_player import GstPlayer, GstPlayerState from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library - from cozy.report import reporter -diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/book.py ---- cozy-0.8.1--orig/cozy/model/book.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/book.py 2021-02-08 12:07:35.522713489 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/book.py cozy-0.9.1--patched/cozy/model/book.py +--- cozy-0.9.1--orig/cozy/model/book.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/book.py 2021-04-19 01:31:38.730518995 +0200 @@ -6,9 +6,9 @@ + from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.db.book import Book as BookModel - from cozy.db.storage_blacklist import StorageBlackList from cozy.db.track import Track as TrackModel -from cozy.ext import inject +import inject @@ -147,9 +148,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/book.py cozy-0.8.1--patched/cozy/model/b from cozy.model.settings import Settings from cozy.model.track import Track -diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/model/library.py ---- cozy-0.8.1--orig/cozy/model/library.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/library.py 2021-02-08 12:07:35.508713446 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/model/library.py +--- cozy-0.9.1--orig/cozy/model/library.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/library.py 2021-04-19 01:31:38.721518977 +0200 @@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -161,9 +162,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/library.py cozy-0.8.1--patched/cozy/mode from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/model/settings.py ---- cozy-0.8.1--orig/cozy/model/settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/settings.py 2021-02-08 12:07:35.501713425 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py +--- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -174,22 +175,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/model/settings.py cozy-0.8.1--patched/cozy/mod from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -U4 -r cozy-0.8.1--orig/cozy/model/storage_block_list.py cozy-0.8.1--patched/cozy/model/storage_block_list.py ---- cozy-0.8.1--orig/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/model/storage_block_list.py 2021-02-08 12:07:35.525713498 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patched/cozy/model/storage_block_list.py +--- cozy-0.9.1--orig/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/model/storage_block_list.py 2021-04-19 01:31:38.732519000 +0200 +@@ -1,9 +1,9 @@ from peewee import SqliteDatabase from cozy.db.storage_blacklist import StorageBlackList + from cozy.db.track import Track as TrackModel -from cozy.ext import inject +import inject + from cozy.model.book import Book class StorageBlockList: - _db = cache = inject.attr(SqliteDatabase) -diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/cozy/report/report_to_loki.py ---- cozy-0.8.1--orig/cozy/report/report_to_loki.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/report/report_to_loki.py 2021-02-08 12:07:35.553713583 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py +--- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 @@ -6,9 +6,9 @@ import distro import platform @@ -201,23 +203,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/report/report_to_loki.py cozy-0.8.1--patched/c from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -U4 -r cozy-0.8.1--orig/cozy/ui/album_element.py cozy-0.8.1--patched/cozy/ui/album_element.py ---- cozy-0.8.1--orig/cozy/ui/album_element.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/album_element.py 2021-02-08 12:07:35.311712848 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ui/album_element.py +--- cozy-0.9.1--orig/cozy/ui/album_element.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/album_element.py 2021-04-19 01:31:38.637518807 +0200 @@ -2,9 +2,9 @@ - from cozy.control import player as player + from gi.repository import Gtk, Gdk, GdkPixbuf, GObject + from cozy.control.artwork_cache import ArtworkCache - from cozy.control.db import get_track_for_playback -from cozy.ext import inject +import inject from cozy.model.book import Book + log = logging.getLogger("album_element") - class AlbumElement(Gtk.Box): -diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/cozy/ui/book_detail_view.py ---- cozy-0.8.1--orig/cozy/ui/book_detail_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/book_detail_view.py 2021-02-08 12:07:35.342712942 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/cozy/ui/book_detail_view.py +--- cozy-0.9.1--orig/cozy/ui/book_detail_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/book_detail_view.py 2021-04-19 01:31:38.648518830 +0200 @@ -3,9 +3,9 @@ import gi @@ -229,9 +231,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_detail_view.py cozy-0.8.1--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.disk_element import DiskElement -diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui/book_element.py ---- cozy-0.8.1--orig/cozy/ui/book_element.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/book_element.py 2021-02-08 12:07:35.288712778 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/ui/book_element.py +--- cozy-0.9.1--orig/cozy/ui/book_element.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/book_element.py 2021-04-19 01:31:38.627518787 +0200 @@ -1,8 +1,8 @@ import os import subprocess @@ -242,23 +244,35 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/book_element.py cozy-0.8.1--patched/cozy/ui import cozy.tools as tools import cozy.ui -diff -U4 -r cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.8.1--orig/cozy/ui/file_not_found_dialog.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/file_not_found_dialog.py 2021-02-08 12:07:35.297712805 +0100 -@@ -3,9 +3,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/cozy/ui/delete_book_view.py +--- cozy-0.9.1--orig/cozy/ui/delete_book_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/delete_book_view.py 2021-04-19 01:31:38.628518789 +0200 +@@ -1,7 +1,7 @@ + import gi + +-from cozy.ext import inject ++import inject + + gi.require_version('Gtk', '3.0') from gi.repository import Gtk - import cozy.control.player as player + +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py 2021-04-19 01:31:38.632518797 +0200 +@@ -2,9 +2,9 @@ + + from gi.repository import Gtk + import cozy.ui - from cozy.db.track import Track -from cozy.ext import inject +import inject from cozy.media.importer import Importer + from cozy.model.chapter import Chapter + from cozy.model.library import Library - - class FileNotFoundDialog(): -diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/headerbar.py ---- cozy-0.8.1--orig/cozy/ui/headerbar.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/headerbar.py 2021-02-08 12:07:35.293712793 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/headerbar.py +--- cozy-0.9.1--orig/cozy/ui/headerbar.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/headerbar.py 2021-04-19 01:31:38.630518793 +0200 @@ -3,9 +3,9 @@ import gi @@ -270,22 +284,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/headerbar.py cozy-0.8.1--patched/cozy/ui/he from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState -diff -U4 -r cozy-0.8.1--orig/cozy/ui/library_view.py cozy-0.8.1--patched/cozy/ui/library_view.py ---- cozy-0.8.1--orig/cozy/ui/library_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/library_view.py 2021-02-08 12:07:35.324712887 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/ui/library_view.py +--- cozy-0.9.1--orig/cozy/ui/library_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/library_view.py 2021-04-19 01:31:38.641518815 +0200 +@@ -2,9 +2,9 @@ + from gi.repository import Gtk from gi.repository.Gtk import Builder -from cozy.ext import inject +import inject + from cozy.model.book import Book from cozy.ui.book_element import BookElement + from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox - from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode - -diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/main_view.py ---- cozy-0.8.1--orig/cozy/ui/main_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/main_view.py 2021-02-08 12:07:35.355712981 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/main_view.py +--- cozy-0.9.1--orig/cozy/ui/main_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/main_view.py 2021-04-19 01:31:38.653518840 +0200 @@ -1,7 +1,7 @@ import webbrowser @@ -295,9 +310,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/main_view.py cozy-0.8.1--patched/cozy/ui/ma from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db -diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/search_view.py ---- cozy-0.8.1--orig/cozy/ui/search_view.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/search_view.py 2021-02-08 12:07:35.328712899 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui/search_view.py +--- cozy-0.9.1--orig/cozy/ui/search_view.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/search_view.py 2021-04-19 01:31:38.643518819 +0200 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -308,9 +323,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/search_view.py cozy-0.8.1--patched/cozy/ui/ import gi -diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/settings.py ---- cozy-0.8.1--orig/cozy/ui/settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/settings.py 2021-02-08 12:07:35.286712772 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/settings.py +--- cozy-0.9.1--orig/cozy/ui/settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/settings.py 2021-04-19 01:31:38.625518783 +0200 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -322,9 +337,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/settings.py cozy-0.8.1--patched/cozy/ui/set from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow from cozy.view_model.settings_view_model import SettingsViewModel -diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/warnings.py ---- cozy-0.8.1--orig/cozy/ui/warnings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/warnings.py 2021-02-08 12:07:35.301712817 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py +--- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 @@ -1,8 +1,8 @@ from gettext import gettext @@ -335,9 +350,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/warnings.py cozy-0.8.1--patched/cozy/ui/war from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/error_reporting.py 2021-02-08 12:07:35.391713091 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py 2021-04-19 01:31:38.672518878 +0200 @@ -2,9 +2,9 @@ import gi @@ -349,9 +364,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.8.1--patc gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-02-08 12:07:35.366713015 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-04-19 01:31:38.660518854 +0200 @@ -1,7 +1,7 @@ import gi @@ -361,9 +376,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.8. gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patched/cozy/ui/widgets/search_results.py ---- cozy-0.8.1--orig/cozy/ui/widgets/search_results.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/search_results.py 2021-02-08 12:07:35.362713002 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patched/cozy/ui/widgets/search_results.py +--- cozy-0.9.1--orig/cozy/ui/widgets/search_results.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/search_results.py 2021-04-19 01:31:38.656518846 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -374,9 +389,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/search_results.py cozy-0.8.1--patch MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/sleep_timer.py 2021-02-08 12:07:35.384713069 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py 2021-04-19 01:31:38.668518870 +0200 @@ -1,7 +1,7 @@ import gi @@ -386,12 +401,12 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.8.1--patched/ gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-02-08 12:07:35.370713027 +0100 -@@ -5,9 +5,9 @@ - +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-04-19 01:31:38.661518856 +0200 +@@ -6,9 +6,9 @@ import cozy.ui + from cozy.control.filesystem_monitor import FilesystemMonitor from cozy.db.storage import Storage from cozy.model.settings import Settings -from cozy.ext import inject @@ -400,9 +415,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.8.1- from cozy.model.storage_block_list import StorageBlockList log = logging.getLogger("settings") -diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/ui/widgets/whats_new_window.py 2021-02-08 12:07:35.404713130 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py 2021-04-19 01:31:38.677518888 +0200 @@ -3,9 +3,9 @@ import gi @@ -411,13 +426,13 @@ diff -U4 -r cozy-0.8.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.8.1--pat -from cozy.ext import inject +import inject from cozy.ui.main_view import CozyUI - from cozy.ui.widgets.error_reporting import ErrorReporting - from cozy.ui.widgets.whats_new_importer import WhatsNewImporter - from cozy.ui.widgets.whats_new_m4b import WhatsNewM4B, INTRODUCED -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/book_detail_view_model.py 2021-02-08 12:07:35.444713252 +0100 -@@ -4,9 +4,9 @@ + from cozy.version import __version__ as CozyVersion + + gi.require_version('Gtk', '3.0') +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py 2021-04-19 01:31:38.693518921 +0200 +@@ -5,9 +5,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor @@ -428,9 +443,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.8. from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/headerbar_view_model.py 2021-02-08 12:07:35.435713224 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py 2021-04-19 01:31:38.689518912 +0200 @@ -2,9 +2,9 @@ from cozy.architecture.event_sender import EventSender @@ -442,21 +457,23 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.8.1- from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/library_view_model.py cozy-0.8.1--patched/cozy/view_model/library_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/library_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/library_view_model.py 2021-02-08 12:07:35.446713258 +0100 -@@ -1,7 +1,7 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1--patched/cozy/view_model/library_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/library_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/library_view_model.py 2021-04-19 01:31:38.694518923 +0200 +@@ -2,9 +2,9 @@ + import os from enum import Enum, auto + from typing import Optional -import cozy.ext.inject as inject +import inject - from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/playback_control_view_model.py 2021-02-08 12:07:35.431713212 +0100 + from cozy.control.filesystem_monitor import FilesystemMonitor +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py 2021-04-19 01:31:38.687518908 +0200 @@ -1,9 +1,9 @@ from typing import Optional @@ -468,13 +485,12 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_control_view_model.py cozy from cozy.model.book import Book from cozy.open_view import OpenView -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/playback_speed_view_model.py 2021-02-08 12:07:35.417713170 +0100 -@@ -1,9 +1,9 @@ +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py 2021-04-19 01:31:38.682518898 +0200 +@@ -1,8 +1,8 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable - from cozy.control import player from cozy.db.book import Book -from cozy.ext import inject +import inject @@ -482,9 +498,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0 class PlaybackSpeedViewModel(Observable, EventSender): -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--patched/cozy/view_model/search_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/search_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/search_view_model.py 2021-02-08 12:07:35.426713197 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--patched/cozy/view_model/search_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/search_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/search_view_model.py 2021-04-19 01:31:38.686518906 +0200 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -492,9 +508,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/search_view_model.py cozy-0.8.1--pa from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1--patched/cozy/view_model/settings_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/settings_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/settings_view_model.py 2021-02-08 12:07:35.422713185 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1--patched/cozy/view_model/settings_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/settings_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/settings_view_model.py 2021-04-19 01:31:38.684518902 +0200 @@ -1,6 +1,6 @@ from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -503,9 +519,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/settings_view_model.py cozy-0.8.1-- from cozy.model.settings import Settings -diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-02-08 12:07:35.413713157 +0100 +diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-04-19 01:31:38.680518894 +0200 @@ -5,9 +5,9 @@ from cozy import tools @@ -517,9 +533,9 @@ diff -U4 -r cozy-0.8.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.8. from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patched/test/cozy/media/test_importer.py ---- cozy-0.8.1--orig/test/cozy/media/test_importer.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/media/test_importer.py 2021-02-08 12:07:35.571713637 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patched/test/cozy/media/test_importer.py +--- cozy-0.9.1--orig/test/cozy/media/test_importer.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/media/test_importer.py 2021-04-19 01:31:38.756519048 +0200 @@ -2,9 +2,9 @@ import pytest @@ -531,9 +547,23 @@ diff -U4 -r cozy-0.8.1--orig/test/cozy/media/test_importer.py cozy-0.8.1--patche from cozy.model.library import Library -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--patched/test/cozy/model/storage_block_list.py ---- cozy-0.8.1--orig/test/cozy/model/storage_block_list.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/storage_block_list.py 2021-02-08 12:07:35.604713738 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched/test/cozy/media/test_player.py +--- cozy-0.9.1--orig/test/cozy/media/test_player.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/media/test_player.py 2021-04-19 01:31:38.761519058 +0200 +@@ -3,9 +3,9 @@ + import pytest + from peewee import SqliteDatabase + + from cozy.application_settings import ApplicationSettings +-from cozy.ext import inject ++import inject + from cozy.media.gst_player import GstPlayer + from cozy.model.library import Library + from cozy.model.settings import Settings + +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1--patched/test/cozy/model/storage_block_list.py +--- cozy-0.9.1--orig/test/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/storage_block_list.py 2021-04-19 01:31:38.776519088 +0200 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -544,35 +574,37 @@ diff -U4 -r cozy-0.8.1--orig/test/cozy/model/storage_block_list.py cozy-0.8.1--p @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_book.py cozy-0.8.1--patched/test/cozy/model/test_book.py ---- cozy-0.8.1--orig/test/cozy/model/test_book.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_book.py 2021-02-08 12:07:35.608713750 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/test/cozy/model/test_book.py +--- cozy-0.9.1--orig/test/cozy/model/test_book.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_book.py 2021-04-19 01:31:38.778519093 +0200 +@@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase + from cozy.application_settings import ApplicationSettings -from cozy.ext import inject +import inject + from test.cozy.mocks import ApplicationSettingsMock @pytest.fixture(autouse=True) - def setup_inject(peewee_database): -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_library.py cozy-0.8.1--patched/test/cozy/model/test_library.py ---- cozy-0.8.1--orig/test/cozy/model/test_library.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_library.py 2021-02-08 12:07:35.601713729 +0100 -@@ -1,8 +1,8 @@ +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patched/test/cozy/model/test_library.py +--- cozy-0.9.1--orig/test/cozy/model/test_library.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_library.py 2021-04-19 01:31:38.775519087 +0200 +@@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase + from cozy.application_settings import ApplicationSettings -from cozy.ext import inject +import inject from cozy.extensions.set import split_strings_to_set from cozy.model.settings import Settings + from test.cozy.mocks import ApplicationSettingsMock - -diff -U4 -r cozy-0.8.1--orig/test/cozy/model/test_settings.py cozy-0.8.1--patched/test/cozy/model/test_settings.py ---- cozy-0.8.1--orig/test/cozy/model/test_settings.py 2021-01-31 15:17:11.000000000 +0100 -+++ cozy-0.8.1--patched/test/cozy/model/test_settings.py 2021-02-08 12:07:35.594713707 +0100 +diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_settings.py cozy-0.9.1--patched/test/cozy/model/test_settings.py +--- cozy-0.9.1--orig/test/cozy/model/test_settings.py 2021-04-18 22:50:27.000000000 +0200 ++++ cozy-0.9.1--patched/test/cozy/model/test_settings.py 2021-04-19 01:31:38.771519079 +0200 @@ -1,7 +1,7 @@ import pytest diff --git a/cozy.spec b/cozy.spec index 7896add..2142b73 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.8.1 +Version: 0.9.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Mon Apr 19 2021 Artur Frenszek-Iwicki - 0.9.1-1 +- Update to latest release + * Mon Feb 08 2021 Artur Frenszek-Iwicki - 0.8.1-1 - Update to latest release - Fix license tag - cozy is GPLv3, the "and ASL 2.0" part diff --git a/sources b/sources index f8330ba..bd1bc2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.8.1.tar.gz) = a6589968cd2acd2001c53d0d61c8ba5f28e5a2a773db99bf035684eb5fca458260f8541809a94119791c4adf39dd09dc1f6964228f93256d1e087078033dd36c +SHA512 (cozy-0.9.1.tar.gz) = 48a86c8d78f9e27d5e309608ed768ef0dcf7e032f089a43e50a1ecf1a5fe21f3356f6bea7321163b6a946a6a414aab8a687f814d582adc0815a65da46a91ba15 From 580d69fb0839ed1587ee11b0ffdf1b96721f994a Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 20 Apr 2021 00:06:06 +0200 Subject: [PATCH 05/41] Update to v0.9.2 --- .gitignore | 1 + cozy--unbundle-inject.patch | 2 +- cozy.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 20c2337..14c3d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cozy-0.7.8.tar.gz /cozy-0.8.1.tar.gz /cozy-0.9.1.tar.gz +/cozy-0.9.2.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 6bdca34..5225d67 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -29,7 +29,6 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ @@ -7,9 +7,9 @@ from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir - from cozy.control.db import get_tracks from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel -from cozy.ext import inject +import inject @@ -37,6 +36,7 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ from cozy.report import reporter log = logging.getLogger("artwork_cache") + diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py --- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 diff --git a/cozy.spec b/cozy.spec index 2142b73..02cb260 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Tue Apr 20 2021 Artur Frenszek-Iwicki - 0.9.2-1 +- Update to latest release + * Mon Apr 19 2021 Artur Frenszek-Iwicki - 0.9.1-1 - Update to latest release diff --git a/sources b/sources index bd1bc2e..0f7a6ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.1.tar.gz) = 48a86c8d78f9e27d5e309608ed768ef0dcf7e032f089a43e50a1ecf1a5fe21f3356f6bea7321163b6a946a6a414aab8a687f814d582adc0815a65da46a91ba15 +SHA512 (cozy-0.9.2.tar.gz) = 5d33f89a77469a6ba1afd9706823a6fcfab2649745ea99a822cf29507002820296f842ca5ec5c880e3697ecf8d4cd608e44efff66218c1d13b76a4978088a40b From a700a33eafd71061a68765778345054e0ec38741 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Wed, 21 Apr 2021 22:42:29 +0200 Subject: [PATCH 06/41] Update to v0.9.3 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14c3d0f..dc1d36b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cozy-0.8.1.tar.gz /cozy-0.9.1.tar.gz /cozy-0.9.2.tar.gz +/cozy-0.9.3.tar.gz diff --git a/cozy.spec b/cozy.spec index 02cb260..efa4ce5 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -135,6 +135,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Apr 21 2021 Artur Frenszek-Iwicki - 0.9.3-1 +- Update to latest release + * Tue Apr 20 2021 Artur Frenszek-Iwicki - 0.9.2-1 - Update to latest release diff --git a/sources b/sources index 0f7a6ef..80ecaa8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.2.tar.gz) = 5d33f89a77469a6ba1afd9706823a6fcfab2649745ea99a822cf29507002820296f842ca5ec5c880e3697ecf8d4cd608e44efff66218c1d13b76a4978088a40b +SHA512 (cozy-0.9.3.tar.gz) = 3e80e63f59172607e5a22d0aa72f66f9814b1bfc83a380b77d7b8d77b7883b368441c155f4320d349247d645f81d9a9a903d75801589da5100e3275eac42679c From ccd5b5476e52f110ce4bf624f9bb62134c6faf17 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 25 Apr 2021 12:55:02 +0200 Subject: [PATCH 07/41] Update to v0.9.4 --- .gitignore | 1 + cozy--unbundle-inject.patch | 25 ++++++++++++++++++++----- cozy.spec | 11 ++++++++++- find-unpatched-imports.sh | 17 +++++++++++++++++ sources | 2 +- 5 files changed, 49 insertions(+), 7 deletions(-) create mode 100755 find-unpatched-imports.sh diff --git a/.gitignore b/.gitignore index dc1d36b..3b0b59e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cozy-0.9.1.tar.gz /cozy-0.9.2.tar.gz /cozy-0.9.3.tar.gz +/cozy-0.9.4.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 5225d67..3684644 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -63,7 +63,7 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--pat from gi.repository import Gio from cozy.architecture.event_sender import EventSender - from cozy.control.db import get_tracks + from cozy.model.book import Book diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py --- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 @@ -165,9 +165,10 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/mod diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py --- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 -@@ -1,8 +1,8 @@ - import logging - from typing import List +@@ -2,9 +2,9 @@ + from typing import List, Optional + + import peewee -import cozy.ext.inject as inject +import inject @@ -189,6 +190,20 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patch class StorageBlockList: +diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/power_manager.py +--- cozy-0.9.4--orig/cozy/power_manager.py 2021-04-24 13:52:19.000000000 +0200 ++++ cozy-0.9.4--patched/cozy/power_managerpatched.py 2021-04-25 12:39:28.447341956 +0200 +@@ -1,9 +1,9 @@ + import logging + + from gi.repository import Gtk + +-from cozy.ext import inject ++import inject + from cozy.media.player import Player + + log = logging.getLogger("power_mgr") + diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py --- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 @@ -333,10 +348,10 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/se from cozy.db.storage_blacklist import StorageBlackList -from cozy.ext import inject +import inject + from cozy.model.library import Library from cozy.ui.widgets.ScrollWrapper import ScrollWrapper from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow from cozy.view_model.settings_view_model import SettingsViewModel - diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py --- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 +++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 diff --git a/cozy.spec b/cozy.spec index efa4ce5..b8a5c2a 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,12 +4,14 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.3 +Version: 0.9.4 Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Source99: find-unpatched-imports.sh + Patch0: %{name}--unbundle-inject.patch BuildArch: noarch @@ -88,6 +90,9 @@ Here are some of the current features: %patch0 -p1 rm -rf cozy/ext/inject +# Run the "find unpatched imports" script +%{SOURCE99} $(pwd) + # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation xmlstarlet ed \ @@ -116,6 +121,7 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg %if 0%{?with_tests} %pytest %endif + appstream-util validate --nonet %{buildroot}/%{_datadir}/metainfo/%{rtld_name}.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop @@ -135,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun Apr 25 2021 Artur Frenszek-Iwicki - 0.9.4-1 +- Update to latest release + * Wed Apr 21 2021 Artur Frenszek-Iwicki - 0.9.3-1 - Update to latest release diff --git a/find-unpatched-imports.sh b/find-unpatched-imports.sh new file mode 100755 index 0000000..94b764e --- /dev/null +++ b/find-unpatched-imports.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +grep \ + --line-number \ + --include '*.py' \ + --fixed-strings \ + -e 'from cozy.ext import inject' \ + -e 'import cozy.ext.inject' \ + -d recurse "$1" + +# Quoting grep's man page: +# > Normally the exit status is 0 if a line is selected, +# > 1 if no lines were selected, +# > and 2 if an error occurred. +if [[ "$?" -ne 1 ]]; then + exit 1 +fi diff --git a/sources b/sources index 80ecaa8..c431f02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.3.tar.gz) = 3e80e63f59172607e5a22d0aa72f66f9814b1bfc83a380b77d7b8d77b7883b368441c155f4320d349247d645f81d9a9a903d75801589da5100e3275eac42679c +SHA512 (cozy-0.9.4.tar.gz) = 57bdffda4b9a3a7d3e38d72a57d8c383a993bab80da1fe9efcc3cf36ef08ca8a3d9af1053a8bec5876994872e68c07450be87cdd455d279429074d27207ce556 From fbdf16bce56bc4053511eb6dde624a66e732bb03 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 10 May 2021 19:02:55 +0200 Subject: [PATCH 08/41] Update to v0.9.5 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b0b59e..f4ed717 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cozy-0.9.2.tar.gz /cozy-0.9.3.tar.gz /cozy-0.9.4.tar.gz +/cozy-0.9.5.tar.gz diff --git a/cozy.spec b/cozy.spec index b8a5c2a..be22361 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -141,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Mon May 10 2021 Artur Frenszek-Iwicki - 0.9.5-1 +- Update to latest release + * Sun Apr 25 2021 Artur Frenszek-Iwicki - 0.9.4-1 - Update to latest release diff --git a/sources b/sources index c431f02..8957c41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.4.tar.gz) = 57bdffda4b9a3a7d3e38d72a57d8c383a993bab80da1fe9efcc3cf36ef08ca8a3d9af1053a8bec5876994872e68c07450be87cdd455d279429074d27207ce556 +SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015 From 075df6e60b3f89681640238d69649f61c2ed5ee3 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 30 May 2021 11:36:03 +0200 Subject: [PATCH 09/41] Update to v1.0.1 --- .gitignore | 1 + cozy--unbundle-inject.patch | 343 ++++++++++++++++++++---------------- cozy.spec | 5 +- sources | 2 +- 4 files changed, 198 insertions(+), 153 deletions(-) diff --git a/.gitignore b/.gitignore index f4ed717..b3740d3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cozy-0.9.3.tar.gz /cozy-0.9.4.tar.gz /cozy-0.9.5.tar.gz +/cozy-1.0.1.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index 3684644..dd5b375 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/app_controller.py ---- cozy-0.9.1--orig/cozy/app_controller.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/app_controller.py 2021-04-19 01:31:38.733519002 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/app_controller.py cozy-1.0.1--patched/cozy/app_controller.py +--- cozy-1.0.1--orig/cozy/app_controller.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/app_controller.py 2021-05-30 11:14:55.904892273 +0200 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/app_controller.py cozy-0.9.1--patched/cozy/ap from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/cozy/application_settings.py ---- cozy-0.9.1--orig/cozy/application_settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/application_settings.py 2021-04-19 01:31:38.716518967 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/application_settings.py cozy-1.0.1--patched/cozy/application_settings.py +--- cozy-1.0.1--orig/cozy/application_settings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/application_settings.py 2021-05-30 11:14:55.889892270 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,10 +23,11 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/application_settings.py cozy-0.9.1--patched/c class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/cozy/control/artwork_cache.py ---- cozy-0.9.1--orig/cozy/control/artwork_cache.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/artwork_cache.py 2021-04-19 01:31:38.583518698 +0200 -@@ -7,9 +7,9 @@ +diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/cozy/control/artwork_cache.py +--- cozy-1.0.1--orig/cozy/control/artwork_cache.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/artwork_cache.py 2021-05-30 11:14:55.784892252 +0200 +@@ -6,9 +6,9 @@ + from cozy.application_settings import ApplicationSettings from cozy.control.application_directories import get_cache_dir from cozy.db.artwork_cache import ArtworkCache as ArtworkCacheModel @@ -36,10 +37,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/artwork_cache.py cozy-0.9.1--patched/ from cozy.report import reporter log = logging.getLogger("artwork_cache") - -diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/control/db.py ---- cozy-0.9.1--orig/cozy/control/db.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/db.py 2021-04-19 01:31:38.586518704 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/control/db.py cozy-1.0.1--patched/cozy/control/db.py +--- cozy-1.0.1--orig/cozy/control/db.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/db.py 2021-05-30 11:14:55.786892252 +0200 @@ -1,9 +1,9 @@ import logging import os @@ -51,9 +51,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/db.py cozy-0.9.1--patched/cozy/contro from cozy.control.db_updater import update_db from cozy.db.artwork_cache import ArtworkCache from cozy.db.book import Book -diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--patched/cozy/control/filesystem_monitor.py ---- cozy-0.9.1--orig/cozy/control/filesystem_monitor.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/filesystem_monitor.py 2021-04-19 01:31:38.577518686 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patched/cozy/control/filesystem_monitor.py +--- cozy-1.0.1--orig/cozy/control/filesystem_monitor.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/filesystem_monitor.py 2021-05-30 11:14:55.780892251 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -64,9 +64,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/filesystem_monitor.py cozy-0.9.1--pat from cozy.architecture.event_sender import EventSender from cozy.model.book import Book -diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/control/mpris.py ---- cozy-0.9.1--orig/cozy/control/mpris.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/mpris.py 2021-04-19 01:31:38.592518716 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/control/mpris.py +--- cozy-1.0.1--orig/cozy/control/mpris.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/mpris.py 2021-05-30 11:14:55.789892253 +0200 @@ -22,9 +22,9 @@ import cozy.ui @@ -78,23 +78,23 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/control/mpris.py cozy-0.9.1--patched/cozy/con from cozy.model.book import Book from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/control/offline_cache.py cozy-0.9.1--patched/cozy/control/offline_cache.py ---- cozy-0.9.1--orig/cozy/control/offline_cache.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/control/offline_cache.py 2021-04-19 01:31:38.600518733 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/cozy/control/offline_cache.py +--- cozy-1.0.1--orig/cozy/control/offline_cache.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/control/offline_cache.py 2021-05-30 11:14:55.793892253 +0200 @@ -12,9 +12,9 @@ - from cozy.db.track import Track + from cozy.db.file import File from cozy.db.offline_cache import OfflineCache as OfflineCacheModel - from cozy.db.book import Book as BookDB + from cozy.db.track_to_file import TrackToFile -from cozy.ext import inject +import inject from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media/files.py ---- cozy-0.9.1--orig/cozy/media/files.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/files.py 2021-04-19 01:31:38.606518745 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/files.py +--- cozy-1.0.1--orig/cozy/media/files.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/media/files.py 2021-05-30 11:14:55.798892254 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -106,9 +106,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/files.py cozy-0.9.1--patched/cozy/media from cozy.model.settings import Settings from cozy.report import reporter -diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/media/importer.py ---- cozy-0.9.1--orig/cozy/media/importer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/importer.py 2021-04-19 01:31:38.622518777 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py +--- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200 @@ -9,9 +9,9 @@ from cozy.architecture.event_sender import EventSender @@ -118,11 +118,11 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/importer.py cozy-0.9.1--patched/cozy/me +import inject from cozy.media.media_detector import MediaDetector, NotAnAudioFile, AudioFileCouldNotBeDiscovered from cozy.media.media_file import MediaFile + from cozy.model.database_importer import DatabaseImporter from cozy.model.library import Library - from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/media/player.py ---- cozy-0.9.1--orig/cozy/media/player.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/media/player.py 2021-04-19 01:31:38.611518755 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/media/player.py cozy-1.0.1--patched/cozy/media/player.py +--- cozy-1.0.1--orig/cozy/media/player.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/media/player.py 2021-05-30 11:14:55.802892255 +0200 @@ -6,9 +6,9 @@ from cozy.application_settings import ApplicationSettings @@ -134,37 +134,51 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/media/player.py cozy-0.9.1--patched/cozy/medi from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/model/book.py cozy-0.9.1--patched/cozy/model/book.py ---- cozy-0.9.1--orig/cozy/model/book.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/book.py 2021-04-19 01:31:38.730518995 +0200 -@@ -6,9 +6,9 @@ - from cozy.architecture.event_sender import EventSender +diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/book.py +--- cozy-1.0.1--orig/cozy/model/book.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/book.py 2021-05-30 11:14:55.901892272 +0200 +@@ -7,9 +7,9 @@ from cozy.architecture.observable import Observable from cozy.db.book import Book as BookModel from cozy.db.track import Track as TrackModel + from cozy.db.track_to_file import TrackToFile -from cozy.ext import inject +import inject from cozy.model.chapter import Chapter from cozy.model.settings import Settings from cozy.model.track import Track -diff -U4 -rN cozy-0.9.1--orig/cozy/model/library.py cozy-0.9.1--patched/cozy/model/library.py ---- cozy-0.9.1--orig/cozy/model/library.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/library.py 2021-04-19 01:31:38.721518977 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/cozy/model/database_importer.py +--- cozy-1.0.1--orig/cozy/model/database_importer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/database_importer.py 2021-05-30 11:14:55.897892271 +0200 @@ -6,9 +6,9 @@ + from cozy.db.book import Book as BookModel + from cozy.db.file import File + from cozy.db.track import Track + from cozy.db.track_to_file import TrackToFile +-from cozy.ext import inject ++import inject + from cozy.extensions.is_same_book import is_same_book + from cozy.media.media_file import MediaFile + from cozy.model.book import Book, BookIsEmpty + +diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/library.py +--- cozy-1.0.1--orig/cozy/model/library.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/library.py 2021-05-30 11:14:55.893892271 +0200 +@@ -5,9 +5,9 @@ + from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing from cozy.db.book import Book as BookModel - from cozy.db.track import Track -from cozy.ext import inject +import inject from cozy.extensions.set import split_strings_to_set - from cozy.media.media_file import MediaFile - from cozy.model.book import Book, BookIsEmpty -diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/model/settings.py ---- cozy-0.9.1--orig/cozy/model/settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/settings.py 2021-04-19 01:31:38.718518971 +0200 + from cozy.model.chapter import Chapter + from cozy.model.settings import Settings +diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model/settings.py +--- cozy-1.0.1--orig/cozy/model/settings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/settings.py 2021-05-30 11:14:55.890892270 +0200 @@ -2,9 +2,9 @@ from typing import List, Optional @@ -176,9 +190,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/settings.py cozy-0.9.1--patched/cozy/mo from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patched/cozy/model/storage_block_list.py ---- cozy-0.9.1--orig/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/model/storage_block_list.py 2021-04-19 01:31:38.732519000 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/model/storage_block_list.py cozy-1.0.1--patched/cozy/model/storage_block_list.py +--- cozy-1.0.1--orig/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/model/storage_block_list.py 2021-05-30 11:14:55.902892272 +0200 @@ -1,9 +1,9 @@ from peewee import SqliteDatabase @@ -190,9 +204,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/model/storage_block_list.py cozy-0.9.1--patch class StorageBlockList: -diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/power_manager.py ---- cozy-0.9.4--orig/cozy/power_manager.py 2021-04-24 13:52:19.000000000 +0200 -+++ cozy-0.9.4--patched/cozy/power_managerpatched.py 2021-04-25 12:39:28.447341956 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_manager.py +--- cozy-1.0.1--orig/cozy/power_manager.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/power_manager.py 2021-05-30 11:14:55.795892254 +0200 @@ -1,9 +1,9 @@ import logging @@ -204,9 +218,9 @@ diff -U4 -rN cozy-0.9.4--orig/cozy/power_manager.py cozy-0.9.4--patched/cozy/pow log = logging.getLogger("power_mgr") -diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/cozy/report/report_to_loki.py ---- cozy-0.9.1--orig/cozy/report/report_to_loki.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/report/report_to_loki.py 2021-04-19 01:31:38.747519030 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/cozy/report/report_to_loki.py +--- cozy-1.0.1--orig/cozy/report/report_to_loki.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/report/report_to_loki.py 2021-05-30 11:14:55.915892274 +0200 @@ -6,9 +6,9 @@ import distro import platform @@ -218,9 +232,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/report/report_to_loki.py cozy-0.9.1--patched/ from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ui/album_element.py ---- cozy-0.9.1--orig/cozy/ui/album_element.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/album_element.py 2021-04-19 01:31:38.637518807 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/album_element.py cozy-1.0.1--patched/cozy/ui/album_element.py +--- cozy-1.0.1--orig/cozy/ui/album_element.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/album_element.py 2021-05-30 11:14:55.823892259 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GObject @@ -232,9 +246,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/album_element.py cozy-0.9.1--patched/cozy/ log = logging.getLogger("album_element") -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/cozy/ui/book_detail_view.py ---- cozy-0.9.1--orig/cozy/ui/book_detail_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/book_detail_view.py 2021-04-19 01:31:38.648518830 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ui/book_detail_view.py +--- cozy-1.0.1--orig/cozy/ui/book_detail_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/book_detail_view.py 2021-05-30 11:14:55.831892260 +0200 @@ -3,9 +3,9 @@ import gi @@ -246,9 +260,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_detail_view.py cozy-0.9.1--patched/co from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.disk_element import DiskElement -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/ui/book_element.py ---- cozy-0.9.1--orig/cozy/ui/book_element.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/book_element.py 2021-04-19 01:31:38.627518787 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/book_element.py cozy-1.0.1--patched/cozy/ui/book_element.py +--- cozy-1.0.1--orig/cozy/ui/book_element.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/book_element.py 2021-05-30 11:14:55.813892257 +0200 @@ -1,8 +1,8 @@ import os import subprocess @@ -259,9 +273,23 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/book_element.py cozy-0.9.1--patched/cozy/u import cozy.tools as tools import cozy.ui -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/cozy/ui/delete_book_view.py ---- cozy-0.9.1--orig/cozy/ui/delete_book_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/delete_book_view.py 2021-04-19 01:31:38.628518789 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py +--- cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py 2021-05-30 11:14:55.820892258 +0200 +@@ -1,9 +1,9 @@ + import webbrowser + + import gi + +-from cozy.ext import inject ++import inject + + gi.require_version('Gtk', '3.0') + from gi.repository import Gtk + +diff -rU4 cozy-1.0.1--orig/cozy/ui/delete_book_view.py cozy-1.0.1--patched/cozy/ui/delete_book_view.py +--- cozy-1.0.1--orig/cozy/ui/delete_book_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/delete_book_view.py 2021-05-30 11:14:55.815892257 +0200 @@ -1,7 +1,7 @@ import gi @@ -271,9 +299,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/delete_book_view.py cozy-0.9.1--patched/co gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/file_not_found_dialog.py 2021-04-19 01:31:38.632518797 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py 2021-05-30 11:14:55.818892258 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk @@ -285,9 +313,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/file_not_found_dialog.py cozy-0.9.1--patch from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/headerbar.py ---- cozy-0.9.1--orig/cozy/ui/headerbar.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/headerbar.py 2021-04-19 01:31:38.630518793 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/headerbar.py +--- cozy-1.0.1--orig/cozy/ui/headerbar.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/headerbar.py 2021-05-30 11:14:55.816892257 +0200 @@ -3,9 +3,9 @@ import gi @@ -299,9 +327,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/headerbar.py cozy-0.9.1--patched/cozy/ui/h from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/ui/library_view.py ---- cozy-0.9.1--orig/cozy/ui/library_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/library_view.py 2021-04-19 01:31:38.641518815 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py +--- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk @@ -313,9 +341,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/library_view.py cozy-0.9.1--patched/cozy/u from cozy.ui.book_element import BookElement from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/main_view.py ---- cozy-0.9.1--orig/cozy/ui/main_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/main_view.py 2021-04-19 01:31:38.653518840 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py +--- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 @@ -1,7 +1,7 @@ import webbrowser @@ -325,9 +353,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/main_view.py cozy-0.9.1--patched/cozy/ui/m from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui/search_view.py ---- cozy-0.9.1--orig/cozy/ui/search_view.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/search_view.py 2021-04-19 01:31:38.643518819 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/search_view.py +--- cozy-1.0.1--orig/cozy/ui/search_view.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/search_view.py 2021-05-30 11:14:55.827892259 +0200 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -338,9 +366,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/search_view.py cozy-0.9.1--patched/cozy/ui import gi -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/settings.py ---- cozy-0.9.1--orig/cozy/ui/settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/settings.py 2021-04-19 01:31:38.625518783 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py +--- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200 @@ -4,9 +4,9 @@ from cozy.control.db import remove_tracks_with_path @@ -352,9 +380,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/settings.py cozy-0.9.1--patched/cozy/ui/se from cozy.ui.widgets.ScrollWrapper import ScrollWrapper from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow from cozy.view_model.settings_view_model import SettingsViewModel -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/warnings.py ---- cozy-0.9.1--orig/cozy/ui/warnings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/warnings.py 2021-04-19 01:31:38.634518801 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warnings.py +--- cozy-1.0.1--orig/cozy/ui/warnings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/warnings.py 2021-05-30 11:14:55.819892258 +0200 @@ -1,8 +1,8 @@ from gettext import gettext @@ -365,9 +393,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/warnings.py cozy-0.9.1--patched/cozy/ui/wa from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/error_reporting.py 2021-04-19 01:31:38.672518878 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py 2021-05-30 11:14:55.851892263 +0200 @@ -2,9 +2,9 @@ import gi @@ -379,9 +407,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/error_reporting.py cozy-0.9.1--pat gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-04-19 01:31:38.660518854 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 11:14:55.842892262 +0200 @@ -1,7 +1,7 @@ import gi @@ -391,9 +419,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-0.9 gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patched/cozy/ui/widgets/search_results.py ---- cozy-0.9.1--orig/cozy/ui/widgets/search_results.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/search_results.py 2021-04-19 01:31:38.656518846 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/search_results.py cozy-1.0.1--patched/cozy/ui/widgets/search_results.py +--- cozy-1.0.1--orig/cozy/ui/widgets/search_results.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/search_results.py 2021-05-30 11:14:55.839892261 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -404,9 +432,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/search_results.py cozy-0.9.1--patc MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/sleep_timer.py 2021-04-19 01:31:38.668518870 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py 2021-05-30 11:14:55.849892263 +0200 @@ -1,7 +1,7 @@ import gi @@ -416,9 +444,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/sleep_timer.py cozy-0.9.1--patched gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-04-19 01:31:38.661518856 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-1.0.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 11:14:55.843892262 +0200 @@ -6,9 +6,9 @@ import cozy.ui from cozy.control.filesystem_monitor import FilesystemMonitor @@ -430,9 +458,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-0.9.1 from cozy.model.storage_block_list import StorageBlockList log = logging.getLogger("settings") -diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/ui/widgets/whats_new_window.py 2021-04-19 01:31:38.677518888 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py 2021-05-30 11:14:55.855892264 +0200 @@ -3,9 +3,9 @@ import gi @@ -444,9 +472,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/ui/widgets/whats_new_window.py cozy-0.9.1--pa from cozy.version import __version__ as CozyVersion gi.require_version('Gtk', '3.0') -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/book_detail_view_model.py 2021-04-19 01:31:38.693518921 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py 2021-05-30 11:14:55.867892266 +0200 @@ -5,9 +5,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -458,9 +486,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/book_detail_view_model.py cozy-0.9 from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/headerbar_view_model.py 2021-04-19 01:31:38.689518912 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py 2021-05-30 11:14:55.864892266 +0200 @@ -2,9 +2,9 @@ from cozy.architecture.event_sender import EventSender @@ -472,9 +500,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/headerbar_view_model.py cozy-0.9.1 from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1--patched/cozy/view_model/library_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/library_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/library_view_model.py 2021-04-19 01:31:38.694518923 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200 @@ -2,9 +2,9 @@ import os from enum import Enum, auto @@ -486,9 +514,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/library_view_model.py cozy-0.9.1-- from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/playback_control_view_model.py 2021-04-19 01:31:38.687518908 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py 2021-05-30 11:14:55.863892265 +0200 @@ -1,9 +1,9 @@ from typing import Optional @@ -500,9 +528,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_control_view_model.py coz from cozy.model.book import Book from cozy.open_view import OpenView -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/playback_speed_view_model.py 2021-04-19 01:31:38.682518898 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py 2021-05-30 11:14:55.859892265 +0200 @@ -1,8 +1,8 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -513,9 +541,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/playback_speed_view_model.py cozy- class PlaybackSpeedViewModel(Observable, EventSender): -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--patched/cozy/view_model/search_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/search_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/search_view_model.py 2021-04-19 01:31:38.686518906 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patched/cozy/view_model/search_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/search_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/search_view_model.py 2021-05-30 11:14:55.862892265 +0200 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -523,9 +551,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/search_view_model.py cozy-0.9.1--p from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1--patched/cozy/view_model/settings_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/settings_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/settings_view_model.py 2021-04-19 01:31:38.684518902 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/settings_view_model.py cozy-1.0.1--patched/cozy/view_model/settings_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/settings_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/settings_view_model.py 2021-05-30 11:14:55.860892265 +0200 @@ -1,6 +1,6 @@ from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -534,9 +562,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/settings_view_model.py cozy-0.9.1- from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-04-19 01:31:38.680518894 +0200 +diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-05-30 11:14:55.858892265 +0200 @@ -5,9 +5,9 @@ from cozy import tools @@ -548,9 +576,9 @@ diff -U4 -rN cozy-0.9.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-0.9 from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patched/test/cozy/media/test_importer.py ---- cozy-0.9.1--orig/test/cozy/media/test_importer.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/media/test_importer.py 2021-04-19 01:31:38.756519048 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_importer.py cozy-1.0.1--patched/test/cozy/media/test_importer.py +--- cozy-1.0.1--orig/test/cozy/media/test_importer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/media/test_importer.py 2021-05-30 11:14:55.922892276 +0200 @@ -2,9 +2,9 @@ import pytest @@ -562,9 +590,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_importer.py cozy-0.9.1--patch from cozy.model.library import Library -diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched/test/cozy/media/test_player.py ---- cozy-0.9.1--orig/test/cozy/media/test_player.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/media/test_player.py 2021-04-19 01:31:38.761519058 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_player.py cozy-1.0.1--patched/test/cozy/media/test_player.py +--- cozy-1.0.1--orig/test/cozy/media/test_player.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/media/test_player.py 2021-05-30 11:14:55.926892276 +0200 @@ -3,9 +3,9 @@ import pytest from peewee import SqliteDatabase @@ -576,9 +604,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/media/test_player.py cozy-0.9.1--patched from cozy.model.library import Library from cozy.model.settings import Settings -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1--patched/test/cozy/model/storage_block_list.py ---- cozy-0.9.1--orig/test/cozy/model/storage_block_list.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/storage_block_list.py 2021-04-19 01:31:38.776519088 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/model/storage_block_list.py cozy-1.0.1--patched/test/cozy/model/storage_block_list.py +--- cozy-1.0.1--orig/test/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/model/storage_block_list.py 2021-05-30 11:14:55.940892279 +0200 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -589,9 +617,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/storage_block_list.py cozy-0.9.1-- @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/test/cozy/model/test_book.py ---- cozy-0.9.1--orig/test/cozy/model/test_book.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_book.py 2021-04-19 01:31:38.778519093 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_book.py cozy-1.0.1--patched/test/cozy/model/test_book.py +--- cozy-1.0.1--orig/test/cozy/model/test_book.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/model/test_book.py 2021-05-30 11:14:55.942892280 +0200 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -603,9 +631,22 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_book.py cozy-0.9.1--patched/t @pytest.fixture(autouse=True) -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patched/test/cozy/model/test_library.py ---- cozy-0.9.1--orig/test/cozy/model/test_library.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_library.py 2021-04-19 01:31:38.775519087 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_database_importer.py cozy-1.0.1--patched/test/cozy/model/test_database_importer.py +--- cozy-1.0.1--orig/test/cozy/model/test_database_importer.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/model/test_database_importer.py 2021-05-30 11:14:55.934892278 +0200 +@@ -1,8 +1,8 @@ + import pytest + from peewee import SqliteDatabase + +-from cozy.ext import inject ++import inject + + + @pytest.fixture(autouse=True) + def setup_inject(peewee_database): +diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_library.py cozy-1.0.1--patched/test/cozy/model/test_library.py +--- cozy-1.0.1--orig/test/cozy/model/test_library.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/model/test_library.py 2021-05-30 11:14:55.939892279 +0200 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -617,9 +658,9 @@ diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_library.py cozy-0.9.1--patche from cozy.model.settings import Settings from test.cozy.mocks import ApplicationSettingsMock -diff -U4 -rN cozy-0.9.1--orig/test/cozy/model/test_settings.py cozy-0.9.1--patched/test/cozy/model/test_settings.py ---- cozy-0.9.1--orig/test/cozy/model/test_settings.py 2021-04-18 22:50:27.000000000 +0200 -+++ cozy-0.9.1--patched/test/cozy/model/test_settings.py 2021-04-19 01:31:38.771519079 +0200 +diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_settings.py cozy-1.0.1--patched/test/cozy/model/test_settings.py +--- cozy-1.0.1--orig/test/cozy/model/test_settings.py 2021-05-30 10:34:51.000000000 +0200 ++++ cozy-1.0.1--patched/test/cozy/model/test_settings.py 2021-05-30 11:14:55.936892278 +0200 @@ -1,7 +1,7 @@ import pytest diff --git a/cozy.spec b/cozy.spec index be22361..a6c6ef6 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 0.9.5 +Version: 1.0.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -141,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun May 30 2021 Artur Frenszek-Iwicki - 1.0.1-1 +- Update to v1.0.1 + * Mon May 10 2021 Artur Frenszek-Iwicki - 0.9.5-1 - Update to latest release diff --git a/sources b/sources index 8957c41..5374030 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-0.9.5.tar.gz) = 70ef0dae1623af1bed8aa1aa6f3e70a81e985cf64b238b1cd430f46cc989859bed6961e5688c78a4f3a3fe23ad9caa0d5091104bd1f56fa4747089f3920b4015 +SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5 From a394b15cbd3de7eb4c49445f8d57cd0815a56b67 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:02:14 +0200 Subject: [PATCH 10/41] Rebuilt for Python 3.10 --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index a6c6ef6..585b4e7 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -141,6 +141,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Jun 04 2021 Python Maint - 1.0.1-2 +- Rebuilt for Python 3.10 + * Sun May 30 2021 Artur Frenszek-Iwicki - 1.0.1-1 - Update to v1.0.1 From 0a5812e6fec05a599073c9ceae878785c9e43c39 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 17 Jun 2021 02:09:53 +0200 Subject: [PATCH 11/41] Update to v1.0.3 --- .gitignore | 1 + cozy--unbundle-inject.patch | 42 ++++++++++++++++++------------------- cozy.spec | 8 +++++-- sources | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index b3740d3..ea4fca9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cozy-0.9.4.tar.gz /cozy-0.9.5.tar.gz /cozy-1.0.1.tar.gz +/cozy-1.0.3.tar.gz diff --git a/cozy--unbundle-inject.patch b/cozy--unbundle-inject.patch index dd5b375..d658209 100644 --- a/cozy--unbundle-inject.patch +++ b/cozy--unbundle-inject.patch @@ -37,20 +37,6 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/coz from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -rU4 cozy-1.0.1--orig/cozy/control/db.py cozy-1.0.1--patched/cozy/control/db.py ---- cozy-1.0.1--orig/cozy/control/db.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/db.py 2021-05-30 11:14:55.786892252 +0200 -@@ -1,9 +1,9 @@ - import logging - import os - import time - --import cozy.ext.inject as inject -+import inject - - from cozy.control.db_updater import update_db - from cozy.db.artwork_cache import ArtworkCache - from cozy.db.book import Book diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patched/cozy/control/filesystem_monitor.py --- cozy-1.0.1--orig/cozy/control/filesystem_monitor.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/control/filesystem_monitor.py 2021-05-30 11:14:55.780892251 +0200 @@ -92,9 +78,8 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter -diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/files.py ---- cozy-1.0.1--orig/cozy/media/files.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/media/files.py 2021-05-30 11:14:55.798892254 +0200 +--- cozy-1.0.3--orig/cozy/media/files.py 2021-06-04 19:08:29.000000000 +0200 ++++ cozy-1.0.3--patched/cozy/media/files.py 2021-06-14 13:48:39.526393674 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -105,7 +90,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/files.py cozy-1.0.1--patched/cozy/media/fi from cozy.media.importer import Importer from cozy.model.settings import Settings from cozy.report import reporter - + from cozy.ui.info_banner import InfoBanner diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py --- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200 @@ -146,7 +131,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/boo +import inject from cozy.model.chapter import Chapter from cozy.model.settings import Settings - from cozy.model.track import Track + from cozy.model.track import Track, TrackInconsistentData diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/cozy/model/database_importer.py --- cozy-1.0.1--orig/cozy/model/database_importer.py 2021-05-30 10:34:51.000000000 +0200 @@ -166,10 +151,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/ --- cozy-1.0.1--orig/cozy/model/library.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/model/library.py 2021-05-30 11:14:55.893892271 +0200 @@ -5,9 +5,9 @@ - from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing from cozy.db.book import Book as BookModel + from cozy.db.file import File -from cozy.ext import inject +import inject from cozy.extensions.set import split_strings_to_set @@ -327,6 +312,19 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState +--- cozy-1.0.3--orig/cozy/ui/info_banner.py 2021-06-04 19:08:29.000000000 +0200 ++++ cozy-1.0.3--patched/cozy/ui/info_banner.py 2021-06-14 13:50:16.042218527 +0200 +@@ -3,9 +3,9 @@ + gi.require_version('Granite', '1.0') + + from gi.repository import Gtk, Granite + +-from cozy.ext import inject ++import inject + + + class InfoBanner: + _builder: Gtk.Builder = inject.attr("MainWindowBuilder") diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py --- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 @@ -369,9 +367,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/se diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py --- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200 -@@ -4,9 +4,9 @@ +@@ -2,9 +2,9 @@ + import gi - from cozy.control.db import remove_tracks_with_path from cozy.db.storage import Storage from cozy.db.storage_blacklist import StorageBlackList -from cozy.ext import inject diff --git a/cozy.spec b/cozy.spec index 585b4e7..a2ab717 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,8 +4,8 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -18,6 +18,7 @@ BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: glib2-devel +BuildRequires: granite-devel BuildRequires: gtk3-devel >= 3.22 BuildRequires: libappstream-glib BuildRequires: libhandy1-devel >= 1.0.0 @@ -141,6 +142,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Thu Jun 17 2021 Artur Frenszek-Iwicki - 1.0.3-1 +- Update to v1.0.3 + * Fri Jun 04 2021 Python Maint - 1.0.1-2 - Rebuilt for Python 3.10 diff --git a/sources b/sources index 5374030..2949c31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5 +SHA512 (cozy-1.0.3.tar.gz) = 5bc3b6e211af61021432619dcbcd3556209d2c595d5227c940b71f90986ce97f0d944212732460fecaa10108e3b9e32c881a3bb95f8e80cc33717d811328952f From 769eaccef113b8775e02600f12a1536ca8b441d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 15:07:18 +0000 Subject: [PATCH 12/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f3ea7a84f043141577a5c995fe9026270e5ceb01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:03:05 +0000 Subject: [PATCH 13/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index a2ab717..3a2cadd 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -142,6 +142,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 17 2021 Artur Frenszek-Iwicki - 1.0.3-1 - Update to v1.0.3 From 15e57194687696231467ba2ce8a4b1feb01f8610 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Thu, 29 Jul 2021 10:25:06 +0200 Subject: [PATCH 14/41] Update to v1.0.4 --- .gitignore | 1 + cozy.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ea4fca9..8ba903c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cozy-0.9.5.tar.gz /cozy-1.0.1.tar.gz /cozy-1.0.3.tar.gz +/cozy-1.0.4.tar.gz diff --git a/cozy.spec b/cozy.spec index 3a2cadd..9591ff7 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,8 +4,8 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.3 -Release: 2%{?dist} +Version: 1.0.4 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -92,7 +92,7 @@ Here are some of the current features: rm -rf cozy/ext/inject # Run the "find unpatched imports" script -%{SOURCE99} $(pwd) +"%{SOURCE99}" "$(pwd)" # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation @@ -142,6 +142,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Thu Jul 29 2021 Artur Frenszek-Iwicki - 1.0.4-1 +- Update to v1.0.4 + * Wed Jul 21 2021 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2949c31..6dfaada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.3.tar.gz) = 5bc3b6e211af61021432619dcbcd3556209d2c595d5227c940b71f90986ce97f0d944212732460fecaa10108e3b9e32c881a3bb95f8e80cc33717d811328952f +SHA512 (cozy-1.0.4.tar.gz) = 86a19d48b69d45eb9ff80c9fc95828c7b953fdb3d95a2d5c535173853a44511aac0548d7a34ec0a560c5849606fa71d37dd25d51a45e17f64dbd77a7ee941a9a From 94829d944d5e66ff70b89693da96cbf8d47442ef Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Mon, 9 Aug 2021 12:01:27 +0200 Subject: [PATCH 15/41] Update to v1.1.0 --- .gitignore | 1 + ...nject.patch => 0000--unbundle-inject.patch | 111 +++++++++++------- 0001--fix-POTFILES.patch | 12 ++ cozy.spec | 13 +- sources | 2 +- 5 files changed, 94 insertions(+), 45 deletions(-) rename cozy--unbundle-inject.patch => 0000--unbundle-inject.patch (90%) create mode 100644 0001--fix-POTFILES.patch diff --git a/.gitignore b/.gitignore index 8ba903c..fc8ba70 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cozy-1.0.1.tar.gz /cozy-1.0.3.tar.gz /cozy-1.0.4.tar.gz +/cozy-1.1.0.tar.gz diff --git a/cozy--unbundle-inject.patch b/0000--unbundle-inject.patch similarity index 90% rename from cozy--unbundle-inject.patch rename to 0000--unbundle-inject.patch index d658209..10622e4 100644 --- a/cozy--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -217,24 +217,22 @@ diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/coz from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -rU4 cozy-1.0.1--orig/cozy/ui/album_element.py cozy-1.0.1--patched/cozy/ui/album_element.py ---- cozy-1.0.1--orig/cozy/ui/album_element.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/album_element.py 2021-05-30 11:14:55.823892259 +0200 -@@ -2,9 +2,9 @@ +diff -rU4 cozy-1.1.0--orig/cozy/ui/app_view.py cozy-1.1.0--patched/cozy/ui/app_view.py +--- cozy-1.1.0--orig/cozy/ui/app_view.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/app_view.py 2021-08-09 11:51:55.741980422 +0200 +@@ -1,7 +1,7 @@ + from gi.repository import Gtk, Handy - from gi.repository import Gtk, Gdk, GdkPixbuf, GObject - - from cozy.control.artwork_cache import ArtworkCache -from cozy.ext import inject +import inject - from cozy.model.book import Book + from cozy.view_model.app_view_model import AppViewModel + from cozy.view import View - log = logging.getLogger("album_element") - -diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ui/book_detail_view.py ---- cozy-1.0.1--orig/cozy/ui/book_detail_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/book_detail_view.py 2021-05-30 11:14:55.831892260 +0200 -@@ -3,9 +3,9 @@ + LIBRARY = "main" +diff -rU4 cozy-1.1.0--orig/cozy/ui/book_detail_view.py cozy-1.1.0--patched/cozy/ui/book_detail_view.py +--- cozy-1.1.0--orig/cozy/ui/book_detail_view.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/book_detail_view.py 2021-08-09 11:45:43.895311019 +0200 +@@ -5,9 +5,9 @@ import gi @@ -244,20 +242,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/book_detail_view.py cozy-1.0.1--patched/cozy/ from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.report import reporter - from cozy.ui.disk_element import DiskElement -diff -rU4 cozy-1.0.1--orig/cozy/ui/book_element.py cozy-1.0.1--patched/cozy/ui/book_element.py ---- cozy-1.0.1--orig/cozy/ui/book_element.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/book_element.py 2021-05-30 11:14:55.813892257 +0200 -@@ -1,8 +1,8 @@ - import os - import subprocess - --import cozy.ext.inject as inject -+import inject - from gi.repository import Gtk, Gdk, Pango, GObject - - import cozy.tools as tools - import cozy.ui + from cozy.ui.chapter_element import ChapterElement diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py --- cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py 2021-05-30 11:14:55.820892258 +0200 @@ -302,16 +287,16 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head --- cozy-1.0.1--orig/cozy/ui/headerbar.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/headerbar.py 2021-05-30 11:14:55.816892257 +0200 @@ -3,9 +3,9 @@ + import logging + import gi - from cozy.control.artwork_cache import ArtworkCache - from cozy.db.book import Book -from cozy.ext import inject +import inject - from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover - from cozy.ui.widgets.seek_bar import SeekBar - from cozy.ui.widgets.sleep_timer import SleepTimer + from cozy.ui.widgets.progress_popover import ProgressPopover from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState + + gi.require_version('Gtk', '3.0') --- cozy-1.0.3--orig/cozy/ui/info_banner.py 2021-06-04 19:08:29.000000000 +0200 +++ cozy-1.0.3--patched/cozy/ui/info_banner.py 2021-06-14 13:50:16.042218527 +0200 @@ -3,9 +3,9 @@ @@ -325,20 +310,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head class InfoBanner: _builder: Gtk.Builder = inject.attr("MainWindowBuilder") -diff -rU4 cozy-1.0.1--orig/cozy/ui/library_view.py cozy-1.0.1--patched/cozy/ui/library_view.py ---- cozy-1.0.1--orig/cozy/ui/library_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/library_view.py 2021-05-30 11:14:55.826892259 +0200 +diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/library_view.py +--- cozy-1.1.0--orig/cozy/ui/library_view.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/library_view.py 2021-08-09 11:44:00.084565772 +0200 @@ -2,9 +2,9 @@ - from gi.repository import Gtk + from gi.repository import Gtk, Handy from gi.repository.Gtk import Builder -from cozy.ext import inject +import inject - from cozy.model.book import Book - from cozy.ui.book_element import BookElement + from cozy.ui.widgets.book_element import BookElement from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox + from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py --- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 @@ -351,6 +336,34 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main from cozy.architecture.event_sender import EventSender from cozy.control.db import books, close_db +diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/cozy/ui/media_controller_big.py +--- cozy-1.1.0--orig/cozy/ui/media_controller_big.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/media_controller_big.py 2021-08-09 11:53:21.875598752 +0200 +@@ -3,9 +3,9 @@ + import gi + + from cozy.control.artwork_cache import ArtworkCache + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover + from cozy.ui.widgets.seek_bar import SeekBar + from cozy.ui.widgets.sleep_timer import SleepTimer + from cozy.view_model.playback_control_view_model import PlaybackControlViewModel +diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched/cozy/ui/media_controller_small.py +--- cozy-1.1.0--orig/cozy/ui/media_controller_small.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/media_controller_small.py 2021-08-09 11:54:54.115260921 +0200 +@@ -3,9 +3,9 @@ + import gi + + from cozy.control.artwork_cache import ArtworkCache + from cozy.db.book import Book +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover + from cozy.view_model.playback_control_view_model import PlaybackControlViewModel + + gi.require_version('Gtk', '3.0') diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/search_view.py --- cozy-1.0.1--orig/cozy/ui/search_view.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/search_view.py 2021-05-30 11:14:55.827892259 +0200 @@ -391,6 +404,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warni from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') +diff -rU4 cozy-1.1.0--orig/cozy/ui/widgets/album_element.py cozy-1.1.0--patched/cozy/ui/widgets/album_element.py +--- cozy-1.1.0--orig/cozy/ui/widgets/album_element.py 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/cozy/ui/widgets/album_element.py 2021-08-09 11:49:54.163107640 +0200 +@@ -5,9 +5,9 @@ + + from cozy.control.artwork_cache import ArtworkCache + from cozy.extensions.gtk_widget import set_hand_cursor, reset_cursor + from cozy.model.book import Book +-from cozy.ext import inject ++import inject + + from gi.repository import Gtk, GObject, Gdk + + ALBUM_ART_SIZE = 200 diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py --- cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py 2021-05-30 11:14:55.851892263 +0200 @@ -497,15 +524,15 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--p from cozy.media.files import Files from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library - + from cozy.open_view import OpenView diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py --- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200 @@ -2,9 +2,9 @@ - import os - from enum import Enum, auto from typing import Optional + from gi.repository import Gtk + -import cozy.ext.inject as inject +import inject from cozy.application_settings import ApplicationSettings diff --git a/0001--fix-POTFILES.patch b/0001--fix-POTFILES.patch new file mode 100644 index 0000000..388979b --- /dev/null +++ b/0001--fix-POTFILES.patch @@ -0,0 +1,12 @@ +--- cozy-1.1.0--orig/po/POTFILES 2021-08-07 09:44:45.000000000 +0200 ++++ cozy-1.1.0--patched/po/POTFILES 2021-08-09 11:57:42.821473549 +0200 +@@ -4,9 +4,8 @@ + cozy/media/files.py + cozy/model/track.py + cozy/tools.py + cozy/ui/book_detail_view.py +-cozy/ui/book_element.py + cozy/ui/chapter_element.py + cozy/ui/disk_element.py + cozy/ui/file_not_found_dialog.py + cozy/ui/main_view.py diff --git a/cozy.spec b/cozy.spec index 9591ff7..04e7477 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.4 +Version: 1.1.0 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -12,7 +12,10 @@ Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}. Source99: find-unpatched-imports.sh -Patch0: %{name}--unbundle-inject.patch +# Unbundle python-inject +Patch0: 0000--unbundle-inject.patch +# The list of files to translate references a non-existent file +Patch1: 0001--fix-POTFILES.patch BuildArch: noarch @@ -94,6 +97,9 @@ rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" +# Apply other patches +%patch1 -p1 + # Add a nonsensical

tag at the beginning of for every # in the appdata XML - needed to pass validation xmlstarlet ed \ @@ -142,6 +148,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Mon Aug 09 2021 Artur Frenszek-Iwicki - 1.1.0-1 +- Update to v1.1.0 + * Thu Jul 29 2021 Artur Frenszek-Iwicki - 1.0.4-1 - Update to v1.0.4 diff --git a/sources b/sources index 6dfaada..319e655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.4.tar.gz) = 86a19d48b69d45eb9ff80c9fc95828c7b953fdb3d95a2d5c535173853a44511aac0548d7a34ec0a560c5849606fa71d37dd25d51a45e17f64dbd77a7ee941a9a +SHA512 (cozy-1.1.0.tar.gz) = d79db2e27bf7c3dbd030be5dbb6c2f7efb1dfdd0a13b486ade9353d71e787f52591a196e2c7fdee37d3d6c9765e1c51300dd471d04fb55d27ae02f5d9118a235 From 4abcc93867884fa5a315ef9983a0c37a37b12257 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 20 Aug 2021 13:08:45 +0200 Subject: [PATCH 16/41] Update to v1.1.1 --- .gitignore | 1 + 0000--unbundle-inject.patch | 16 +++++++++------- 0001--fix-POTFILES.patch | 12 ------------ cozy.spec | 21 ++++++--------------- sources | 2 +- 5 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 0001--fix-POTFILES.patch diff --git a/.gitignore b/.gitignore index fc8ba70..f5557a9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cozy-1.0.3.tar.gz /cozy-1.0.4.tar.gz /cozy-1.1.0.tar.gz +/cozy-1.1.1.tar.gz diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index 10622e4..1ee8c36 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -324,18 +324,20 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/l from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage -diff -rU4 cozy-1.0.1--orig/cozy/ui/main_view.py cozy-1.0.1--patched/cozy/ui/main_view.py ---- cozy-1.0.1--orig/cozy/ui/main_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/main_view.py 2021-05-30 11:14:55.835892261 +0200 -@@ -1,7 +1,7 @@ - import webbrowser +diff -rU4 cozy-1.1.1--orig/cozy/ui/main_view.py cozy-1.1.1--patched/cozy/ui/main_view.py +--- cozy-1.1.1--orig/cozy/ui/main_view.py 2021-08-20 12:43:14.000000000 +0200 ++++ cozy-1.1.1--patched/cozy/ui/main_view.py 2021-08-20 13:03:43.707422125 +0200 +@@ -5,9 +5,9 @@ + from gi.repository import Gtk, Gio, Gdk, GLib + + import cozy.control.filesystem_monitor as fs_monitor -import cozy.ext.inject as inject +import inject + import cozy.report.reporter as report from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender - - from cozy.control.db import books, close_db + from cozy.architecture.singleton import Singleton diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/cozy/ui/media_controller_big.py --- cozy-1.1.0--orig/cozy/ui/media_controller_big.py 2021-08-07 09:44:45.000000000 +0200 +++ cozy-1.1.0--patched/cozy/ui/media_controller_big.py 2021-08-09 11:53:21.875598752 +0200 diff --git a/0001--fix-POTFILES.patch b/0001--fix-POTFILES.patch deleted file mode 100644 index 388979b..0000000 --- a/0001--fix-POTFILES.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cozy-1.1.0--orig/po/POTFILES 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/po/POTFILES 2021-08-09 11:57:42.821473549 +0200 -@@ -4,9 +4,8 @@ - cozy/media/files.py - cozy/model/track.py - cozy/tools.py - cozy/ui/book_detail_view.py --cozy/ui/book_element.py - cozy/ui/chapter_element.py - cozy/ui/disk_element.py - cozy/ui/file_not_found_dialog.py - cozy/ui/main_view.py diff --git a/cozy.spec b/cozy.spec index 04e7477..35d389b 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -14,8 +14,6 @@ Source99: find-unpatched-imports.sh # Unbundle python-inject Patch0: 0000--unbundle-inject.patch -# The list of files to translate references a non-existent file -Patch1: 0001--fix-POTFILES.patch BuildArch: noarch @@ -27,7 +25,6 @@ BuildRequires: libappstream-glib BuildRequires: libhandy1-devel >= 1.0.0 BuildRequires: meson >= 0.40.0 BuildRequires: python3-devel -BuildRequires: xmlstarlet %global with_tests 1 @@ -97,17 +94,6 @@ rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" -# Apply other patches -%patch1 -p1 - -# Add a nonsensical

tag at the beginning of for every -# in the appdata XML - needed to pass validation -xmlstarlet ed \ - --insert component/releases/release/description/ul \ - --type elem -n p -v 'List of changes:' \ - < "data/%{rtld_name}.appdata.xml" > appdata.patched -mv ./appdata.patched "data/%{rtld_name}.appdata.xml" - %build %meson @@ -148,6 +134,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Aug 20 2021 Artur Frenszek-Iwicki - 1.1.1-1 +- Update to v1.1.1 +- Drop Patch1 (POTFILES references non-existent file - fixed upsteam) +- Don't modify the appdata file in %%prep - no longer needed to pass validation + * Mon Aug 09 2021 Artur Frenszek-Iwicki - 1.1.0-1 - Update to v1.1.0 diff --git a/sources b/sources index 319e655..9e8c3f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.0.tar.gz) = d79db2e27bf7c3dbd030be5dbb6c2f7efb1dfdd0a13b486ade9353d71e787f52591a196e2c7fdee37d3d6c9765e1c51300dd471d04fb55d27ae02f5d9118a235 +SHA512 (cozy-1.1.1.tar.gz) = 21333839e8567e5bfbe1720a286ec3ca467e4f483711017911b52529f457540d5384a7323c20dad0b66d1af08a9c687a5799baa55066f3c439c1b07306d40c23 From 455e496f08064edbf2933247eba01c977faab5aa Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 20 Aug 2021 14:41:11 +0200 Subject: [PATCH 17/41] Update to v1.1.2 --- .gitignore | 1 + cozy.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5557a9..8cb8f06 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cozy-1.0.4.tar.gz /cozy-1.1.0.tar.gz /cozy-1.1.1.tar.gz +/cozy-1.1.2.tar.gz diff --git a/cozy.spec b/cozy.spec index 35d389b..9e414cc 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -134,6 +134,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Aug 20 2021 Artur Frenszek-Iwicki - 1.1.2-1 +- Update to v1.1.2 + * Fri Aug 20 2021 Artur Frenszek-Iwicki - 1.1.1-1 - Update to v1.1.1 - Drop Patch1 (POTFILES references non-existent file - fixed upsteam) diff --git a/sources b/sources index 9e8c3f8..207f734 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.1.tar.gz) = 21333839e8567e5bfbe1720a286ec3ca467e4f483711017911b52529f457540d5384a7323c20dad0b66d1af08a9c687a5799baa55066f3c439c1b07306d40c23 +SHA512 (cozy-1.1.2.tar.gz) = b6db98aca5b3d6b64efd730701e5a95fba0281db55dcfc0e0c538d9004626cace858979bb87ecd89db47a632187905a2f288b7dc9fffb067f2ba429e8ba827f6 From 57f5ca812d4eb3d24fa202baa397a8d8f26a5c96 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 11 Oct 2021 19:56:21 -0400 Subject: [PATCH 18/41] Add missing dependencies to fix launching the app Resolves: #2013040, #2013041, #2013042 --- cozy.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 9e414cc..4e25590 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -45,6 +45,9 @@ BuildRequires: python3dist(requests) Requires: file Requires: glib2 +Requires: granite +Requires: libdazzle +Requires: libhandy Requires: gstreamer1-plugins-bad-free Requires: gstreamer1-plugins-good Requires: gstreamer1-plugins-ugly-free @@ -134,6 +137,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Mon Oct 11 2021 Neal Gompa - 1.1.2-2 +- Add missing dependencies to fix launching the app + Resolves: #2013040, #2013041, #2013042 + * Fri Aug 20 2021 Artur Frenszek-Iwicki - 1.1.2-1 - Update to v1.1.2 From de0b4ac31cd62223bc6aac1e62dee4dca6afcad7 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Fri, 31 Dec 2021 13:45:00 +0100 Subject: [PATCH 19/41] Update to v1.1.3 --- .gitignore | 1 + cozy.spec | 27 ++++++++++++++++++--------- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8cb8f06..df8b90f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cozy-1.1.0.tar.gz /cozy-1.1.1.tar.gz /cozy-1.1.2.tar.gz +/cozy-1.1.3.tar.gz diff --git a/cozy.spec b/cozy.spec index 4e25590..16b1791 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,8 +4,8 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.2 -Release: 2%{?dist} +Version: 1.1.3 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -17,13 +17,19 @@ Patch0: 0000--unbundle-inject.patch BuildArch: noarch +%global req_dazzle 3.34.0 +%global req_granite 5.3.0 +%global req_gtk3 3.22 +%global req_handy 1.0.0 +%global req_meson 0.4.0 + BuildRequires: desktop-file-utils BuildRequires: glib2-devel -BuildRequires: granite-devel -BuildRequires: gtk3-devel >= 3.22 +BuildRequires: granite-devel >= %{req_granite} +BuildRequires: gtk3-devel >= %{req_gtk3} BuildRequires: libappstream-glib -BuildRequires: libhandy1-devel >= 1.0.0 -BuildRequires: meson >= 0.40.0 +BuildRequires: libhandy1-devel >= %{req_handy} +BuildRequires: meson >= %{req_meson} BuildRequires: python3-devel %global with_tests 1 @@ -45,9 +51,9 @@ BuildRequires: python3dist(requests) Requires: file Requires: glib2 -Requires: granite -Requires: libdazzle -Requires: libhandy +Requires: granite >= %{req_granite} +Requires: libdazzle >= %{req_dazzle} +Requires: libhandy >= %{req_handy} Requires: gstreamer1-plugins-bad-free Requires: gstreamer1-plugins-good Requires: gstreamer1-plugins-ugly-free @@ -137,6 +143,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Dec 31 2021 Artur Frenszek-Iwicki - 1.1.3-1 +- Update to v1.1.3 + * Mon Oct 11 2021 Neal Gompa - 1.1.2-2 - Add missing dependencies to fix launching the app Resolves: #2013040, #2013041, #2013042 diff --git a/sources b/sources index 207f734..f7c2f30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.2.tar.gz) = b6db98aca5b3d6b64efd730701e5a95fba0281db55dcfc0e0c538d9004626cace858979bb87ecd89db47a632187905a2f288b7dc9fffb067f2ba429e8ba827f6 +SHA512 (cozy-1.1.3.tar.gz) = 610c4110a826cd7475830817b06e122a21be55d0a54f774b3ddc1641587b5a126173f448820e3e89bdd9f43ff9c9d720889ec95b5728dd7ab2aea604a4e358ee From 7453be3468f8b9cb2757a813e146fa0ff6d0c531 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 9 Jan 2022 00:02:00 +0100 Subject: [PATCH 20/41] Update to v1.2.0 --- .gitignore | 1 + 0000--unbundle-inject.patch | 83 ++++++++++++++++--------------------- cozy.spec | 5 ++- sources | 2 +- 4 files changed, 42 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index df8b90f..aed4845 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /cozy-1.1.1.tar.gz /cozy-1.1.2.tar.gz /cozy-1.1.3.tar.gz +/cozy-1.2.0.tar.gz diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index 1ee8c36..05dca35 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -64,9 +64,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/contro from cozy.model.book import Book from cozy.report import reporter -diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/cozy/control/offline_cache.py ---- cozy-1.0.1--orig/cozy/control/offline_cache.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/offline_cache.py 2021-05-30 11:14:55.793892253 +0200 +diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/cozy/control/offline_cache.py +--- cozy-1.2.0--orig/cozy/control/offline_cache.py 2022-01-08 18:02:56.000000000 +0100 ++++ cozy-1.2.0--patched/cozy/control/offline_cache.py 2022-01-08 23:55:05.338643169 +0100 @@ -12,9 +12,9 @@ from cozy.db.file import File @@ -77,7 +77,7 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/offline_cache.py cozy-1.0.1--patched/coz from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.report import reporter - + from cozy.view_model.settings_view_model import SettingsViewModel --- cozy-1.0.3--orig/cozy/media/files.py 2021-06-04 19:08:29.000000000 +0200 +++ cozy-1.0.3--patched/cozy/media/files.py 2021-06-14 13:48:39.526393674 +0200 @@ -5,9 +5,9 @@ @@ -175,20 +175,6 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -rU4 cozy-1.0.1--orig/cozy/model/storage_block_list.py cozy-1.0.1--patched/cozy/model/storage_block_list.py ---- cozy-1.0.1--orig/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/model/storage_block_list.py 2021-05-30 11:14:55.902892272 +0200 -@@ -1,9 +1,9 @@ - from peewee import SqliteDatabase - - from cozy.db.storage_blacklist import StorageBlackList - from cozy.db.track import Track as TrackModel --from cozy.ext import inject -+import inject - from cozy.model.book import Book - - - class StorageBlockList: diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_manager.py --- cozy-1.0.1--orig/cozy/power_manager.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/power_manager.py 2021-05-30 11:14:55.795892254 +0200 @@ -365,6 +351,20 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover from cozy.view_model.playback_control_view_model import PlaybackControlViewModel + gi.require_version('Gtk', '3.0') +diff -rU4 cozy-1.2.0--orig/cozy/ui/preferences_view.py cozy-1.2.0--patched/cozy/ui/preferences_view.py +--- cozy-1.2.0--orig/cozy/ui/preferences_view.py 2022-01-08 18:02:56.000000000 +0100 ++++ cozy-1.2.0--patched/cozy/ui/preferences_view.py 2022-01-08 23:57:30.067592062 +0100 +@@ -2,9 +2,9 @@ + from cozy.view_model.settings_view_model import SettingsViewModel + import gi + from gi.repository import Handy, Gio + +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.error_reporting import ErrorReporting + from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow + gi.require_version('Gtk', '3.0') diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/search_view.py --- cozy-1.0.1--orig/cozy/ui/search_view.py 2021-05-30 10:34:51.000000000 +0200 @@ -379,20 +379,6 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/se import gi -diff -rU4 cozy-1.0.1--orig/cozy/ui/settings.py cozy-1.0.1--patched/cozy/ui/settings.py ---- cozy-1.0.1--orig/cozy/ui/settings.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/settings.py 2021-05-30 11:14:55.812892257 +0200 -@@ -2,9 +2,9 @@ - import gi - - from cozy.db.storage import Storage - from cozy.db.storage_blacklist import StorageBlackList --from cozy.ext import inject -+import inject - from cozy.model.library import Library - from cozy.ui.widgets.ScrollWrapper import ScrollWrapper - from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow - from cozy.view_model.settings_view_model import SettingsViewModel diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warnings.py --- cozy-1.0.1--orig/cozy/ui/warnings.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/warnings.py 2021-05-30 11:14:55.819892258 +0200 @@ -471,20 +457,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/co gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-1.0.1--orig/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/storage_list_box_row.py 2021-05-30 11:14:55.843892262 +0200 -@@ -6,9 +6,9 @@ - import cozy.ui +diff -rU4 cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 18:02:56.000000000 +0100 ++++ cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 23:49:52.216924531 +0100 +@@ -2,9 +2,9 @@ + from threading import Thread + from cozy.control.filesystem_monitor import FilesystemMonitor - from cozy.db.storage import Storage - from cozy.model.settings import Settings + from cozy.model.storage import Storage -from cozy.ext import inject +import inject from cozy.model.library import Library - from cozy.model.storage_block_list import StorageBlockList + from cozy.model.settings import Settings + from gi.repository import Gtk, GObject - log = logging.getLogger("settings") diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py --- cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py 2021-05-30 11:14:55.855892264 +0200 @@ -578,17 +564,20 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patc from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -rU4 cozy-1.0.1--orig/cozy/view_model/settings_view_model.py cozy-1.0.1--patched/cozy/view_model/settings_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/settings_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/settings_view_model.py 2021-05-30 11:14:55.860892265 +0200 -@@ -1,6 +1,6 @@ +diff -rU4 cozy-1.2.0--orig/cozy/view_model/settings_view_model.py cozy-1.2.0--patched/cozy/view_model/settings_view_model.py +--- cozy-1.2.0--orig/cozy/view_model/settings_view_model.py 2022-01-08 18:02:56.000000000 +0100 ++++ cozy-1.2.0--patched/cozy/view_model/settings_view_model.py 2022-01-08 23:51:44.333502875 +0100 +@@ -8,9 +8,9 @@ from cozy.architecture.observable import Observable + from cozy.control.filesystem_monitor import FilesystemMonitor + from cozy.model.library import Library + from cozy.model.storage import Storage -from cozy.ext import inject +import inject from cozy.media.importer import Importer from cozy.model.settings import Settings - - + from cozy.report import reporter + from gi.repository import Gtk diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py --- cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-05-30 10:34:51.000000000 +0200 +++ cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-05-30 11:14:55.858892265 +0200 diff --git a/cozy.spec b/cozy.spec index 16b1791..1ddd6a8 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.1.3 +Version: 1.2.0 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -143,6 +143,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun Jan 09 2022 Artur Frenszek-Iwicki - 1.2.0-1 +- Update to v1.2.0 + * Fri Dec 31 2021 Artur Frenszek-Iwicki - 1.1.3-1 - Update to v1.1.3 diff --git a/sources b/sources index f7c2f30..f227ac5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.1.3.tar.gz) = 610c4110a826cd7475830817b06e122a21be55d0a54f774b3ddc1641587b5a126173f448820e3e89bdd9f43ff9c9d720889ec95b5728dd7ab2aea604a4e358ee +SHA512 (cozy-1.2.0.tar.gz) = d3eb8063be4f7d966072fb48be23bbf71ea068a6614be55ef2ce70181c8c78e6200168a1cddc41d23406a8686c1be2e7ec9197470e9e94e6c287df45990b8056 From 50c24116289911777267a6c00895e50d6d23c514 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:53:14 +0000 Subject: [PATCH 21/41] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 1ddd6a8..78a283c 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -143,6 +143,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Jan 09 2022 Artur Frenszek-Iwicki - 1.2.0-1 - Update to v1.2.0 From 4d1d9df76b792d0d46f0cb2d10186308ee508e8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:38:00 +0000 Subject: [PATCH 22/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 78a283c..90af523 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -143,6 +143,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 82f42210c6c3f83c7a12816b14c16b5aca2cf63d Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 21 Aug 2022 20:32:32 +0200 Subject: [PATCH 23/41] Update to v1.2.1 --- .gitignore | 1 + 0000--unbundle-inject.patch | 332 +++++++++++++++++++----------------- 0001-fix-appdata-file.patch | 12 ++ cozy.spec | 13 +- sources | 2 +- 5 files changed, 196 insertions(+), 164 deletions(-) create mode 100644 0001-fix-appdata-file.patch diff --git a/.gitignore b/.gitignore index aed4845..b467b57 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cozy-1.1.2.tar.gz /cozy-1.1.3.tar.gz /cozy-1.2.0.tar.gz +/cozy-1.2.1.tar.gz diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index 05dca35..816c1fe 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -rU4 cozy-1.0.1--orig/cozy/app_controller.py cozy-1.0.1--patched/cozy/app_controller.py ---- cozy-1.0.1--orig/cozy/app_controller.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/app_controller.py 2021-05-30 11:14:55.904892273 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/app_controller.py cozy-1.2.1--patched/cozy/app_controller.py +--- cozy-1.2.1--orig/cozy/app_controller.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/app_controller.py 2022-08-21 20:24:05.025489593 +0200 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/app_controller.py cozy-1.0.1--patched/cozy/app_c from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -rU4 cozy-1.0.1--orig/cozy/application_settings.py cozy-1.0.1--patched/cozy/application_settings.py ---- cozy-1.0.1--orig/cozy/application_settings.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/application_settings.py 2021-05-30 11:14:55.889892270 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/application_settings.py cozy-1.2.1--patched/cozy/application_settings.py +--- cozy-1.2.1--orig/cozy/application_settings.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/application_settings.py 2022-08-21 20:24:05.026489599 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/application_settings.py cozy-1.0.1--patched/cozy class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/cozy/control/artwork_cache.py ---- cozy-1.0.1--orig/cozy/control/artwork_cache.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/artwork_cache.py 2021-05-30 11:14:55.784892252 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/control/artwork_cache.py cozy-1.2.1--patched/cozy/control/artwork_cache.py +--- cozy-1.2.1--orig/cozy/control/artwork_cache.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/control/artwork_cache.py 2022-08-21 20:24:05.026489599 +0200 @@ -6,9 +6,9 @@ from cozy.application_settings import ApplicationSettings @@ -37,9 +37,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/artwork_cache.py cozy-1.0.1--patched/coz from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patched/cozy/control/filesystem_monitor.py ---- cozy-1.0.1--orig/cozy/control/filesystem_monitor.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/filesystem_monitor.py 2021-05-30 11:14:55.780892251 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/control/filesystem_monitor.py cozy-1.2.1--patched/cozy/control/filesystem_monitor.py +--- cozy-1.2.1--orig/cozy/control/filesystem_monitor.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/control/filesystem_monitor.py 2022-08-21 20:24:05.026489599 +0200 @@ -1,8 +1,8 @@ import logging from typing import List @@ -50,9 +50,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/filesystem_monitor.py cozy-1.0.1--patche from cozy.architecture.event_sender import EventSender from cozy.model.book import Book -diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/control/mpris.py ---- cozy-1.0.1--orig/cozy/control/mpris.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/control/mpris.py 2021-05-30 11:14:55.789892253 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/control/mpris.py cozy-1.2.1--patched/cozy/control/mpris.py +--- cozy-1.2.1--orig/cozy/control/mpris.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/control/mpris.py 2022-08-21 20:24:05.026489599 +0200 @@ -22,9 +22,9 @@ import cozy.ui @@ -64,9 +64,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/control/mpris.py cozy-1.0.1--patched/cozy/contro from cozy.model.book import Book from cozy.report import reporter -diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/cozy/control/offline_cache.py ---- cozy-1.2.0--orig/cozy/control/offline_cache.py 2022-01-08 18:02:56.000000000 +0100 -+++ cozy-1.2.0--patched/cozy/control/offline_cache.py 2022-01-08 23:55:05.338643169 +0100 +diff -U4 -r cozy-1.2.1--orig/cozy/control/offline_cache.py cozy-1.2.1--patched/cozy/control/offline_cache.py +--- cozy-1.2.1--orig/cozy/control/offline_cache.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/control/offline_cache.py 2022-08-21 20:24:05.027489605 +0200 @@ -12,9 +12,9 @@ from cozy.db.file import File @@ -78,8 +78,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.view_model.settings_view_model import SettingsViewModel ---- cozy-1.0.3--orig/cozy/media/files.py 2021-06-04 19:08:29.000000000 +0200 -+++ cozy-1.0.3--patched/cozy/media/files.py 2021-06-14 13:48:39.526393674 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/media/files.py cozy-1.2.1--patched/cozy/media/files.py +--- cozy-1.2.1--orig/cozy/media/files.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/media/files.py 2022-08-21 20:24:05.027489605 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -91,10 +92,10 @@ diff -rU4 cozy-1.2.0--orig/cozy/control/offline_cache.py cozy-1.2.0--patched/coz from cozy.model.settings import Settings from cozy.report import reporter from cozy.ui.info_banner import InfoBanner -diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media/importer.py ---- cozy-1.0.1--orig/cozy/media/importer.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/media/importer.py 2021-05-30 11:14:55.810892256 +0200 -@@ -9,9 +9,9 @@ +diff -U4 -r cozy-1.2.1--orig/cozy/media/importer.py cozy-1.2.1--patched/cozy/media/importer.py +--- cozy-1.2.1--orig/cozy/media/importer.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/media/importer.py 2022-08-21 20:24:05.027489605 +0200 +@@ -10,9 +10,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -105,10 +106,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/importer.py cozy-1.0.1--patched/cozy/media from cozy.media.media_file import MediaFile from cozy.model.database_importer import DatabaseImporter from cozy.model.library import Library -diff -rU4 cozy-1.0.1--orig/cozy/media/player.py cozy-1.0.1--patched/cozy/media/player.py ---- cozy-1.0.1--orig/cozy/media/player.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/media/player.py 2021-05-30 11:14:55.802892255 +0200 -@@ -6,9 +6,9 @@ +diff -U4 -r cozy-1.2.1--orig/cozy/media/player.py cozy-1.2.1--patched/cozy/media/player.py +--- cozy-1.2.1--orig/cozy/media/player.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/media/player.py 2022-08-21 20:24:05.027489605 +0200 +@@ -9,9 +9,9 @@ from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender @@ -119,11 +120,11 @@ diff -rU4 cozy-1.0.1--orig/cozy/media/player.py cozy-1.0.1--patched/cozy/media/p from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/book.py ---- cozy-1.0.1--orig/cozy/model/book.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/model/book.py 2021-05-30 11:14:55.901892272 +0200 -@@ -7,9 +7,9 @@ - from cozy.architecture.observable import Observable +diff -U4 -r cozy-1.2.1--orig/cozy/model/book.py cozy-1.2.1--patched/cozy/model/book.py +--- cozy-1.2.1--orig/cozy/model/book.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/model/book.py 2022-08-21 20:24:38.465691342 +0200 +@@ -10,9 +10,9 @@ + from cozy.db.collation import collate_natural from cozy.db.book import Book as BookModel from cozy.db.track import Track as TrackModel from cozy.db.track_to_file import TrackToFile @@ -133,9 +134,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/book.py cozy-1.0.1--patched/cozy/model/boo from cozy.model.settings import Settings from cozy.model.track import Track, TrackInconsistentData -diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/cozy/model/database_importer.py ---- cozy-1.0.1--orig/cozy/model/database_importer.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/model/database_importer.py 2021-05-30 11:14:55.897892271 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/model/database_importer.py cozy-1.2.1--patched/cozy/model/database_importer.py +--- cozy-1.2.1--orig/cozy/model/database_importer.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/model/database_importer.py 2022-08-21 20:24:05.028489611 +0200 @@ -6,9 +6,9 @@ from cozy.db.book import Book as BookModel from cozy.db.file import File @@ -147,10 +148,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/database_importer.py cozy-1.0.1--patched/c from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/library.py ---- cozy-1.0.1--orig/cozy/model/library.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/model/library.py 2021-05-30 11:14:55.893892271 +0200 -@@ -5,9 +5,9 @@ +diff -U4 -r cozy-1.2.1--orig/cozy/model/library.py cozy-1.2.1--patched/cozy/model/library.py +--- cozy-1.2.1--orig/cozy/model/library.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/model/library.py 2022-08-21 20:24:05.028489611 +0200 +@@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing from cozy.db.book import Book as BookModel @@ -161,9 +162,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/library.py cozy-1.0.1--patched/cozy/model/ from cozy.model.book import Book, BookIsEmpty from cozy.model.chapter import Chapter from cozy.model.settings import Settings -diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model/settings.py ---- cozy-1.0.1--orig/cozy/model/settings.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/model/settings.py 2021-05-30 11:14:55.890892270 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/model/settings.py cozy-1.2.1--patched/cozy/model/settings.py +--- cozy-1.2.1--orig/cozy/model/settings.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/model/settings.py 2022-08-21 20:24:05.028489611 +0200 @@ -2,9 +2,9 @@ from typing import List, Optional @@ -175,9 +176,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/model/settings.py cozy-1.0.1--patched/cozy/model from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_manager.py ---- cozy-1.0.1--orig/cozy/power_manager.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/power_manager.py 2021-05-30 11:14:55.795892254 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/power_manager.py cozy-1.2.1--patched/cozy/power_manager.py +--- cozy-1.2.1--orig/cozy/power_manager.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/power_manager.py 2022-08-21 20:24:05.028489611 +0200 @@ -1,9 +1,9 @@ import logging @@ -189,9 +190,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/power_manager.py cozy-1.0.1--patched/cozy/power_ log = logging.getLogger("power_mgr") -diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/cozy/report/report_to_loki.py ---- cozy-1.0.1--orig/cozy/report/report_to_loki.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/report/report_to_loki.py 2021-05-30 11:14:55.915892274 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/report/report_to_loki.py cozy-1.2.1--patched/cozy/report/report_to_loki.py +--- cozy-1.2.1--orig/cozy/report/report_to_loki.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/report/report_to_loki.py 2022-08-21 20:24:05.029489617 +0200 @@ -6,9 +6,9 @@ import distro import platform @@ -203,9 +204,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/report/report_to_loki.py cozy-1.0.1--patched/coz from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -rU4 cozy-1.1.0--orig/cozy/ui/app_view.py cozy-1.1.0--patched/cozy/ui/app_view.py ---- cozy-1.1.0--orig/cozy/ui/app_view.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/app_view.py 2021-08-09 11:51:55.741980422 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/app_view.py cozy-1.2.1--patched/cozy/ui/app_view.py +--- cozy-1.2.1--orig/cozy/ui/app_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/app_view.py 2022-08-21 20:24:05.029489617 +0200 @@ -1,7 +1,7 @@ from gi.repository import Gtk, Handy @@ -215,9 +216,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/app_view.py cozy-1.1.0--patched/cozy/ui/app_v from cozy.view import View LIBRARY = "main" -diff -rU4 cozy-1.1.0--orig/cozy/ui/book_detail_view.py cozy-1.1.0--patched/cozy/ui/book_detail_view.py ---- cozy-1.1.0--orig/cozy/ui/book_detail_view.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/book_detail_view.py 2021-08-09 11:45:43.895311019 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/book_detail_view.py cozy-1.2.1--patched/cozy/ui/book_detail_view.py +--- cozy-1.2.1--orig/cozy/ui/book_detail_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/book_detail_view.py 2022-08-21 20:24:05.029489617 +0200 @@ -5,9 +5,9 @@ import gi @@ -229,9 +230,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/book_detail_view.py cozy-1.1.0--patched/cozy/ from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.chapter_element import ChapterElement -diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py ---- cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/db_migration_failed_view.py 2021-05-30 11:14:55.820892258 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py +--- cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py 2022-08-21 20:24:05.029489617 +0200 @@ -1,9 +1,9 @@ import webbrowser @@ -243,9 +244,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.0.1--patch gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/ui/delete_book_view.py cozy-1.0.1--patched/cozy/ui/delete_book_view.py ---- cozy-1.0.1--orig/cozy/ui/delete_book_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/delete_book_view.py 2021-05-30 11:14:55.815892257 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/delete_book_view.py cozy-1.2.1--patched/cozy/ui/delete_book_view.py +--- cozy-1.2.1--orig/cozy/ui/delete_book_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/delete_book_view.py 2022-08-21 20:24:05.029489617 +0200 @@ -1,7 +1,7 @@ import gi @@ -255,9 +256,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/delete_book_view.py cozy-1.0.1--patched/cozy/ gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/file_not_found_dialog.py 2021-05-30 11:14:55.818892258 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py +--- cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py 2022-08-21 20:24:05.030489623 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk @@ -269,10 +270,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/ from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/headerbar.py ---- cozy-1.0.1--orig/cozy/ui/headerbar.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/headerbar.py 2021-05-30 11:14:55.816892257 +0200 -@@ -3,9 +3,9 @@ +diff -U4 -r cozy-1.2.1--orig/cozy/ui/headerbar.py cozy-1.2.1--patched/cozy/ui/headerbar.py +--- cozy-1.2.1--orig/cozy/ui/headerbar.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/headerbar.py 2022-08-21 20:24:05.030489623 +0200 +@@ -1,9 +1,9 @@ import logging import gi @@ -283,12 +284,13 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState gi.require_version('Gtk', '3.0') ---- cozy-1.0.3--orig/cozy/ui/info_banner.py 2021-06-04 19:08:29.000000000 +0200 -+++ cozy-1.0.3--patched/cozy/ui/info_banner.py 2021-06-14 13:50:16.042218527 +0200 -@@ -3,9 +3,9 @@ - gi.require_version('Granite', '1.0') +diff -U4 -r cozy-1.2.1--orig/cozy/ui/info_banner.py cozy-1.2.1--patched/cozy/ui/info_banner.py +--- cozy-1.2.1--orig/cozy/ui/info_banner.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/info_banner.py 2022-08-21 20:24:50.973766801 +0200 +@@ -1,9 +1,9 @@ + import gi - from gi.repository import Gtk, Granite + from gi.repository import Gtk -from cozy.ext import inject +import inject @@ -296,9 +298,17 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head class InfoBanner: _builder: Gtk.Builder = inject.attr("MainWindowBuilder") -diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/library_view.py ---- cozy-1.1.0--orig/cozy/ui/library_view.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/library_view.py 2021-08-09 11:44:00.084565772 +0200 +@@ -19,5 +19,5 @@ + self._label.set_text(message) + self._toast.set_revealed(True) + + def _on_response(self, _, __): +- self._toast.set_revealed(False) +\ No newline at end of file ++ self._toast.set_revealed(False) +diff -U4 -r cozy-1.2.1--orig/cozy/ui/library_view.py cozy-1.2.1--patched/cozy/ui/library_view.py +--- cozy-1.2.1--orig/cozy/ui/library_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/library_view.py 2022-08-21 20:24:05.030489623 +0200 @@ -2,9 +2,9 @@ from gi.repository import Gtk, Handy @@ -310,9 +320,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/library_view.py cozy-1.1.0--patched/cozy/ui/l from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage -diff -rU4 cozy-1.1.1--orig/cozy/ui/main_view.py cozy-1.1.1--patched/cozy/ui/main_view.py ---- cozy-1.1.1--orig/cozy/ui/main_view.py 2021-08-20 12:43:14.000000000 +0200 -+++ cozy-1.1.1--patched/cozy/ui/main_view.py 2021-08-20 13:03:43.707422125 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/main_view.py cozy-1.2.1--patched/cozy/ui/main_view.py +--- cozy-1.2.1--orig/cozy/ui/main_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/main_view.py 2022-08-21 20:24:05.031489629 +0200 @@ -5,9 +5,9 @@ from gi.repository import Gtk, Gio, Gdk, GLib @@ -324,9 +334,9 @@ diff -rU4 cozy-1.1.1--orig/cozy/ui/main_view.py cozy-1.1.1--patched/cozy/ui/main from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.singleton import Singleton -diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/cozy/ui/media_controller_big.py ---- cozy-1.1.0--orig/cozy/ui/media_controller_big.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/media_controller_big.py 2021-08-09 11:53:21.875598752 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_big.py cozy-1.2.1--patched/cozy/ui/media_controller_big.py +--- cozy-1.2.1--orig/cozy/ui/media_controller_big.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/media_controller_big.py 2022-08-21 20:24:05.031489629 +0200 @@ -3,9 +3,9 @@ import gi @@ -338,9 +348,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_big.py cozy-1.1.0--patched/c from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.playback_control_view_model import PlaybackControlViewModel -diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched/cozy/ui/media_controller_small.py ---- cozy-1.1.0--orig/cozy/ui/media_controller_small.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/media_controller_small.py 2021-08-09 11:54:54.115260921 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_small.py cozy-1.2.1--patched/cozy/ui/media_controller_small.py +--- cozy-1.2.1--orig/cozy/ui/media_controller_small.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/media_controller_small.py 2022-08-21 20:24:05.031489629 +0200 @@ -3,9 +3,9 @@ import gi @@ -352,9 +362,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/media_controller_small.py cozy-1.1.0--patched from cozy.view_model.playback_control_view_model import PlaybackControlViewModel gi.require_version('Gtk', '3.0') -diff -rU4 cozy-1.2.0--orig/cozy/ui/preferences_view.py cozy-1.2.0--patched/cozy/ui/preferences_view.py ---- cozy-1.2.0--orig/cozy/ui/preferences_view.py 2022-01-08 18:02:56.000000000 +0100 -+++ cozy-1.2.0--patched/cozy/ui/preferences_view.py 2022-01-08 23:57:30.067592062 +0100 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/preferences_view.py cozy-1.2.1--patched/cozy/ui/preferences_view.py +--- cozy-1.2.1--orig/cozy/ui/preferences_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/preferences_view.py 2022-08-21 20:24:05.031489629 +0200 @@ -2,9 +2,9 @@ from cozy.view_model.settings_view_model import SettingsViewModel import gi @@ -366,9 +376,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/ui/preferences_view.py cozy-1.2.0--patched/cozy/ from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow gi.require_version('Gtk', '3.0') -diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/search_view.py ---- cozy-1.0.1--orig/cozy/ui/search_view.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/search_view.py 2021-05-30 11:14:55.827892259 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/search_view.py cozy-1.2.1--patched/cozy/ui/search_view.py +--- cozy-1.2.1--orig/cozy/ui/search_view.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/search_view.py 2022-08-21 20:24:05.031489629 +0200 @@ -1,8 +1,8 @@ import threading from threading import Thread @@ -379,9 +389,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/search_view.py cozy-1.0.1--patched/cozy/ui/se import gi -diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warnings.py ---- cozy-1.0.1--orig/cozy/ui/warnings.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/warnings.py 2021-05-30 11:14:55.819892258 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/warnings.py cozy-1.2.1--patched/cozy/ui/warnings.py +--- cozy-1.2.1--orig/cozy/ui/warnings.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/warnings.py 2022-08-21 20:24:05.032489635 +0200 @@ -1,8 +1,8 @@ from gettext import gettext @@ -392,9 +402,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/warnings.py cozy-1.0.1--patched/cozy/ui/warni from cozy.control.filesystem_monitor import FilesystemMonitor gi.require_version('Gtk', '3.0') -diff -rU4 cozy-1.1.0--orig/cozy/ui/widgets/album_element.py cozy-1.1.0--patched/cozy/ui/widgets/album_element.py ---- cozy-1.1.0--orig/cozy/ui/widgets/album_element.py 2021-08-07 09:44:45.000000000 +0200 -+++ cozy-1.1.0--patched/cozy/ui/widgets/album_element.py 2021-08-09 11:49:54.163107640 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/album_element.py cozy-1.2.1--patched/cozy/ui/widgets/album_element.py +--- cozy-1.2.1--orig/cozy/ui/widgets/album_element.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/album_element.py 2022-08-21 20:24:05.032489635 +0200 @@ -5,9 +5,9 @@ from cozy.control.artwork_cache import ArtworkCache @@ -406,9 +416,9 @@ diff -rU4 cozy-1.1.0--orig/cozy/ui/widgets/album_element.py cozy-1.1.0--patched/ from gi.repository import Gtk, GObject, Gdk ALBUM_ART_SIZE = 200 -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/error_reporting.py 2021-05-30 11:14:55.851892263 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py +--- cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py 2022-08-21 20:24:05.032489635 +0200 @@ -2,9 +2,9 @@ import gi @@ -420,9 +430,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.0.1--patche gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/playback_speed_popover.py 2021-05-30 11:14:55.842892262 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 20:24:05.032489635 +0200 @@ -1,7 +1,7 @@ import gi @@ -432,9 +442,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.0.1- gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/search_results.py cozy-1.0.1--patched/cozy/ui/widgets/search_results.py ---- cozy-1.0.1--orig/cozy/ui/widgets/search_results.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/search_results.py 2021-05-30 11:14:55.839892261 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/search_results.py cozy-1.2.1--patched/cozy/ui/widgets/search_results.py +--- cozy-1.2.1--orig/cozy/ui/widgets/search_results.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/search_results.py 2022-08-21 20:24:05.033489641 +0200 @@ -1,8 +1,8 @@ from gi.repository import Gtk, Gdk import cozy.tools as tools @@ -445,9 +455,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/search_results.py cozy-1.0.1--patched MAX_BOOK_LENGTH = 80 BOOK_ICON_SIZE = 40 -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/sleep_timer.py 2021-05-30 11:14:55.849892263 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py 2022-08-21 20:24:05.033489641 +0200 @@ -1,7 +1,7 @@ import gi @@ -457,9 +467,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.0.1--patched/co gi.require_version('Gtk', '3.0') from gi.repository import Gtk -diff -rU4 cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 18:02:56.000000000 +0100 -+++ cozy-1.2.0--patched/cozy/ui/widgets/storage_list_box_row.py 2022-01-08 23:49:52.216924531 +0100 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py +--- cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 20:24:05.033489641 +0200 @@ -2,9 +2,9 @@ from threading import Thread @@ -471,9 +481,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.0--p from cozy.model.settings import Settings from gi.repository import Gtk, GObject -diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/ui/widgets/whats_new_window.py 2021-05-30 11:14:55.855892264 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py +--- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2022-08-21 20:24:05.033489641 +0200 @@ -3,9 +3,9 @@ import gi @@ -485,9 +495,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.0.1--patch from cozy.version import __version__ as CozyVersion gi.require_version('Gtk', '3.0') -diff -rU4 cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/book_detail_view_model.py 2021-05-30 11:14:55.867892266 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py 2022-08-21 20:24:05.034489647 +0200 @@ -5,9 +5,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -499,9 +509,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.0.1- from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/headerbar_view_model.py 2021-05-30 11:14:55.864892266 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py 2022-08-21 20:24:05.034489647 +0200 @@ -2,9 +2,9 @@ from cozy.architecture.event_sender import EventSender @@ -513,10 +523,10 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.0.1--p from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library from cozy.open_view import OpenView -diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--patched/cozy/view_model/library_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/library_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/library_view_model.py 2021-05-30 11:14:55.868892266 +0200 -@@ -2,9 +2,9 @@ +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/library_view_model.py cozy-1.2.1--patched/cozy/view_model/library_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/library_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/library_view_model.py 2022-08-21 20:24:05.034489647 +0200 +@@ -4,9 +4,9 @@ from typing import Optional from gi.repository import Gtk @@ -527,9 +537,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/library_view_model.py cozy-1.0.1--pat from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor -diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/playback_control_view_model.py 2021-05-30 11:14:55.863892265 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py 2022-08-21 20:24:05.034489647 +0200 @@ -1,9 +1,9 @@ from typing import Optional @@ -541,9 +551,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_control_view_model.py cozy-1 from cozy.model.book import Book from cozy.open_view import OpenView -diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/playback_speed_view_model.py 2021-05-30 11:14:55.859892265 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py 2022-08-21 20:24:05.034489647 +0200 @@ -1,8 +1,8 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -554,9 +564,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.0 class PlaybackSpeedViewModel(Observable, EventSender): -diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patched/cozy/view_model/search_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/search_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/search_view_model.py 2021-05-30 11:14:55.862892265 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/search_view_model.py cozy-1.2.1--patched/cozy/view_model/search_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/search_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/search_view_model.py 2022-08-21 20:24:05.035489653 +0200 @@ -1,5 +1,5 @@ -import cozy.ext.inject as inject +import inject @@ -564,9 +574,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/search_view_model.py cozy-1.0.1--patc from cozy.extensions.set import split_strings_to_set from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -rU4 cozy-1.2.0--orig/cozy/view_model/settings_view_model.py cozy-1.2.0--patched/cozy/view_model/settings_view_model.py ---- cozy-1.2.0--orig/cozy/view_model/settings_view_model.py 2022-01-08 18:02:56.000000000 +0100 -+++ cozy-1.2.0--patched/cozy/view_model/settings_view_model.py 2022-01-08 23:51:44.333502875 +0100 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/settings_view_model.py cozy-1.2.1--patched/cozy/view_model/settings_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/settings_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/settings_view_model.py 2022-08-21 20:24:05.035489653 +0200 @@ -8,9 +8,9 @@ from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor @@ -578,9 +588,9 @@ diff -rU4 cozy-1.2.0--orig/cozy/view_model/settings_view_model.py cozy-1.2.0--pa from cozy.model.settings import Settings from cozy.report import reporter from gi.repository import Gtk -diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/cozy/view_model/sleep_timer_view_model.py 2021-05-30 11:14:55.858892265 +0200 +diff -U4 -r cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py 2022-08-21 20:24:05.035489653 +0200 @@ -5,9 +5,9 @@ from cozy import tools @@ -592,9 +602,9 @@ diff -rU4 cozy-1.0.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.0.1- from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_importer.py cozy-1.0.1--patched/test/cozy/media/test_importer.py ---- cozy-1.0.1--orig/test/cozy/media/test_importer.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/media/test_importer.py 2021-05-30 11:14:55.922892276 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_importer.py cozy-1.2.1--patched/test/cozy/media/test_importer.py +--- cozy-1.2.1--orig/test/cozy/media/test_importer.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/media/test_importer.py 2022-08-21 20:24:05.035489653 +0200 @@ -2,9 +2,9 @@ import pytest @@ -606,9 +616,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_importer.py cozy-1.0.1--patched/ from cozy.model.library import Library -diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_player.py cozy-1.0.1--patched/test/cozy/media/test_player.py ---- cozy-1.0.1--orig/test/cozy/media/test_player.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/media/test_player.py 2021-05-30 11:14:55.926892276 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_player.py cozy-1.2.1--patched/test/cozy/media/test_player.py +--- cozy-1.2.1--orig/test/cozy/media/test_player.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/media/test_player.py 2022-08-21 20:24:05.036489659 +0200 @@ -3,9 +3,9 @@ import pytest from peewee import SqliteDatabase @@ -620,9 +630,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/media/test_player.py cozy-1.0.1--patched/te from cozy.model.library import Library from cozy.model.settings import Settings -diff -rU4 cozy-1.0.1--orig/test/cozy/model/storage_block_list.py cozy-1.0.1--patched/test/cozy/model/storage_block_list.py ---- cozy-1.0.1--orig/test/cozy/model/storage_block_list.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/model/storage_block_list.py 2021-05-30 11:14:55.940892279 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/model/storage_block_list.py cozy-1.2.1--patched/test/cozy/model/storage_block_list.py +--- cozy-1.2.1--orig/test/cozy/model/storage_block_list.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/model/storage_block_list.py 2022-08-21 20:24:05.036489659 +0200 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -633,9 +643,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/storage_block_list.py cozy-1.0.1--pat @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_book.py cozy-1.0.1--patched/test/cozy/model/test_book.py ---- cozy-1.0.1--orig/test/cozy/model/test_book.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/model/test_book.py 2021-05-30 11:14:55.942892280 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_book.py cozy-1.2.1--patched/test/cozy/model/test_book.py +--- cozy-1.2.1--orig/test/cozy/model/test_book.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/model/test_book.py 2022-08-21 20:24:05.036489659 +0200 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -647,9 +657,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_book.py cozy-1.0.1--patched/test @pytest.fixture(autouse=True) -diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_database_importer.py cozy-1.0.1--patched/test/cozy/model/test_database_importer.py ---- cozy-1.0.1--orig/test/cozy/model/test_database_importer.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/model/test_database_importer.py 2021-05-30 11:14:55.934892278 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_database_importer.py cozy-1.2.1--patched/test/cozy/model/test_database_importer.py +--- cozy-1.2.1--orig/test/cozy/model/test_database_importer.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/model/test_database_importer.py 2022-08-21 20:24:05.036489659 +0200 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -660,9 +670,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_database_importer.py cozy-1.0.1- @pytest.fixture(autouse=True) def setup_inject(peewee_database): -diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_library.py cozy-1.0.1--patched/test/cozy/model/test_library.py ---- cozy-1.0.1--orig/test/cozy/model/test_library.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/model/test_library.py 2021-05-30 11:14:55.939892279 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_library.py cozy-1.2.1--patched/test/cozy/model/test_library.py +--- cozy-1.2.1--orig/test/cozy/model/test_library.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/model/test_library.py 2022-08-21 20:24:05.036489659 +0200 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -674,9 +684,9 @@ diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_library.py cozy-1.0.1--patched/t from cozy.model.settings import Settings from test.cozy.mocks import ApplicationSettingsMock -diff -rU4 cozy-1.0.1--orig/test/cozy/model/test_settings.py cozy-1.0.1--patched/test/cozy/model/test_settings.py ---- cozy-1.0.1--orig/test/cozy/model/test_settings.py 2021-05-30 10:34:51.000000000 +0200 -+++ cozy-1.0.1--patched/test/cozy/model/test_settings.py 2021-05-30 11:14:55.936892278 +0200 +diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_settings.py cozy-1.2.1--patched/test/cozy/model/test_settings.py +--- cozy-1.2.1--orig/test/cozy/model/test_settings.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/test/cozy/model/test_settings.py 2022-08-21 20:24:05.037489665 +0200 @@ -1,7 +1,7 @@ import pytest diff --git a/0001-fix-appdata-file.patch b/0001-fix-appdata-file.patch new file mode 100644 index 0000000..d921548 --- /dev/null +++ b/0001-fix-appdata-file.patch @@ -0,0 +1,12 @@ +--- cozy-1.2.1--orig/data/com.github.geigi.cozy.appdata.xml 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/data/com.github.geigi.cozy.appdata.xml 2022-08-21 20:29:02.793386230 +0200 +@@ -54,8 +54,9 @@ + + + + ++

This minor release includes various assorted fixes.

+
    +
  • Support for GTK style manager (thanks A6GibKm)
    • +
  • Use natural sorting for chapter titles
    • +
  • As always, updated translations thanks to all the translators!
    • diff --git a/cozy.spec b/cozy.spec index 90af523..1395e24 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,8 +4,8 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.2.0 -Release: 3%{?dist} +Version: 1.2.1 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -15,6 +15,9 @@ Source99: find-unpatched-imports.sh # Unbundle python-inject Patch0: 0000--unbundle-inject.patch +# The appdata XML file does not pass validation +Patch1: 0001-fix-appdata-file.patch + BuildArch: noarch %global req_dazzle 3.34.0 @@ -103,6 +106,9 @@ rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" +# Apply other patches +%patch1 -p1 + %build %meson @@ -143,6 +149,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun Aug 21 2022 Artur Frenszek-Iwicki - 1.2.1-1 +- Update to v1.2.1 + * Wed Jul 20 2022 Fedora Release Engineering - 1.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index f227ac5..6493c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.2.0.tar.gz) = d3eb8063be4f7d966072fb48be23bbf71ea068a6614be55ef2ce70181c8c78e6200168a1cddc41d23406a8686c1be2e7ec9197470e9e94e6c287df45990b8056 +SHA512 (cozy-1.2.1.tar.gz) = db6c4a5ed47e139d87ca8a0d3c1d2681305ee565322209240e52acc1ac41c9669fb3ae06ca517d668e5f7a86319861089772b0d7b8f1aa22cfb5462913a9d3f5 From d20a3c3c4f0e97fe2c815f0e1515abc5eae3e6c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:33:20 +0000 Subject: [PATCH 24/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 1395e24..4fdc48e 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPLv3+ Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -149,6 +149,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Aug 21 2022 Artur Frenszek-Iwicki - 1.2.1-1 - Update to v1.2.1 From c1f8e343119d4ad008d99dfd1d188b601e193807 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 28 Mar 2023 07:51:56 +0200 Subject: [PATCH 25/41] Fix crash at startup and file conflicts --- 0002-fix-invalid-version-none.patch | 23 +++++++++++++++++++++++ cozy.spec | 27 ++++++++++++++++++++++----- 2 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 0002-fix-invalid-version-none.patch diff --git a/0002-fix-invalid-version-none.patch b/0002-fix-invalid-version-none.patch new file mode 100644 index 0000000..0b67581 --- /dev/null +++ b/0002-fix-invalid-version-none.patch @@ -0,0 +1,23 @@ +--- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200 ++++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2023-03-28 07:46:50.407285724 +0200 +@@ -50,14 +50,16 @@ + + def _fill_window(self): + self.children = [] + +- last_launched_version = version.parse(self.app_settings.last_launched_version) +- +- if type(last_launched_version) is version.LegacyVersion: ++ if (self.app_settings.last_launched_version is None) or (self.app_settings.last_launched_version == "None"): + self._fill_welcome() + else: +- self._fill_whats_new(last_launched_version) ++ last_launched_version = version.parse(self.app_settings.last_launched_version) ++ if type(last_launched_version) is version.LegacyVersion: ++ self._fill_welcome() ++ else: ++ self._fill_whats_new(last_launched_version) + + def _fill_welcome(self): + from cozy.ui.widgets.welcome import Welcome + from cozy.ui.widgets.error_reporting import ErrorReporting diff --git a/cozy.spec b/cozy.spec index 4fdc48e..bb63c08 100644 --- a/cozy.spec +++ b/cozy.spec @@ -2,10 +2,10 @@ Name: cozy %global rtld_name com.github.geigi.cozy Summary: Modern audiobook player -License: GPLv3+ +License: GPL-3.0-or-later Version: 1.2.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -18,6 +18,11 @@ Patch0: 0000--unbundle-inject.patch # The appdata XML file does not pass validation Patch1: 0001-fix-appdata-file.patch +# Fix crash at startup +# See: https://bugzilla.redhat.com/show_bug.cgi?id=2182220 +# https://github.com/geigi/cozy/issues/756 +Patch2: 0002-fix-invalid-version-none.patch + BuildArch: noarch %global req_dazzle 3.34.0 @@ -100,14 +105,15 @@ Here are some of the current features: %setup -q # Unbundle inject -%patch0 -p1 +%patch 0 -p1 rm -rf cozy/ext/inject # Run the "find unpatched imports" script "%{SOURCE99}" "$(pwd)" # Apply other patches -%patch1 -p1 +%patch 1 -p1 +%patch 2 -p1 %build @@ -121,6 +127,13 @@ rm -rf cozy/ext/inject %meson_install %find_lang %{rtld_name} +# Move "actions" icons out of /usr/share/icons/ to avoid conflicts with other packages +# See: https://bugzilla.redhat.com/show_bug.cgi?id=2120689 +# https://github.com/geigi/cozy/issues/710 +COZY_ICON_DIR="%{buildroot}%{_datadir}/%{rtld_name}/icons/hicolor/scalable" +install -m 755 -d "${COZY_ICON_DIR}" +mv %{buildroot}%{_datadir}/icons/hicolor/scalable/actions "${COZY_ICON_DIR}/actions" + # Remove the "devel" icon rm %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{rtld_name}.Devel.svg @@ -142,13 +155,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %{_datadir}/applications/%{rtld_name}.desktop %{_datadir}/glib-2.0/schemas/%{rtld_name}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{rtld_name}.svg -%{_datadir}/icons/hicolor/scalable/actions/*-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/%{rtld_name}-symbolic.svg %{_metainfodir}/%{rtld_name}.appdata.xml %{python3_sitelib}/%{name}/ %changelog +* Tue Mar 28 2023 Artur Frenszek-Iwicki - 1.2.1-3 +- Move "actions" icons out of /usr/share/icons to avoid conflicts with other packages +- Add a patch to fix crash at startup +- Convert License tag to SPDX + * Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a9fb01a27c7f198ea77b9ff913f985c37f864e42 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 28 May 2023 12:21:23 +0200 Subject: [PATCH 26/41] Patch yet another crash at startup --- 0002-fix-invalid-version-none.patch | 65 +++++++++++++++++++++++++---- cozy.spec | 5 ++- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/0002-fix-invalid-version-none.patch b/0002-fix-invalid-version-none.patch index 0b67581..c6c94eb 100644 --- a/0002-fix-invalid-version-none.patch +++ b/0002-fix-invalid-version-none.patch @@ -1,23 +1,74 @@ ---- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2023-03-28 07:46:50.407285724 +0200 -@@ -50,14 +50,16 @@ - +From 6422aaafa9655b91f29bdb399970181ef4a888df Mon Sep 17 00:00:00 2001 +From: suve +Date: Wed, 29 Mar 2023 12:22:58 +0200 +Subject: [PATCH 1/2] Fix crash on startup + +This commit fixes the program crashing because of an uncaught exception. +The bug was triggered by app_settings.last_launched_version being +unset - which would always be the case when launching the program for +the first time! + +The bug could also be triggered by manually changing the setting +to an invalid value - e.g. by running: +$ gsettings set com.github.geigi.cozy last-launched-version 'ayy lmao' +--- + cozy/ui/widgets/whats_new_window.py | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/cozy/ui/widgets/whats_new_window.py b/cozy/ui/widgets/whats_new_window.py +index 1e80d1ef..1a79005b 100644 +--- a/cozy/ui/widgets/whats_new_window.py ++++ b/cozy/ui/widgets/whats_new_window.py +@@ -51,12 +51,16 @@ def __init__(self, **kwargs): def _fill_window(self): self.children = [] - last_launched_version = version.parse(self.app_settings.last_launched_version) - - if type(last_launched_version) is version.LegacyVersion: -+ if (self.app_settings.last_launched_version is None) or (self.app_settings.last_launched_version == "None"): ++ try: ++ last_launched_version = version.parse(self.app_settings.last_launched_version) ++ except version.InvalidVersion: self._fill_welcome() else: - self._fill_whats_new(last_launched_version) -+ last_launched_version = version.parse(self.app_settings.last_launched_version) + if type(last_launched_version) is version.LegacyVersion: + self._fill_welcome() + else: + self._fill_whats_new(last_launched_version) ++ + + def _fill_welcome(self): + from cozy.ui.widgets.welcome import Welcome + +From 5dd970aafb9f50803344cf1e2c5c91751658a58e Mon Sep 17 00:00:00 2001 +From: suve +Date: Sun, 28 May 2023 12:09:02 +0200 +Subject: [PATCH 2/2] Remove usage of version.LegacyVersion + +The "packaging" module has deprecated its LegacyVersion identifier back +in 2020, finally removing it in 2021. This causes cozy to crash when +running against new version of said module, with the following error: +> AttributeError: module 'packaging.version' +> has no attribute 'LegacyVersion' +--- + cozy/ui/widgets/whats_new_window.py | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/cozy/ui/widgets/whats_new_window.py b/cozy/ui/widgets/whats_new_window.py +index 1a79005b..da3a06f9 100644 +--- a/cozy/ui/widgets/whats_new_window.py ++++ b/cozy/ui/widgets/whats_new_window.py +@@ -56,11 +56,7 @@ def _fill_window(self): + except version.InvalidVersion: + self._fill_welcome() + else: +- if type(last_launched_version) is version.LegacyVersion: +- self._fill_welcome() +- else: +- self._fill_whats_new(last_launched_version) +- ++ self._fill_whats_new(last_launched_version) def _fill_welcome(self): from cozy.ui.widgets.welcome import Welcome - from cozy.ui.widgets.error_reporting import ErrorReporting diff --git a/cozy.spec b/cozy.spec index bb63c08..8ea04bd 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun May 28 2023 Artur Frenszek-Iwicki - 1.2.1-4 +- Modify Patch2 to fix yet another crash at startup + * Tue Mar 28 2023 Artur Frenszek-Iwicki - 1.2.1-3 - Move "actions" icons out of /usr/share/icons to avoid conflicts with other packages - Add a patch to fix crash at startup From 9babfc26d741c52ac3383ea9cd48f75fae99737a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 6 Jul 2023 09:43:05 +0200 Subject: [PATCH 27/41] Rebuilt for Python 3.12 --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 8ea04bd..82efeb0 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.2.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Thu Jul 06 2023 Python Maint - 1.2.1-5 +- Rebuilt for Python 3.12 + * Sun May 28 2023 Artur Frenszek-Iwicki - 1.2.1-4 - Modify Patch2 to fix yet another crash at startup From 456944d5424146dc4ee4367b4b5b858af100154a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:26:52 +0000 Subject: [PATCH 28/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 82efeb0..5daa97a 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.2.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jul 06 2023 Python Maint - 1.2.1-5 - Rebuilt for Python 3.12 From 29b4c2c9d066930c0253287c252ee4d09340f047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:14:21 +0000 Subject: [PATCH 29/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 5daa97a..b94204a 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.2.1 -Release: 6%{?dist} +Release: 7%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.2.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3201112dc13a7ed506b560d405c103cd74ad4d04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:11:23 +0000 Subject: [PATCH 30/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index b94204a..2229f6b 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.2.1 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -161,6 +161,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9ae0d057febfebb38abbdaa5bf427e8e1f3c808f Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 3 Mar 2024 12:10:49 +0100 Subject: [PATCH 31/41] Update to v1.3.0 (rhbz#2252866) --- .gitignore | 1 + 0000--unbundle-inject.patch | 555 +++++++++++++--------------- 0001-fix-appdata-file.patch | 16 +- 0002-fix-invalid-version-none.patch | 74 ---- cozy.spec | 42 +-- sources | 2 +- 6 files changed, 288 insertions(+), 402 deletions(-) delete mode 100644 0002-fix-invalid-version-none.patch diff --git a/.gitignore b/.gitignore index b467b57..36704c2 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cozy-1.1.3.tar.gz /cozy-1.2.0.tar.gz /cozy-1.2.1.tar.gz +/cozy-1.3.0.tar.gz diff --git a/0000--unbundle-inject.patch b/0000--unbundle-inject.patch index 816c1fe..a618e10 100644 --- a/0000--unbundle-inject.patch +++ b/0000--unbundle-inject.patch @@ -1,6 +1,6 @@ -diff -U4 -r cozy-1.2.1--orig/cozy/app_controller.py cozy-1.2.1--patched/cozy/app_controller.py ---- cozy-1.2.1--orig/cozy/app_controller.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/app_controller.py 2022-08-21 20:24:05.025489593 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/app_controller.py cozy-1.3.0--patched/cozy/app_controller.py +--- cozy-1.3.0--orig/cozy/app_controller.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/app_controller.py 2024-03-03 11:51:34.062151406 +0100 @@ -1,7 +1,7 @@ from gi.repository import Gio @@ -10,9 +10,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/app_controller.py cozy-1.2.1--patched/cozy/app from cozy.control.offline_cache import OfflineCache from cozy.media.files import Files -diff -U4 -r cozy-1.2.1--orig/cozy/application_settings.py cozy-1.2.1--patched/cozy/application_settings.py ---- cozy-1.2.1--orig/cozy/application_settings.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/application_settings.py 2022-08-21 20:24:05.026489599 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/application_settings.py cozy-1.3.0--patched/cozy/application_settings.py +--- cozy-1.3.0--orig/cozy/application_settings.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/application_settings.py 2024-03-03 11:52:23.623579214 +0100 @@ -1,8 +1,8 @@ from gi.repository import Gio @@ -23,9 +23,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/application_settings.py cozy-1.2.1--patched/co class ApplicationSettings(EventSender): _settings: Gio.Settings = inject.attr(Gio.Settings) -diff -U4 -r cozy-1.2.1--orig/cozy/control/artwork_cache.py cozy-1.2.1--patched/cozy/control/artwork_cache.py ---- cozy-1.2.1--orig/cozy/control/artwork_cache.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/control/artwork_cache.py 2022-08-21 20:24:05.026489599 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/control/artwork_cache.py cozy-1.3.0--patched/cozy/control/artwork_cache.py +--- cozy-1.3.0--orig/cozy/control/artwork_cache.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/control/artwork_cache.py 2024-03-03 11:52:23.625579231 +0100 @@ -6,9 +6,9 @@ from cozy.application_settings import ApplicationSettings @@ -37,9 +37,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/control/artwork_cache.py cozy-1.2.1--patched/c from cozy.report import reporter log = logging.getLogger("artwork_cache") -diff -U4 -r cozy-1.2.1--orig/cozy/control/filesystem_monitor.py cozy-1.2.1--patched/cozy/control/filesystem_monitor.py ---- cozy-1.2.1--orig/cozy/control/filesystem_monitor.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/control/filesystem_monitor.py 2022-08-21 20:24:05.026489599 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/control/filesystem_monitor.py cozy-1.3.0--patched/cozy/control/filesystem_monitor.py +--- cozy-1.3.0--orig/cozy/control/filesystem_monitor.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/control/filesystem_monitor.py 2024-03-03 11:51:34.062151406 +0100 @@ -1,8 +1,8 @@ import logging from typing import List @@ -50,23 +50,23 @@ diff -U4 -r cozy-1.2.1--orig/cozy/control/filesystem_monitor.py cozy-1.2.1--patc from cozy.architecture.event_sender import EventSender from cozy.model.book import Book -diff -U4 -r cozy-1.2.1--orig/cozy/control/mpris.py cozy-1.2.1--patched/cozy/control/mpris.py ---- cozy-1.2.1--orig/cozy/control/mpris.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/control/mpris.py 2022-08-21 20:24:05.026489599 +0200 -@@ -22,9 +22,9 @@ +diff -r -U4 cozy-1.3.0--orig/cozy/control/mpris.py cozy-1.3.0--patched/cozy/control/mpris.py +--- cozy-1.3.0--orig/cozy/control/mpris.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/control/mpris.py 2024-03-03 11:52:23.625579231 +0100 +@@ -15,9 +15,9 @@ + from gi.repository import Gio, GLib - import cozy.ui from cozy.application_settings import ApplicationSettings from cozy.control.artwork_cache import ArtworkCache -from cozy.ext import inject +import inject - from cozy.media.player import Player + from cozy.media.player import NS_TO_SEC, US_TO_SEC, Player from cozy.model.book import Book from cozy.report import reporter -diff -U4 -r cozy-1.2.1--orig/cozy/control/offline_cache.py cozy-1.2.1--patched/cozy/control/offline_cache.py ---- cozy-1.2.1--orig/cozy/control/offline_cache.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/control/offline_cache.py 2022-08-21 20:24:05.027489605 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/control/offline_cache.py cozy-1.3.0--patched/cozy/control/offline_cache.py +--- cozy-1.3.0--orig/cozy/control/offline_cache.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/control/offline_cache.py 2024-03-03 11:52:23.624579222 +0100 @@ -12,9 +12,9 @@ from cozy.db.file import File @@ -78,9 +78,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/control/offline_cache.py cozy-1.2.1--patched/c from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.view_model.settings_view_model import SettingsViewModel -diff -U4 -r cozy-1.2.1--orig/cozy/media/files.py cozy-1.2.1--patched/cozy/media/files.py ---- cozy-1.2.1--orig/cozy/media/files.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/media/files.py 2022-08-21 20:24:05.027489605 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/media/files.py cozy-1.3.0--patched/cozy/media/files.py +--- cozy-1.3.0--orig/cozy/media/files.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/media/files.py 2024-03-03 11:52:23.626579240 +0100 @@ -5,9 +5,9 @@ from gi.repository import Gio @@ -91,11 +91,11 @@ diff -U4 -r cozy-1.2.1--orig/cozy/media/files.py cozy-1.2.1--patched/cozy/media/ from cozy.media.importer import Importer from cozy.model.settings import Settings from cozy.report import reporter - from cozy.ui.info_banner import InfoBanner -diff -U4 -r cozy-1.2.1--orig/cozy/media/importer.py cozy-1.2.1--patched/cozy/media/importer.py ---- cozy-1.2.1--orig/cozy/media/importer.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/media/importer.py 2022-08-21 20:24:05.027489605 +0200 -@@ -10,9 +10,9 @@ + from cozy.ui.toaster import ToastNotifier +diff -r -U4 cozy-1.3.0--orig/cozy/media/importer.py cozy-1.3.0--patched/cozy/media/importer.py +--- cozy-1.3.0--orig/cozy/media/importer.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/media/importer.py 2024-03-03 11:52:23.626579240 +0100 +@@ -9,9 +9,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -106,9 +106,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/media/importer.py cozy-1.2.1--patched/cozy/med from cozy.media.media_file import MediaFile from cozy.model.database_importer import DatabaseImporter from cozy.model.library import Library -diff -U4 -r cozy-1.2.1--orig/cozy/media/player.py cozy-1.2.1--patched/cozy/media/player.py ---- cozy-1.2.1--orig/cozy/media/player.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/media/player.py 2022-08-21 20:24:05.027489605 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/media/player.py cozy-1.3.0--patched/cozy/media/player.py +--- cozy-1.3.0--orig/cozy/media/player.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/media/player.py 2024-03-03 11:52:23.626579240 +0100 @@ -9,9 +9,9 @@ from cozy.application_settings import ApplicationSettings @@ -120,9 +120,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/media/player.py cozy-1.2.1--patched/cozy/media from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -r cozy-1.2.1--orig/cozy/model/book.py cozy-1.2.1--patched/cozy/model/book.py ---- cozy-1.2.1--orig/cozy/model/book.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/model/book.py 2022-08-21 20:24:38.465691342 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/model/book.py cozy-1.3.0--patched/cozy/model/book.py +--- cozy-1.3.0--orig/cozy/model/book.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/model/book.py 2024-03-03 11:52:23.624579222 +0100 @@ -10,9 +10,9 @@ from cozy.db.collation import collate_natural from cozy.db.book import Book as BookModel @@ -134,9 +134,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/model/book.py cozy-1.2.1--patched/cozy/model/b from cozy.model.settings import Settings from cozy.model.track import Track, TrackInconsistentData -diff -U4 -r cozy-1.2.1--orig/cozy/model/database_importer.py cozy-1.2.1--patched/cozy/model/database_importer.py ---- cozy-1.2.1--orig/cozy/model/database_importer.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/model/database_importer.py 2022-08-21 20:24:05.028489611 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/model/database_importer.py cozy-1.3.0--patched/cozy/model/database_importer.py +--- cozy-1.3.0--orig/cozy/model/database_importer.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/model/database_importer.py 2024-03-03 11:52:23.624579222 +0100 @@ -6,9 +6,9 @@ from cozy.db.book import Book as BookModel from cozy.db.file import File @@ -148,9 +148,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/model/database_importer.py cozy-1.2.1--patched from cozy.media.media_file import MediaFile from cozy.model.book import Book, BookIsEmpty -diff -U4 -r cozy-1.2.1--orig/cozy/model/library.py cozy-1.2.1--patched/cozy/model/library.py ---- cozy-1.2.1--orig/cozy/model/library.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/model/library.py 2022-08-21 20:24:05.028489611 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/model/library.py cozy-1.3.0--patched/cozy/model/library.py +--- cozy-1.3.0--orig/cozy/model/library.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/model/library.py 2024-03-03 11:52:23.624579222 +0100 @@ -6,9 +6,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.profiler import timing @@ -162,23 +162,23 @@ diff -U4 -r cozy-1.2.1--orig/cozy/model/library.py cozy-1.2.1--patched/cozy/mode from cozy.model.book import Book, BookIsEmpty from cozy.model.chapter import Chapter from cozy.model.settings import Settings -diff -U4 -r cozy-1.2.1--orig/cozy/model/settings.py cozy-1.2.1--patched/cozy/model/settings.py ---- cozy-1.2.1--orig/cozy/model/settings.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/model/settings.py 2022-08-21 20:24:05.028489611 +0200 -@@ -2,9 +2,9 @@ - from typing import List, Optional +diff -r -U4 cozy-1.3.0--orig/cozy/model/settings.py cozy-1.3.0--patched/cozy/model/settings.py +--- cozy-1.3.0--orig/cozy/model/settings.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/model/settings.py 2024-03-03 11:51:34.061151397 +0100 +@@ -3,9 +3,9 @@ import peewee + from peewee import SqliteDatabase -import cozy.ext.inject as inject +import inject - from peewee import SqliteDatabase - from cozy.db.book import Book from cozy.db.settings import Settings as SettingsModel -diff -U4 -r cozy-1.2.1--orig/cozy/power_manager.py cozy-1.2.1--patched/cozy/power_manager.py ---- cozy-1.2.1--orig/cozy/power_manager.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/power_manager.py 2022-08-21 20:24:05.028489611 +0200 + from cozy.db.storage import Storage as StorageModel + from cozy.model.storage import InvalidPath, Storage +diff -r -U4 cozy-1.3.0--orig/cozy/power_manager.py cozy-1.3.0--patched/cozy/power_manager.py +--- cozy-1.3.0--orig/cozy/power_manager.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/power_manager.py 2024-03-03 11:52:23.627579248 +0100 @@ -1,9 +1,9 @@ import logging @@ -190,9 +190,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/power_manager.py cozy-1.2.1--patched/cozy/powe log = logging.getLogger("power_mgr") -diff -U4 -r cozy-1.2.1--orig/cozy/report/report_to_loki.py cozy-1.2.1--patched/cozy/report/report_to_loki.py ---- cozy-1.2.1--orig/cozy/report/report_to_loki.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/report/report_to_loki.py 2022-08-21 20:24:05.029489617 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/report/report_to_loki.py cozy-1.3.0--patched/cozy/report/report_to_loki.py +--- cozy-1.3.0--orig/cozy/report/report_to_loki.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/report/report_to_loki.py 2024-03-03 11:52:23.625579231 +0100 @@ -6,9 +6,9 @@ import distro import platform @@ -204,11 +204,11 @@ diff -U4 -r cozy-1.2.1--orig/cozy/report/report_to_loki.py cozy-1.2.1--patched/c from cozy.version import __version__ as CozyVersion from peewee import __version__ as PeeweeVersion from mutagen import version_string as MutagenVersion -diff -U4 -r cozy-1.2.1--orig/cozy/ui/app_view.py cozy-1.2.1--patched/cozy/ui/app_view.py ---- cozy-1.2.1--orig/cozy/ui/app_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/app_view.py 2022-08-21 20:24:05.029489617 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/app_view.py cozy-1.3.0--patched/cozy/ui/app_view.py +--- cozy-1.3.0--orig/cozy/ui/app_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/app_view.py 2024-03-03 11:52:23.629579266 +0100 @@ -1,7 +1,7 @@ - from gi.repository import Gtk, Handy + from gi.repository import Gtk, Adw -from cozy.ext import inject +import inject @@ -216,9 +216,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/app_view.py cozy-1.2.1--patched/cozy/ui/app from cozy.view import View LIBRARY = "main" -diff -U4 -r cozy-1.2.1--orig/cozy/ui/book_detail_view.py cozy-1.2.1--patched/cozy/ui/book_detail_view.py ---- cozy-1.2.1--orig/cozy/ui/book_detail_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/book_detail_view.py 2022-08-21 20:24:05.029489617 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/book_detail_view.py cozy-1.3.0--patched/cozy/ui/book_detail_view.py +--- cozy-1.3.0--orig/cozy/ui/book_detail_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/book_detail_view.py 2024-03-03 11:52:23.630579274 +0100 @@ -5,9 +5,9 @@ import gi @@ -230,50 +230,36 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/book_detail_view.py cozy-1.2.1--patched/coz from cozy.model.chapter import Chapter from cozy.report import reporter from cozy.ui.chapter_element import ChapterElement -diff -U4 -r cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py ---- cozy-1.2.1--orig/cozy/ui/db_migration_failed_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/db_migration_failed_view.py 2022-08-21 20:24:05.029489617 +0200 -@@ -1,9 +1,9 @@ - import webbrowser - - import gi - --from cozy.ext import inject -+import inject - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk - -diff -U4 -r cozy-1.2.1--orig/cozy/ui/delete_book_view.py cozy-1.2.1--patched/cozy/ui/delete_book_view.py ---- cozy-1.2.1--orig/cozy/ui/delete_book_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/delete_book_view.py 2022-08-21 20:24:05.029489617 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/delete_book_view.py cozy-1.3.0--patched/cozy/ui/delete_book_view.py +--- cozy-1.3.0--orig/cozy/ui/delete_book_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/delete_book_view.py 2024-03-03 11:52:23.629579266 +0100 @@ -1,7 +1,7 @@ - import gi + from gi.repository import Adw, Gtk -from cozy.ext import inject +import inject + from cozy.model.book import Book + from cozy.ui.widgets.book_row import BookRow - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk -diff -U4 -r cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py ---- cozy-1.2.1--orig/cozy/ui/file_not_found_dialog.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/file_not_found_dialog.py 2022-08-21 20:24:05.030489623 +0200 -@@ -2,9 +2,9 @@ +diff -r -U4 cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py +--- cozy-1.3.0--orig/cozy/ui/file_not_found_dialog.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/file_not_found_dialog.py 2024-03-03 11:52:23.627579248 +0100 +@@ -1,9 +1,9 @@ + from pathlib import Path - from gi.repository import Gtk + from gi.repository import Adw, Gio, GLib, Gtk - import cozy.ui -from cozy.ext import inject +import inject from cozy.media.importer import Importer from cozy.model.chapter import Chapter - from cozy.model.library import Library -diff -U4 -r cozy-1.2.1--orig/cozy/ui/headerbar.py cozy-1.2.1--patched/cozy/ui/headerbar.py ---- cozy-1.2.1--orig/cozy/ui/headerbar.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/headerbar.py 2022-08-21 20:24:05.030489623 +0200 -@@ -1,9 +1,9 @@ + +diff -r -U4 cozy-1.3.0--orig/cozy/ui/headerbar.py cozy-1.3.0--patched/cozy/ui/headerbar.py +--- cozy-1.3.0--orig/cozy/ui/headerbar.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/headerbar.py 2024-03-03 11:52:23.631579283 +0100 +@@ -1,15 +1,15 @@ import logging import gi @@ -283,49 +269,48 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/headerbar.py cozy-1.2.1--patched/cozy/ui/he from cozy.ui.widgets.progress_popover import ProgressPopover from cozy.view_model.headerbar_view_model import HeaderbarViewModel, HeaderBarState - gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-1.2.1--orig/cozy/ui/info_banner.py cozy-1.2.1--patched/cozy/ui/info_banner.py ---- cozy-1.2.1--orig/cozy/ui/info_banner.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/info_banner.py 2022-08-21 20:24:50.973766801 +0200 -@@ -1,9 +1,9 @@ - import gi + from gi.repository import Adw, Gtk, GObject - from gi.repository import Gtk +-from cozy.ext import inject ++import inject + from cozy.ui.widgets.progress_popover import ProgressPopover + from cozy.view_model.headerbar_view_model import HeaderBarState, HeaderbarViewModel + + log = logging.getLogger("Headerbar") +diff -r -U4 cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py +--- cozy-1.3.0--orig/cozy/ui/import_failed_dialog.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/import_failed_dialog.py 2024-03-03 11:52:23.630579274 +0100 +@@ -1,9 +1,9 @@ + from gettext import gettext as _ + + from gi.repository import Adw, Gtk -from cozy.ext import inject +import inject - class InfoBanner: - _builder: Gtk.Builder = inject.attr("MainWindowBuilder") -@@ -19,5 +19,5 @@ - self._label.set_text(message) - self._toast.set_revealed(True) - - def _on_response(self, _, __): -- self._toast.set_revealed(False) -\ No newline at end of file -+ self._toast.set_revealed(False) -diff -U4 -r cozy-1.2.1--orig/cozy/ui/library_view.py cozy-1.2.1--patched/cozy/ui/library_view.py ---- cozy-1.2.1--orig/cozy/ui/library_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/library_view.py 2022-08-21 20:24:05.030489623 +0200 + HEADER = _("This can have multiple reasons:") + POSSIBILITIES = "\n • ".join(( # yes, it is a hack, because \t would be too wide +diff -r -U4 cozy-1.3.0--orig/cozy/ui/library_view.py cozy-1.3.0--patched/cozy/ui/library_view.py +--- cozy-1.3.0--orig/cozy/ui/library_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/library_view.py 2024-03-03 11:52:23.629579266 +0100 @@ -2,9 +2,9 @@ + from typing import Optional - from gi.repository import Gtk, Handy - from gi.repository.Gtk import Builder + from gi.repository import Adw, Gtk -from cozy.ext import inject +import inject from cozy.ui.widgets.book_element import BookElement from cozy.ui.delete_book_view import DeleteBookView from cozy.ui.widgets.filter_list_box import FilterListBox - from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode, LibraryPage -diff -U4 -r cozy-1.2.1--orig/cozy/ui/main_view.py cozy-1.2.1--patched/cozy/ui/main_view.py ---- cozy-1.2.1--orig/cozy/ui/main_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/main_view.py 2022-08-21 20:24:05.031489629 +0200 -@@ -5,9 +5,9 @@ + from cozy.view_model.library_view_model import LibraryViewModel, LibraryViewMode +diff -r -U4 cozy-1.3.0--orig/cozy/ui/main_view.py cozy-1.3.0--patched/cozy/ui/main_view.py +--- cozy-1.3.0--orig/cozy/ui/main_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/main_view.py 2024-03-03 11:51:34.062151406 +0100 +@@ -6,9 +6,9 @@ - from gi.repository import Gtk, Gio, Gdk, GLib + from gi.repository import Adw, Gdk, Gio, GLib, Gtk import cozy.control.filesystem_monitor as fs_monitor -import cozy.ext.inject as inject @@ -334,9 +319,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/main_view.py cozy-1.2.1--patched/cozy/ui/ma from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.singleton import Singleton -diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_big.py cozy-1.2.1--patched/cozy/ui/media_controller_big.py ---- cozy-1.2.1--orig/cozy/ui/media_controller_big.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/media_controller_big.py 2022-08-21 20:24:05.031489629 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/media_controller.py cozy-1.3.0--patched/cozy/ui/media_controller.py +--- cozy-1.3.0--orig/cozy/ui/media_controller.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/media_controller.py 2024-03-03 11:52:23.631579283 +0100 @@ -3,9 +3,9 @@ import gi @@ -348,67 +333,52 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_big.py cozy-1.2.1--patched from cozy.ui.widgets.seek_bar import SeekBar from cozy.ui.widgets.sleep_timer import SleepTimer from cozy.view_model.playback_control_view_model import PlaybackControlViewModel -diff -U4 -r cozy-1.2.1--orig/cozy/ui/media_controller_small.py cozy-1.2.1--patched/cozy/ui/media_controller_small.py ---- cozy-1.2.1--orig/cozy/ui/media_controller_small.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/media_controller_small.py 2022-08-21 20:24:05.031489629 +0200 -@@ -3,9 +3,9 @@ - import gi - - from cozy.control.artwork_cache import ArtworkCache - from cozy.db.book import Book --from cozy.ext import inject -+import inject - from cozy.ui.widgets.playback_speed_popover import PlaybackSpeedPopover - from cozy.view_model.playback_control_view_model import PlaybackControlViewModel - - gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-1.2.1--orig/cozy/ui/preferences_view.py cozy-1.2.1--patched/cozy/ui/preferences_view.py ---- cozy-1.2.1--orig/cozy/ui/preferences_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/preferences_view.py 2022-08-21 20:24:05.031489629 +0200 -@@ -2,9 +2,9 @@ - from cozy.view_model.settings_view_model import SettingsViewModel - import gi - from gi.repository import Handy, Gio +diff -r -U4 cozy-1.3.0--orig/cozy/ui/preferences_view.py cozy-1.3.0--patched/cozy/ui/preferences_view.py +--- cozy-1.3.0--orig/cozy/ui/preferences_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/preferences_view.py 2024-03-03 11:52:23.630579274 +0100 +@@ -1,8 +1,8 @@ + from typing import Any + from gi.repository import Adw, Gio, Gtk -from cozy.ext import inject +import inject from cozy.ui.widgets.error_reporting import ErrorReporting - from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow - gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-1.2.1--orig/cozy/ui/search_view.py cozy-1.2.1--patched/cozy/ui/search_view.py ---- cozy-1.2.1--orig/cozy/ui/search_view.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/search_view.py 2022-08-21 20:24:05.031489629 +0200 -@@ -1,8 +1,8 @@ - import threading - from threading import Thread + from cozy.ui.widgets.storages import StorageLocations + from cozy.view_model.settings_view_model import SettingsViewModel +diff -r -U4 cozy-1.3.0--orig/cozy/ui/search_view.py cozy-1.3.0--patched/cozy/ui/search_view.py +--- cozy-1.3.0--orig/cozy/ui/search_view.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/search_view.py 2024-03-03 11:52:23.631579283 +0100 +@@ -2,9 +2,9 @@ + from typing import Callable, Sequence + + from gi.repository import Adw, Gtk -from cozy.ext import inject +import inject - from cozy.ui.widgets.search_results import BookSearchResult, ArtistSearchResult + from cozy.model.book import Book + from cozy.ui.headerbar import Headerbar + from cozy.ui.widgets.book_row import BookRow + from cozy.ui.widgets.search_results import ArtistResultRow +diff -r -U4 cozy-1.3.0--orig/cozy/ui/toaster.py cozy-1.3.0--patched/cozy/ui/toaster.py +--- cozy-1.3.0--orig/cozy/ui/toaster.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/toaster.py 2024-03-03 11:52:23.631579283 +0100 +@@ -1,7 +1,7 @@ + from gi.repository import Adw, Gtk - import gi - -diff -U4 -r cozy-1.2.1--orig/cozy/ui/warnings.py cozy-1.2.1--patched/cozy/ui/warnings.py ---- cozy-1.2.1--orig/cozy/ui/warnings.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/warnings.py 2022-08-21 20:24:05.032489635 +0200 -@@ -1,8 +1,8 @@ - from gettext import gettext - - import gi --import cozy.ext.inject as inject +-from cozy.ext import inject +import inject - from cozy.control.filesystem_monitor import FilesystemMonitor - gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/album_element.py cozy-1.2.1--patched/cozy/ui/widgets/album_element.py ---- cozy-1.2.1--orig/cozy/ui/widgets/album_element.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/album_element.py 2022-08-21 20:24:05.032489635 +0200 -@@ -5,9 +5,9 @@ + class ToastNotifier: + _builder: Gtk.Builder = inject.attr("MainWindowBuilder") +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/album_element.py cozy-1.3.0--patched/cozy/ui/widgets/album_element.py +--- cozy-1.3.0--orig/cozy/ui/widgets/album_element.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/album_element.py 2024-03-03 11:52:23.627579248 +0100 +@@ -4,9 +4,9 @@ + import cairo from cozy.control.artwork_cache import ArtworkCache - from cozy.extensions.gtk_widget import set_hand_cursor, reset_cursor from cozy.model.book import Book -from cozy.ext import inject +import inject @@ -416,89 +386,72 @@ diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/album_element.py cozy-1.2.1--patche from gi.repository import Gtk, GObject, Gdk ALBUM_ART_SIZE = 200 -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py ---- cozy-1.2.1--orig/cozy/ui/widgets/error_reporting.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/error_reporting.py 2022-08-21 20:24:05.032489635 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/book_row.py cozy-1.3.0--patched/cozy/ui/widgets/book_row.py +--- cozy-1.3.0--orig/cozy/ui/widgets/book_row.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/book_row.py 2024-03-03 11:52:23.628579257 +0100 @@ -2,9 +2,9 @@ - import gi + from gi.repository import Adw, Gtk - from cozy.application_settings import ApplicationSettings --from cozy.ext import inject -+import inject - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk - -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py ---- cozy-1.2.1--orig/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/playback_speed_popover.py 2022-08-21 20:24:05.032489635 +0200 -@@ -1,7 +1,7 @@ - import gi - --from cozy.ext import inject -+import inject - from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/search_results.py cozy-1.2.1--patched/cozy/ui/widgets/search_results.py ---- cozy-1.2.1--orig/cozy/ui/widgets/search_results.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/search_results.py 2022-08-21 20:24:05.033489641 +0200 -@@ -1,8 +1,8 @@ - from gi.repository import Gtk, Gdk - import cozy.tools as tools from cozy.control.artwork_cache import ArtworkCache -from cozy.ext import inject +import inject from cozy.model.book import Book - MAX_BOOK_LENGTH = 80 - BOOK_ICON_SIZE = 40 -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py ---- cozy-1.2.1--orig/cozy/ui/widgets/sleep_timer.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/sleep_timer.py 2022-08-21 20:24:05.033489641 +0200 -@@ -1,7 +1,7 @@ - import gi + BOOK_ICON_SIZE = 52 --from cozy.ext import inject -+import inject - from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl - - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py ---- cozy-1.2.1--orig/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/storage_list_box_row.py 2022-08-21 20:24:05.033489641 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py +--- cozy-1.3.0--orig/cozy/ui/widgets/error_reporting.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/error_reporting.py 2024-03-03 11:52:23.628579257 +0100 @@ -2,9 +2,9 @@ - from threading import Thread - - from cozy.control.filesystem_monitor import FilesystemMonitor - from cozy.model.storage import Storage --from cozy.ext import inject -+import inject - from cozy.model.library import Library - from cozy.model.settings import Settings - from gi.repository import Gtk, GObject - -diff -U4 -r cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py ---- cozy-1.2.1--orig/cozy/ui/widgets/whats_new_window.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/ui/widgets/whats_new_window.py 2022-08-21 20:24:05.033489641 +0200 -@@ -3,9 +3,9 @@ import gi from cozy.application_settings import ApplicationSettings -from cozy.ext import inject +import inject - from cozy.ui.main_view import CozyUI - from cozy.version import __version__ as CozyVersion - gi.require_version('Gtk', '3.0') -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/book_detail_view_model.py 2022-08-21 20:24:05.034489647 +0200 -@@ -5,9 +5,9 @@ + from gi.repository import Gtk + + LEVELS = [ +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py +--- cozy-1.3.0--orig/cozy/ui/widgets/playback_speed_popover.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/playback_speed_popover.py 2024-03-03 11:52:23.628579257 +0100 +@@ -1,5 +1,5 @@ +-from cozy.ext import inject ++import inject + from cozy.view_model.playback_speed_view_model import PlaybackSpeedViewModel + + from gi.repository import Gtk + +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py +--- cozy-1.3.0--orig/cozy/ui/widgets/sleep_timer.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/sleep_timer.py 2024-03-03 11:52:23.627579248 +0100 +@@ -1,5 +1,5 @@ +-from cozy.ext import inject ++import inject + from cozy.view_model.sleep_timer_view_model import SleepTimerViewModel, SystemPowerControl + + from gi.repository import Gtk + +diff -r -U4 cozy-1.3.0--orig/cozy/ui/widgets/storages.py cozy-1.3.0--patched/cozy/ui/widgets/storages.py +--- cozy-1.3.0--orig/cozy/ui/widgets/storages.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/ui/widgets/storages.py 2024-03-03 11:52:23.628579257 +0100 +@@ -1,9 +1,9 @@ + from typing import Callable + + from gi.repository import Adw, Gio, GLib, GObject, Gtk + +-from cozy.ext import inject ++import inject + from cozy.model.storage import Storage + from cozy.view_model.storages_view_model import StoragesViewModel + + +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/book_detail_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/book_detail_view_model.py 2024-03-03 11:52:23.623579214 +0100 +@@ -3,9 +3,9 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor @@ -509,9 +462,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/view_model/book_detail_view_model.py cozy-1.2. from cozy.model.book import Book from cozy.model.chapter import Chapter from cozy.model.library import Library -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/headerbar_view_model.py 2022-08-21 20:24:05.034489647 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/headerbar_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/headerbar_view_model.py 2024-03-03 11:52:23.623579214 +0100 @@ -2,9 +2,9 @@ from cozy.architecture.event_sender import EventSender @@ -523,26 +476,24 @@ diff -U4 -r cozy-1.2.1--orig/cozy/view_model/headerbar_view_model.py cozy-1.2.1- from cozy.media.importer import Importer, ScanStatus from cozy.model.library import Library from cozy.open_view import OpenView -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/library_view_model.py cozy-1.2.1--patched/cozy/view_model/library_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/library_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/library_view_model.py 2022-08-21 20:24:05.034489647 +0200 -@@ -4,9 +4,9 @@ +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/library_view_model.py cozy-1.3.0--patched/cozy/view_model/library_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/library_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/library_view_model.py 2024-03-03 11:51:34.061151397 +0100 +@@ -2,9 +2,9 @@ + import os + from enum import Enum, auto from typing import Optional - from gi.repository import Gtk - -import cozy.ext.inject as inject +import inject from cozy.application_settings import ApplicationSettings from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/playback_control_view_model.py 2022-08-21 20:24:05.034489647 +0200 -@@ -1,9 +1,9 @@ - from typing import Optional - +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/playback_control_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/playback_control_view_model.py 2024-03-03 11:52:23.622579205 +0100 +@@ -1,7 +1,7 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable -from cozy.ext import inject @@ -551,9 +502,9 @@ diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_control_view_model.py cozy from cozy.model.book import Book from cozy.open_view import OpenView -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/playback_speed_view_model.py 2022-08-21 20:24:05.034489647 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/playback_speed_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/playback_speed_view_model.py 2024-03-03 11:52:23.622579205 +0100 @@ -1,8 +1,8 @@ from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable @@ -564,33 +515,37 @@ diff -U4 -r cozy-1.2.1--orig/cozy/view_model/playback_speed_view_model.py cozy-1 class PlaybackSpeedViewModel(Observable, EventSender): -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/search_view_model.py cozy-1.2.1--patched/cozy/view_model/search_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/search_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/search_view_model.py 2022-08-21 20:24:05.035489653 +0200 -@@ -1,5 +1,5 @@ +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/search_view_model.py cozy-1.3.0--patched/cozy/view_model/search_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/search_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/search_view_model.py 2024-03-03 11:51:34.061151397 +0100 +@@ -1,9 +1,9 @@ + from typing import Callable + + from gi.repository import GLib + -import cozy.ext.inject as inject +import inject - - from cozy.extensions.set import split_strings_to_set - from cozy.open_view import OpenView from cozy.application_settings import ApplicationSettings -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/settings_view_model.py cozy-1.2.1--patched/cozy/view_model/settings_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/settings_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/settings_view_model.py 2022-08-21 20:24:05.035489653 +0200 -@@ -8,9 +8,9 @@ + from cozy.architecture.event_sender import EventSender from cozy.architecture.observable import Observable from cozy.control.filesystem_monitor import FilesystemMonitor - from cozy.model.library import Library - from cozy.model.storage import Storage +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/settings_view_model.py cozy-1.3.0--patched/cozy/view_model/settings_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/settings_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/settings_view_model.py 2024-03-03 11:52:23.621579196 +0100 +@@ -4,9 +4,9 @@ + + from cozy.application_settings import ApplicationSettings + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable -from cozy.ext import inject +import inject from cozy.media.importer import Importer from cozy.model.settings import Settings - from cozy.report import reporter - from gi.repository import Gtk -diff -U4 -r cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py ---- cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/cozy/view_model/sleep_timer_view_model.py 2022-08-21 20:24:05.035489653 +0200 + + log = logging.getLogger("settings_view_model") +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/sleep_timer_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/sleep_timer_view_model.py 2024-03-03 11:52:23.622579205 +0100 @@ -5,9 +5,9 @@ from cozy import tools @@ -602,9 +557,23 @@ diff -U4 -r cozy-1.2.1--orig/cozy/view_model/sleep_timer_view_model.py cozy-1.2. from cozy.tools import IntervalTimer log = logging.getLogger("sleep_timer_view_model") -diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_importer.py cozy-1.2.1--patched/test/cozy/media/test_importer.py ---- cozy-1.2.1--orig/test/cozy/media/test_importer.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/media/test_importer.py 2022-08-21 20:24:05.035489653 +0200 +diff -r -U4 cozy-1.3.0--orig/cozy/view_model/storages_view_model.py cozy-1.3.0--patched/cozy/view_model/storages_view_model.py +--- cozy-1.3.0--orig/cozy/view_model/storages_view_model.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/cozy/view_model/storages_view_model.py 2024-03-03 11:52:23.621579196 +0100 +@@ -6,9 +6,9 @@ + from cozy.application_settings import ApplicationSettings + from cozy.architecture.event_sender import EventSender + from cozy.architecture.observable import Observable + from cozy.control.filesystem_monitor import FilesystemMonitor +-from cozy.ext import inject ++import inject + from cozy.media.importer import Importer + from cozy.model.library import Library + from cozy.model.settings import Settings + from cozy.model.storage import Storage +diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_importer.py cozy-1.3.0--patched/test/cozy/media/test_importer.py +--- cozy-1.3.0--orig/test/cozy/media/test_importer.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/media/test_importer.py 2024-03-03 11:52:23.633579300 +0100 @@ -2,9 +2,9 @@ import pytest @@ -616,9 +585,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_importer.py cozy-1.2.1--patche from cozy.model.library import Library -diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_player.py cozy-1.2.1--patched/test/cozy/media/test_player.py ---- cozy-1.2.1--orig/test/cozy/media/test_player.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/media/test_player.py 2022-08-21 20:24:05.036489659 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/media/test_player.py cozy-1.3.0--patched/test/cozy/media/test_player.py +--- cozy-1.3.0--orig/test/cozy/media/test_player.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/media/test_player.py 2024-03-03 11:52:23.633579300 +0100 @@ -3,9 +3,9 @@ import pytest from peewee import SqliteDatabase @@ -630,9 +599,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/media/test_player.py cozy-1.2.1--patched/ from cozy.model.library import Library from cozy.model.settings import Settings -diff -U4 -r cozy-1.2.1--orig/test/cozy/model/storage_block_list.py cozy-1.2.1--patched/test/cozy/model/storage_block_list.py ---- cozy-1.2.1--orig/test/cozy/model/storage_block_list.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/model/storage_block_list.py 2022-08-21 20:24:05.036489659 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/model/storage_block_list.py cozy-1.3.0--patched/test/cozy/model/storage_block_list.py +--- cozy-1.3.0--orig/test/cozy/model/storage_block_list.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/model/storage_block_list.py 2024-03-03 11:52:23.632579291 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -643,9 +612,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/model/storage_block_list.py cozy-1.2.1--p @pytest.fixture(autouse=True) def setup_inject(peewee_database_storage): -diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_book.py cozy-1.2.1--patched/test/cozy/model/test_book.py ---- cozy-1.2.1--orig/test/cozy/model/test_book.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/model/test_book.py 2022-08-21 20:24:05.036489659 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_book.py cozy-1.3.0--patched/test/cozy/model/test_book.py +--- cozy-1.3.0--orig/test/cozy/model/test_book.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/model/test_book.py 2024-03-03 11:52:23.633579300 +0100 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -657,9 +626,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_book.py cozy-1.2.1--patched/te @pytest.fixture(autouse=True) -diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_database_importer.py cozy-1.2.1--patched/test/cozy/model/test_database_importer.py ---- cozy-1.2.1--orig/test/cozy/model/test_database_importer.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/model/test_database_importer.py 2022-08-21 20:24:05.036489659 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_database_importer.py cozy-1.3.0--patched/test/cozy/model/test_database_importer.py +--- cozy-1.3.0--orig/test/cozy/model/test_database_importer.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/model/test_database_importer.py 2024-03-03 11:52:23.632579291 +0100 @@ -1,8 +1,8 @@ import pytest from peewee import SqliteDatabase @@ -670,9 +639,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_database_importer.py cozy-1.2. @pytest.fixture(autouse=True) def setup_inject(peewee_database): -diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_library.py cozy-1.2.1--patched/test/cozy/model/test_library.py ---- cozy-1.2.1--orig/test/cozy/model/test_library.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/model/test_library.py 2022-08-21 20:24:05.036489659 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_library.py cozy-1.3.0--patched/test/cozy/model/test_library.py +--- cozy-1.3.0--orig/test/cozy/model/test_library.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/model/test_library.py 2024-03-03 11:52:23.632579291 +0100 @@ -1,9 +1,9 @@ import pytest from peewee import SqliteDatabase @@ -684,9 +653,9 @@ diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_library.py cozy-1.2.1--patched from cozy.model.settings import Settings from test.cozy.mocks import ApplicationSettingsMock -diff -U4 -r cozy-1.2.1--orig/test/cozy/model/test_settings.py cozy-1.2.1--patched/test/cozy/model/test_settings.py ---- cozy-1.2.1--orig/test/cozy/model/test_settings.py 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/test/cozy/model/test_settings.py 2022-08-21 20:24:05.037489665 +0200 +diff -r -U4 cozy-1.3.0--orig/test/cozy/model/test_settings.py cozy-1.3.0--patched/test/cozy/model/test_settings.py +--- cozy-1.3.0--orig/test/cozy/model/test_settings.py 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/test/cozy/model/test_settings.py 2024-03-03 11:51:34.063151414 +0100 @@ -1,7 +1,7 @@ import pytest diff --git a/0001-fix-appdata-file.patch b/0001-fix-appdata-file.patch index d921548..576f10d 100644 --- a/0001-fix-appdata-file.patch +++ b/0001-fix-appdata-file.patch @@ -1,11 +1,11 @@ ---- cozy-1.2.1--orig/data/com.github.geigi.cozy.appdata.xml 2022-08-21 14:59:13.000000000 +0200 -+++ cozy-1.2.1--patched/data/com.github.geigi.cozy.appdata.xml 2022-08-21 20:29:02.793386230 +0200 -@@ -54,8 +54,9 @@ - - - - -+

    This minor release includes various assorted fixes.

    +--- cozy-1.3.0--orig/data/com.github.geigi.cozy.appdata.xml 2024-03-01 15:44:03.000000000 +0100 ++++ cozy-1.3.0--patched/data/com.github.geigi.cozy.appdata.xml 2024-03-03 11:55:41.260289799 +0100 +@@ -67,8 +67,9 @@ +     +     + + ++

    This minor release includes various assorted fixes.

    • Support for GTK style manager (thanks A6GibKm)
    • Use natural sorting for chapter titles
      • diff --git a/0002-fix-invalid-version-none.patch b/0002-fix-invalid-version-none.patch deleted file mode 100644 index c6c94eb..0000000 --- a/0002-fix-invalid-version-none.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6422aaafa9655b91f29bdb399970181ef4a888df Mon Sep 17 00:00:00 2001 -From: suve -Date: Wed, 29 Mar 2023 12:22:58 +0200 -Subject: [PATCH 1/2] Fix crash on startup - -This commit fixes the program crashing because of an uncaught exception. -The bug was triggered by app_settings.last_launched_version being -unset - which would always be the case when launching the program for -the first time! - -The bug could also be triggered by manually changing the setting -to an invalid value - e.g. by running: -$ gsettings set com.github.geigi.cozy last-launched-version 'ayy lmao' ---- - cozy/ui/widgets/whats_new_window.py | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/cozy/ui/widgets/whats_new_window.py b/cozy/ui/widgets/whats_new_window.py -index 1e80d1ef..1a79005b 100644 ---- a/cozy/ui/widgets/whats_new_window.py -+++ b/cozy/ui/widgets/whats_new_window.py -@@ -51,12 +51,16 @@ def __init__(self, **kwargs): - def _fill_window(self): - self.children = [] - -- last_launched_version = version.parse(self.app_settings.last_launched_version) -- -- if type(last_launched_version) is version.LegacyVersion: -+ try: -+ last_launched_version = version.parse(self.app_settings.last_launched_version) -+ except version.InvalidVersion: - self._fill_welcome() - else: -- self._fill_whats_new(last_launched_version) -+ if type(last_launched_version) is version.LegacyVersion: -+ self._fill_welcome() -+ else: -+ self._fill_whats_new(last_launched_version) -+ - - def _fill_welcome(self): - from cozy.ui.widgets.welcome import Welcome - -From 5dd970aafb9f50803344cf1e2c5c91751658a58e Mon Sep 17 00:00:00 2001 -From: suve -Date: Sun, 28 May 2023 12:09:02 +0200 -Subject: [PATCH 2/2] Remove usage of version.LegacyVersion - -The "packaging" module has deprecated its LegacyVersion identifier back -in 2020, finally removing it in 2021. This causes cozy to crash when -running against new version of said module, with the following error: -> AttributeError: module 'packaging.version' -> has no attribute 'LegacyVersion' ---- - cozy/ui/widgets/whats_new_window.py | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/cozy/ui/widgets/whats_new_window.py b/cozy/ui/widgets/whats_new_window.py -index 1a79005b..da3a06f9 100644 ---- a/cozy/ui/widgets/whats_new_window.py -+++ b/cozy/ui/widgets/whats_new_window.py -@@ -56,11 +56,7 @@ def _fill_window(self): - except version.InvalidVersion: - self._fill_welcome() - else: -- if type(last_launched_version) is version.LegacyVersion: -- self._fill_welcome() -- else: -- self._fill_whats_new(last_launched_version) -- -+ self._fill_whats_new(last_launched_version) - - def _fill_welcome(self): - from cozy.ui.widgets.welcome import Welcome diff --git a/cozy.spec b/cozy.spec index 2229f6b..f6d56d5 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,8 +4,8 @@ Name: cozy Summary: Modern audiobook player License: GPL-3.0-or-later -Version: 1.2.1 -Release: 8%{?dist} +Version: 1.3.0 +Release: 1%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -18,26 +18,17 @@ Patch0: 0000--unbundle-inject.patch # The appdata XML file does not pass validation Patch1: 0001-fix-appdata-file.patch -# Fix crash at startup -# See: https://bugzilla.redhat.com/show_bug.cgi?id=2182220 -# https://github.com/geigi/cozy/issues/756 -Patch2: 0002-fix-invalid-version-none.patch - BuildArch: noarch -%global req_dazzle 3.34.0 -%global req_granite 5.3.0 -%global req_gtk3 3.22 -%global req_handy 1.0.0 -%global req_meson 0.4.0 +%global req_adwaita 1.4.0 +%global req_py_inject 4.3.1 +%global req_py_peewee 3.9.6 BuildRequires: desktop-file-utils BuildRequires: glib2-devel -BuildRequires: granite-devel >= %{req_granite} -BuildRequires: gtk3-devel >= %{req_gtk3} BuildRequires: libappstream-glib -BuildRequires: libhandy1-devel >= %{req_handy} -BuildRequires: meson >= %{req_meson} +BuildRequires: libadwaita-devel >= %{req_adwaita} +BuildRequires: meson >= 0.59.0 BuildRequires: python3-devel %global with_tests 1 @@ -46,10 +37,9 @@ BuildRequires: python3-devel BuildRequires: gstreamer1-plugins-base BuildRequires: python3dist(distro) -BuildRequires: python3dist(inject) >= 4.3.1 +BuildRequires: python3dist(inject) >= %{req_py_inject} BuildRequires: python3dist(mutagen) -BuildRequires: python3dist(packaging) -BuildRequires: python3dist(peewee) >= 3.9.6 +BuildRequires: python3dist(peewee) >= %{req_py_peewee} BuildRequires: python3dist(pygobject) BuildRequires: python3dist(pytest-runner) BuildRequires: python3dist(pytest-mock) @@ -59,9 +49,7 @@ BuildRequires: python3dist(requests) Requires: file Requires: glib2 -Requires: granite >= %{req_granite} -Requires: libdazzle >= %{req_dazzle} -Requires: libhandy >= %{req_handy} +Requires: libadwaita >= %{req_adwaita} Requires: gstreamer1-plugins-bad-free Requires: gstreamer1-plugins-good Requires: gstreamer1-plugins-ugly-free @@ -70,10 +58,9 @@ Requires: hicolor-icon-theme # For whatever reason, the Python dependency generator doesn't seem to work # for this RPM, so we'll just copy-paste the BuildRequires list Requires: python3dist(distro) -Requires: python3dist(inject) >= 4.3.1 +Requires: python3dist(inject) >= %{req_py_inject} Requires: python3dist(mutagen) -Requires: python3dist(packaging) -Requires: python3dist(peewee) >= 3.9.6 +Requires: python3dist(peewee) >= %{req_py_peewee} Requires: python3dist(pygobject) Requires: python3dist(pytz) Requires: python3dist(requests) @@ -113,7 +100,6 @@ rm -rf cozy/ext/inject # Apply other patches %patch 1 -p1 -%patch 2 -p1 %build @@ -161,6 +147,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sun Mar 03 2024 Artur Frenszek-Iwicki - 1.3.0-1 +- Update to v1.3.0 +- Drop Patch2 (fix crash at startup - merged upstream) + * Wed Jan 24 2024 Fedora Release Engineering - 1.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 6493c0b..2230c1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.2.1.tar.gz) = db6c4a5ed47e139d87ca8a0d3c1d2681305ee565322209240e52acc1ac41c9669fb3ae06ca517d668e5f7a86319861089772b0d7b8f1aa22cfb5462913a9d3f5 +SHA512 (cozy-1.3.0.tar.gz) = 2e7ca481bb3ed3813814640e2685ef666063d9614cf2cfb6db9ca2f0db61f0883c8415506c3cb84b88b20e7dbf768b4cc587b5c69ea15c9db0b3411c4ea83f2d From 59985656cfcb7927621d9b87231e40222b1b63e2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 11:35:14 +0200 Subject: [PATCH 32/41] Rebuilt for Python 3.13 --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index f6d56d5..caafe23 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -147,6 +147,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Sat Jun 08 2024 Python Maint - 1.3.0-2 +- Rebuilt for Python 3.13 + * Sun Mar 03 2024 Artur Frenszek-Iwicki - 1.3.0-1 - Update to v1.3.0 - Drop Patch2 (fix crash at startup - merged upstream) From 7721fa40ea65216d0e4fd546f5dcde6b5ae886a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:03:41 +0000 Subject: [PATCH 33/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index caafe23..daa0708 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -147,6 +147,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 1.3.0-2 - Rebuilt for Python 3.13 From 29fb9b34e40ac0cd430c45754d173cb12dd29844 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:40:22 +0000 Subject: [PATCH 34/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index daa0708..0979bfd 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -147,6 +147,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4ae24022e1fc67a34efab847afeb487d0a272899 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 12 Feb 2025 15:39:52 -0500 Subject: [PATCH 35/41] Remove spurious BuildRequires on python-pytest-runner --- cozy.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cozy.spec b/cozy.spec index 0979bfd..6e3f103 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -41,7 +41,6 @@ BuildRequires: python3dist(inject) >= %{req_py_inject} BuildRequires: python3dist(mutagen) BuildRequires: python3dist(peewee) >= %{req_py_peewee} BuildRequires: python3dist(pygobject) -BuildRequires: python3dist(pytest-runner) BuildRequires: python3dist(pytest-mock) BuildRequires: python3dist(pytz) BuildRequires: python3dist(requests) @@ -147,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Feb 12 2025 Benjamin A. Beasley - 1.3.0-5 +- Remove spurious BuildRequires on python-pytest-runner + * Thu Jan 16 2025 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c52ed82d0201758ff32f5b0061d09f6d00be191c Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 12 Mar 2025 10:03:25 -0500 Subject: [PATCH 36/41] gstreamer1-plugins-bad-free rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 6e3f103..5e4b256 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -146,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Mar 12 2025 Gwyn Ciesla - 1.3.0-6 +- gstreamer1-plugins-bad-free rebuild + * Wed Feb 12 2025 Benjamin A. Beasley - 1.3.0-5 - Remove spurious BuildRequires on python-pytest-runner From d84606a2b7cc4e7d1706f363aa75e4c57c6701cc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 17 Jun 2025 21:48:51 +0200 Subject: [PATCH 37/41] Rebuilt for Python 3.14 --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 5e4b256..e9658b6 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 6%{?dist} +Release: 7%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -146,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Tue Jun 17 2025 Python Maint - 1.3.0-7 +- Rebuilt for Python 3.14 + * Wed Mar 12 2025 Gwyn Ciesla - 1.3.0-6 - gstreamer1-plugins-bad-free rebuild From 61c3d2002de16dc2b7090bdc810cf29ae42e71ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:44:15 +0000 Subject: [PATCH 38/41] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index e9658b6..765b816 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -146,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 17 2025 Python Maint - 1.3.0-7 - Rebuilt for Python 3.14 From 55e1a90fe8a74edd7f04e41d347488224ce10854 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:43:07 +0200 Subject: [PATCH 39/41] Rebuilt for Python 3.14.0rc2 bytecode --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 765b816..368c204 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -146,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Aug 15 2025 Python Maint - 1.3.0-9 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.3.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d4895992c44257a74efe96288f17871ff14df157 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:12:30 +0200 Subject: [PATCH 40/41] Rebuilt for Python 3.14.0rc3 bytecode --- cozy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cozy.spec b/cozy.spec index 368c204..9a31296 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 9%{?dist} +Release: 10%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -146,6 +146,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Sep 19 2025 Python Maint - 1.3.0-10 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.3.0-9 - Rebuilt for Python 3.14.0rc2 bytecode From f3eec8b9f61fd6bfe6ebed270d022b0052cf4ddc Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 11 Dec 2025 23:48:51 -0500 Subject: [PATCH 41/41] Drop gstreamer1-plugins-ugly-free dependency This made sense long ago, as that is where the MP3 decoder elements were first made available in Fedora. Since then, they have moved to -good, and not much is left in -ugly-free that would make it mandatory. --- cozy.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cozy.spec b/cozy.spec index 9a31296..cc6fc31 100644 --- a/cozy.spec +++ b/cozy.spec @@ -5,7 +5,7 @@ Summary: Modern audiobook player License: GPL-3.0-or-later Version: 1.3.0 -Release: 10%{?dist} +Release: 11%{?dist} URL: https://cozy.geigi.de Source0: https://github.com/geigi/%{name}/archive/%{version}/%{name}-%{version}.tar.gz @@ -51,7 +51,6 @@ Requires: glib2 Requires: libadwaita >= %{req_adwaita} Requires: gstreamer1-plugins-bad-free Requires: gstreamer1-plugins-good -Requires: gstreamer1-plugins-ugly-free Requires: hicolor-icon-theme # For whatever reason, the Python dependency generator doesn't seem to work @@ -146,6 +145,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{rtld_name}.desktop %changelog +* Fri Dec 12 2025 Yaakov Selkowitz - 1.3.0-11 +- Drop gstreamer1-plugins-ugly-free dependency + * Fri Sep 19 2025 Python Maint - 1.3.0-10 - Rebuilt for Python 3.14.0rc3 bytecode