diff --git a/.gitignore b/.gitignore index b3740d3..aed4845 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,10 @@ /cozy-0.9.4.tar.gz /cozy-0.9.5.tar.gz /cozy-1.0.1.tar.gz +/cozy-1.0.3.tar.gz +/cozy-1.0.4.tar.gz +/cozy-1.1.0.tar.gz +/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/cozy--unbundle-inject.patch b/0000--unbundle-inject.patch similarity index 81% rename from cozy--unbundle-inject.patch rename to 0000--unbundle-inject.patch index dd5b375..05dca35 100644 --- a/cozy--unbundle-inject.patch +++ b/0000--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 @@ -78,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 @@ -91,10 +77,9 @@ 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 - -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 + 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 @@ 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 @@ -190,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 @@ -232,24 +203,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 @@ -259,20 +228,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 @@ -316,6 +272,61 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/file_not_found_dialog.py cozy-1.0.1--patched/ 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 logging + + import gi + +-from cozy.ext import inject ++import inject + 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 @@ + 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.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, Handy + from gi.repository.Gtk import Builder + +-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 -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.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 @@ -3,9 +3,9 @@ import gi @@ -326,33 +337,35 @@ diff -rU4 cozy-1.0.1--orig/cozy/ui/headerbar.py cozy-1.0.1--patched/cozy/ui/head 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 -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 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 gi.repository import Gtk - from gi.repository.Gtk import Builder + 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.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.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 -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 + from cozy.ui.widgets.error_reporting import ErrorReporting + from cozy.ui.widgets.storage_list_box_row import StorageListBoxRow --import cozy.ext.inject as inject -+import inject - from cozy.application_settings import ApplicationSettings - from cozy.architecture.event_sender import EventSender - - from cozy.control.db import books, close_db + 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 @@ -366,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 -@@ -4,9 +4,9 @@ - - 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 -+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 @@ -393,6 +392,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 @@ -444,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 @@ -499,15 +512,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 @@ -551,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 a6c6ef6..36880aa 100644 --- a/cozy.spec +++ b/cozy.spec @@ -4,7 +4,7 @@ Name: cozy Summary: Modern audiobook player License: GPLv3+ -Version: 1.0.1 +Version: 1.2.0 Release: 1%{?dist} URL: https://cozy.geigi.de @@ -12,18 +12,25 @@ 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 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: 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 -BuildRequires: xmlstarlet %global with_tests 1 @@ -44,6 +51,9 @@ BuildRequires: python3dist(requests) Requires: file Requires: glib2 +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 @@ -91,15 +101,7 @@ Here are some of the current features: 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 \ - --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" +"%{SOURCE99}" "$(pwd)" %build @@ -141,6 +143,33 @@ 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 + +* 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 + +* 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 + +* Thu Jul 29 2021 Artur Frenszek-Iwicki - 1.0.4-1 +- Update to v1.0.4 + +* Thu Jun 17 2021 Artur Frenszek-Iwicki - 1.0.3-1 +- Update to v1.0.3 + * Sun May 30 2021 Artur Frenszek-Iwicki - 1.0.1-1 - Update to v1.0.1 diff --git a/sources b/sources index 5374030..f227ac5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cozy-1.0.1.tar.gz) = 6c95735172c52531bf2cd5fdfc24dab69e93a7438a08ca2e7c29d9abac904b45bfc2aa75bedfed26cc87c68fda7977ccf6c126f50a772bfb7b6ff08c289bcec5 +SHA512 (cozy-1.2.0.tar.gz) = d3eb8063be4f7d966072fb48be23bbf71ea068a6614be55ef2ce70181c8c78e6200168a1cddc41d23406a8686c1be2e7ec9197470e9e94e6c287df45990b8056