cozy got a new release after 2 years, including a commit we backported to prevent a crash. This version has a slightly new UI, works fine for me.
ok? diff --git a/audio/cozy/Makefile b/audio/cozy/Makefile index 9491989b6a1..8e4a9fc02ef 100644 --- a/audio/cozy/Makefile +++ b/audio/cozy/Makefile @@ -2,7 +2,7 @@ COMMENT = gtk3 audiobook player GH_ACCOUNT = geigi GH_PROJECT = cozy -GH_TAGNAME = 1.2.1 +GH_TAGNAME = 1.3.0 CATEGORIES = audio diff --git a/audio/cozy/distinfo b/audio/cozy/distinfo index 4cc6807fb30..c2a3efae4eb 100644 --- a/audio/cozy/distinfo +++ b/audio/cozy/distinfo @@ -1,2 +1,2 @@ -SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ= -SIZE (cozy-1.2.1.tar.gz) = 831167 +SHA256 (cozy-1.3.0.tar.gz) = tOXUOPXT9dI2pJ8/y0M8pPpInX1ZlZYaXZZ5ULu2wQI= +SIZE (cozy-1.3.0.tar.gz) = 332173 diff --git a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py b/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py deleted file mode 100644 index 84f2f21a875..00000000000 --- a/audio/cozy/patches/patch-cozy_ui_widgets_whats_new_window_py +++ /dev/null @@ -1,28 +0,0 @@ -this patch is required to make coyz run, until the following commit gets merged upstream -https://github.com/geigi/cozy/pull/762 - -diff --git a/cozy/ui/widgets/whats_new_window.py b/cozy/ui/widgets/whats_new_window.py -index 1e80d1ef..1a79005b 100644 ---- cozy/ui/widgets/whats_new_window.py -+++ 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 diff --git a/audio/cozy/pkg/PLIST b/audio/cozy/pkg/PLIST index 2e725b67027..0f9e2028bd6 100644 --- a/audio/cozy/pkg/PLIST +++ b/audio/cozy/pkg/PLIST @@ -87,10 +87,8 @@ lib/python${MODPY_VERSION}/site-packages/cozy/extensions/ lib/python${MODPY_VERSION}/site-packages/cozy/extensions/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}gtk_widget.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}is_same_book.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/extensions/${MODPY_PYCACHE}set.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/extensions/gtk_widget.py lib/python${MODPY_VERSION}/site-packages/cozy/extensions/is_same_book.py lib/python${MODPY_VERSION}/site-packages/cozy/extensions/set.py lib/python${MODPY_VERSION}/site-packages/cozy/media/ @@ -122,7 +120,6 @@ lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}chapter.${MO lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}database_importer.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}library.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}single_file_chapter.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/model/book.py @@ -130,7 +127,6 @@ lib/python${MODPY_VERSION}/site-packages/cozy/model/chapter.py lib/python${MODPY_VERSION}/site-packages/cozy/model/database_importer.py lib/python${MODPY_VERSION}/site-packages/cozy/model/library.py lib/python${MODPY_VERSION}/site-packages/cozy/model/settings.py -lib/python${MODPY_VERSION}/site-packages/cozy/model/single_file_chapter.py lib/python${MODPY_VERSION}/site-packages/cozy/model/storage.py lib/python${MODPY_VERSION}/site-packages/cozy/model/track.py lib/python${MODPY_VERSION}/site-packages/cozy/open_view.py @@ -159,17 +155,14 @@ lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}disk_element.${ lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}file_not_found_dialog.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}headerbar.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}import_failed_dialog.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}info_banner.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}library_view.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}list_box_row_with_data.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}list_box_separator_row.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}main_view.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}media_controller.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}media_controller_big.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}media_controller_small.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}preferences_view.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}search_view.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}toaster.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/app_view.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/book_detail_view.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/chapter_element.py @@ -179,59 +172,44 @@ lib/python${MODPY_VERSION}/site-packages/cozy/ui/disk_element.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/file_not_found_dialog.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/headerbar.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/import_failed_dialog.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/info_banner.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/library_view.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/list_box_row_with_data.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/list_box_separator_row.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/main_view.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/media_controller.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/media_controller_big.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/media_controller_small.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/preferences_view.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/search_view.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/warnings.py +lib/python${MODPY_VERSION}/site-packages/cozy/ui/toaster.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/ -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/ScrollWrapper.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}/ -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}ScrollWrapper.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}album_art.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}album_element.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}book_element.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}book_row.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}error_reporting.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}filter_list_box.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}first_import_button.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}list_box_extensions.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}playback_speed_popover.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}progress_popover.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}search_results.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}seek_bar.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}sleep_timer.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}storage_list_box_row.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}welcome.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}whats_new_importer.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}whats_new_library.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}whats_new_m4b.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}whats_new_m4b_chapter.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}whats_new_window.${MODPY_PYC_MAGIC_TAG}pyc -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/album_art.py +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/${MODPY_PYCACHE}storages.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/album_element.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/book_element.py +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/book_row.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/error_reporting.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/filter_list_box.py +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/first_import_button.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/list_box_extensions.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/playback_speed_popover.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/progress_popover.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/search_results.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/seek_bar.py lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/sleep_timer.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/storage_list_box_row.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/welcome.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/whats_new_importer.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/whats_new_library.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/whats_new_m4b.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/whats_new_m4b_chapter.py -lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/whats_new_window.py +lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/storages.py lib/python${MODPY_VERSION}/site-packages/cozy/version.py lib/python${MODPY_VERSION}/site-packages/cozy/view.py lib/python${MODPY_VERSION}/site-packages/cozy/view_model/ @@ -247,6 +225,7 @@ lib/python${MODPY_VERSION}/site-packages/cozy/view_model/${MODPY_PYCACHE}playbac lib/python${MODPY_VERSION}/site-packages/cozy/view_model/${MODPY_PYCACHE}search_view_model.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/view_model/${MODPY_PYCACHE}settings_view_model.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/view_model/${MODPY_PYCACHE}sleep_timer_view_model.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/cozy/view_model/${MODPY_PYCACHE}storages_view_model.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/cozy/view_model/app_view_model.py lib/python${MODPY_VERSION}/site-packages/cozy/view_model/book_detail_view_model.py lib/python${MODPY_VERSION}/site-packages/cozy/view_model/headerbar_view_model.py @@ -256,49 +235,58 @@ lib/python${MODPY_VERSION}/site-packages/cozy/view_model/playback_speed_view_mod lib/python${MODPY_VERSION}/site-packages/cozy/view_model/search_view_model.py lib/python${MODPY_VERSION}/site-packages/cozy/view_model/settings_view_model.py lib/python${MODPY_VERSION}/site-packages/cozy/view_model/sleep_timer_view_model.py +lib/python${MODPY_VERSION}/site-packages/cozy/view_model/storages_view_model.py share/applications/com.github.geigi.cozy.desktop share/com.github.geigi.cozy/ -share/com.github.geigi.cozy/com.github.geigi.cozy.img.gresource +share/com.github.geigi.cozy/com.github.geigi.cozy.appdata.gresource share/com.github.geigi.cozy/com.github.geigi.cozy.ui.gresource share/glib-2.0/schemas/com.github.geigi.cozy.gschema.xml -share/icons/hicolor/scalable/actions/account-symbolic.svg share/icons/hicolor/scalable/actions/bed-symbolic.svg share/icons/hicolor/scalable/actions/book-alert-symbolic.svg share/icons/hicolor/scalable/actions/book-open-variant-symbolic.svg -share/icons/hicolor/scalable/actions/checkmark-symbolic.svg -share/icons/hicolor/scalable/actions/clock-outline-symbolic.svg +share/icons/hicolor/scalable/actions/check-plain-symbolic.svg share/icons/hicolor/scalable/actions/download-symbolic.svg share/icons/hicolor/scalable/actions/downloaded-symbolic.svg share/icons/hicolor/scalable/actions/harddisk-symbolic.svg -share/icons/hicolor/scalable/actions/info-symbolic.svg -share/icons/hicolor/scalable/actions/message-flash-symbolic.svg -share/icons/hicolor/scalable/actions/microphone-symbolic.svg +share/icons/hicolor/scalable/actions/library-symbolic.svg +share/icons/hicolor/scalable/actions/loupe-large-symbolic.svg +share/icons/hicolor/scalable/actions/microphone2-symbolic.svg share/icons/hicolor/scalable/actions/no-bed-symbolic.svg share/icons/hicolor/scalable/actions/papyrus-vertical-symbolic.svg -share/icons/hicolor/scalable/actions/pause-symbolic.svg -share/icons/hicolor/scalable/actions/play-symbolic.svg +share/icons/hicolor/scalable/actions/person-symbolic.svg share/icons/hicolor/scalable/actions/playback-speed-symbolic.svg +share/icons/hicolor/scalable/actions/recent-symbolic.svg share/icons/hicolor/scalable/actions/settings-symbolic.svg share/icons/hicolor/scalable/apps/com.github.geigi.cozy.Devel.svg share/icons/hicolor/scalable/apps/com.github.geigi.cozy.svg share/icons/hicolor/symbolic/apps/com.github.geigi.cozy-symbolic.svg +share/locale/be_BY/ +share/locale/be_BY/LC_MESSAGES/ +share/locale/be_BY/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/bg/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/cs/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/da/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/de/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/el/LC_MESSAGES/com.github.geigi.cozy.mo +share/locale/eo/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/es/LC_MESSAGES/com.github.geigi.cozy.mo +share/locale/fa_IR/ +share/locale/fa_IR/LC_MESSAGES/ +share/locale/fa_IR/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/fi/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/fr/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/gl/LC_MESSAGES/com.github.geigi.cozy.mo +share/locale/he/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/hi/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/hr/LC_MESSAGES/com.github.geigi.cozy.mo +share/locale/hu/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/it/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/ms_MY/ share/locale/ms_MY/LC_MESSAGES/ share/locale/ms_MY/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/nl/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/no/LC_MESSAGES/com.github.geigi.cozy.mo +share/locale/oc/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/pl/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/pt/LC_MESSAGES/com.github.geigi.cozy.mo share/locale/pt_BR/LC_MESSAGES/com.github.geigi.cozy.mo