From d20a3c3c4f0e97fe2c815f0e1515abc5eae3e6c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:33:20 +0000 Subject: [PATCH 01/19] 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 02/19] 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 67faeb1c39eb6900e9af5b4850a6951c17a1de43 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Tue, 28 Mar 2023 07:51:56 +0200 Subject: [PATCH 03/19] Fix crash at startup and file conflicts --- 0002-fix-invalid-version-none.patch | 23 +++++++++++++++++++++++ cozy.spec | 20 ++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 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 1395e24..85ae3af 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 @@ -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 @@ -108,6 +113,7 @@ rm -rf cozy/ext/inject # Apply other patches %patch1 -p1 +%patch2 -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,16 @@ 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-2 +- Move "actions" icons out of /usr/share/icons to avoid conflicts with other packages +- Add a patch to fix crash at startup + * Sun Aug 21 2022 Artur Frenszek-Iwicki - 1.2.1-1 - Update to v1.2.1 From a9fb01a27c7f198ea77b9ff913f985c37f864e42 Mon Sep 17 00:00:00 2001 From: Artur Frenszek-Iwicki Date: Sun, 28 May 2023 12:21:23 +0200 Subject: [PATCH 04/19] 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 10/19] 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 11/19] 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 12/19] 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 13/19] 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 14/19] 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 15/19] 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 16/19] 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 17/19] 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 18/19] 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 19/19] 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