Le Sun, 7 May 2023 17:26:19 +0200,
Stefan Hagen <sh+openbsd-po...@codevoid.de> a écrit :
> Solène Rapenne wrote (2023-05-07 15:39 CEST):
> [...]
>
> I think you forgot to cvs add the patch :-)
> I'm seeing:
>
> $ cozy
> ['/usr/local/bin/cozy']
> 17:23:13 [MainThread ] [applicatio] [INFO ] ('openbsd', '7.3', '')
> 17:23:13 [MainThread ] [applicatio] [INFO ] Starting up cozy 1.2.1
> 17:23:13 [MainThread ] [db ] [INFO ] SQLite version: 3.41.2
> 17:23:13 [Thread-1 (ru] [peewee.sql] [INFO ] writer received shutdown
> request, exiting.
> 17:23:13 [MainThread ] [applicatio] [INFO ] libhandy version: 1
> handle exception
> Traceback (most recent call last):
> File "/usr/local/lib/python3.10/site-packages/cozy/application.py", line
> 99, in do_activate
> self.app_controller = AppController(self, main_window_builder, self.ui)
> File
> "/usr/local/lib/python3.10/site-packages/cozy/architecture/singleton.py",
> line 5, in __call__
> cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
> File "/usr/local/lib/python3.10/site-packages/cozy/app_controller.py", line
> 52, in __init__
> self.whats_new_window: WhatsNewWindow = WhatsNewWindow()
> File
> "/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py",
> line 36, in __init__
> self._fill_window()
> File
> "/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py",
> line 54, in _fill_window
> last_launched_version =
> version.parse(self.app_settings.last_launched_version)
> File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line
> 52, in parse
> return Version(version)
> File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line
> 197, in __init__
> raise InvalidVersion(f"Invalid version: '{version}'")
> packaging.version.InvalidVersion: Invalid version: 'None'
>
> Best Regards,
> Stefan
>
> [...]
>
thanks for the -N flag for cvs diff :)
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/audio/cozy/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 24 Apr 2023 11:40:34 -0000 1.4
+++ Makefile 7 May 2023 13:28:19 -0000
@@ -2,8 +2,7 @@ COMMENT = gtk3 audiobook player
GH_ACCOUNT = geigi
GH_PROJECT = cozy
-GH_TAGNAME = 1.1.2
-REVISION = 1
+GH_TAGNAME = 1.2.1
CATEGORIES = audio
@@ -18,7 +17,6 @@ MODULES = devel/dconf \
COMMON_DEPENDS = audio/py-mutagen${MODPY_FLAVOR} \
databases/py-peewee${MODPY_FLAVOR} \
- devel/py-gobject3${MODPY_FLAVOR} \
sysutils/py-distro${MODPY_FLAVOR} \
x11/elementary/granite \
x11/libhandy
@@ -28,9 +26,15 @@ BUILD_DEPENDS = ${COMMON_DEPENDS} \
RUN_DEPENDS = ${COMMON_DEPENDS} \
devel/desktop-file-utils \
+ devel/py-tz${MODPY_FLAVOR} \
multimedia/gstreamer1/plugins-libav \
+ www/py-requests${MODPY_FLAVOR} \
x11/gnome/libdazzle \
x11/gtk+4,-guic
+
+# required for running tests
+# one failing test due to missing network
+PORTHOME= ${WRKDIR}
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/audio/cozy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Dec 2021 20:34:13 -0000 1.1.1.1
+++ distinfo 7 May 2023 13:01:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (cozy-1.1.2.tar.gz) = BBIK0XIWURsesb2zzfsLYa0VsyTUeK+sRkYWKLo0Vw4=
-SIZE (cozy-1.1.2.tar.gz) = 812775
+SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
+SIZE (cozy-1.2.1.tar.gz) = 831167
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/audio/cozy/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 18:20:07 -0000 1.2
+++ pkg/PLIST 7 May 2023 13:03:18 -0000
@@ -53,6 +53,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}artwork_cache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}book.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}collation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}model_base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}offline_cache.${MODPY_PYC_MAGIC_TAG}pyc
@@ -63,6 +64,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}track_to_file.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cozy/db/artwork_cache.py
lib/python${MODPY_VERSION}/site-packages/cozy/db/book.py
+lib/python${MODPY_VERSION}/site-packages/cozy/db/collation.py
lib/python${MODPY_VERSION}/site-packages/cozy/db/file.py
lib/python${MODPY_VERSION}/site-packages/cozy/db/model_base.py
lib/python${MODPY_VERSION}/site-packages/cozy/db/offline_cache.py
@@ -122,7 +124,6 @@ lib/python${MODPY_VERSION}/site-packages
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}storage_block_list.${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
lib/python${MODPY_VERSION}/site-packages/cozy/model/chapter.py
@@ -131,7 +132,6 @@ lib/python${MODPY_VERSION}/site-packages
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/storage_block_list.py
lib/python${MODPY_VERSION}/site-packages/cozy/model/track.py
lib/python${MODPY_VERSION}/site-packages/cozy/open_view.py
lib/python${MODPY_VERSION}/site-packages/cozy/power_manager.py
@@ -167,8 +167,8 @@ lib/python${MODPY_VERSION}/site-packages
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}settings.${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/app_view.py
lib/python${MODPY_VERSION}/site-packages/cozy/ui/book_detail_view.py
@@ -187,8 +187,8 @@ lib/python${MODPY_VERSION}/site-packages
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/settings.py
lib/python${MODPY_VERSION}/site-packages/cozy/ui/warnings.py
lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/
lib/python${MODPY_VERSION}/site-packages/cozy/ui/widgets/ScrollWrapper.py
@@ -262,19 +262,23 @@ share/com.github.geigi.cozy/com.github.g
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/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/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/speedometer-symbolic.svg
-share/icons/hicolor/scalable/actions/timer-off-symbolic.svg
-share/icons/hicolor/scalable/actions/timer-on-symbolic.svg
+share/icons/hicolor/scalable/actions/playback-speed-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
@@ -286,6 +290,7 @@ share/locale/el/LC_MESSAGES/com.github.g
share/locale/es/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/hi/LC_MESSAGES/com.github.geigi.cozy.mo
share/locale/hr/LC_MESSAGES/com.github.geigi.cozy.mo
share/locale/it/LC_MESSAGES/com.github.geigi.cozy.mo
@@ -301,10 +306,7 @@ share/locale/ru/LC_MESSAGES/com.github.g
share/locale/sv/LC_MESSAGES/com.github.geigi.cozy.mo
share/locale/tr/LC_MESSAGES/com.github.geigi.cozy.mo
share/locale/uk/LC_MESSAGES/com.github.geigi.cozy.mo
-share/locale/zh/
-share/locale/zh/LC_MESSAGES/
share/locale/zh/LC_MESSAGES/com.github.geigi.cozy.mo
-share/metainfo/
share/metainfo/com.github.geigi.cozy.appdata.xml
@tag update-desktop-database
@tag glib-compile-schemas
Index: patches/patch-cozy_ui_widgets_whats_new_window_py
===================================================================
RCS file: patches/patch-cozy_ui_widgets_whats_new_window_py
diff -N patches/patch-cozy_ui_widgets_whats_new_window_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cozy_ui_widgets_whats_new_window_py 7 May 2023 18:08:40
-0000
@@ -0,0 +1,28 @@
+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
