update audio/cozy

2024-04-19 Thread Solene Rapenne
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..000
--- 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.${
 

Re: update audio/cozy

2023-05-08 Thread Stefan Hagen
Solène Rapenne wrote (2023-05-07 20:10 CEST):
> Le Sun, 7 May 2023 17:26:19 +0200,
> Stefan Hagen  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 :)

Heh ;) Now I got futher and got this error (fix below):

$ cozy
['/usr/local/bin/cozy']
21:48:27 [MainThread  ] [applicatio] [INFO ]  ('openbsd', '7.3', '')
21:48:27 [MainThread  ] [applicatio] [INFO ]  Starting up cozy 1.2.1
21:48:27 [MainThread  ] [db] [INFO ]  SQLite version: 3.41.2
21:48:27 [Thread-1 (ru] [peewee.sql] [INFO ]  writer received shutdown request, 
exiting.
21:48:27 [MainThread  ] [applicatio] [INFO ]  libhandy version: 1
21:48:28 [MainThread  ] [root  ] [INFO ]  Starting import
21:48:28 [MainThread  ] [timing] [INFO ]  _count_files_to_scan function 
took 1.509 ms
21:48:28 [MainThread  ] [root  ] [INFO ]  Import finished
21:48:28 [MainThread  ] [timing] [INFO ]  scan function took 80.336 ms
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 
54, in __init__
self.library_view: LibraryView = LibraryView(main_window_builder)
  File "/usr/local/lib/python3.10/site-packages/cozy/ui/library_view.py", line 
30, in __init__
self._connect_ui_elements()
  File "/usr/local/lib/python3.10/site-packages/cozy/ui/library_view.py", line 
53, in _connect_ui_elements
self._book_box.set_sort_func(self._view_model.display_book_sort)
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 274, in __get__
return instance(self._cls)
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 407, in instance
return get_injector_or_die().get_instance(cls)
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 217, in get_instance
return binding()
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 264, in __call__
self._instance = self._constructor()
  File "/usr/local/lib/python3.10/site-packages/cozy/app_controller.py", line 
98, in 
binder.bind_to_constructor(LibraryViewModel, lambda: LibraryViewModel())
  File 
"/usr/local/lib/python3.10/site-packages/cozy/view_model/library_view_model.py",
 line 56, in __init__
self._connect()
  File 
"/usr/local/lib/python3.10/site-packages/cozy/view_model/library_view_model.py",
 line 62, in _connect
self._player.add_listener(self._on_player_event)
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 274, in __get__
return instance(self._cls)
  File "/usr/local/lib/python3.10/site-packages/cozy/ext/inject/__init__.py", 
line 407, in instance
return 

Re: update audio/cozy

2023-05-07 Thread Solène Rapenne
Le Sun, 7 May 2023 17:26:19 +0200,
Stefan Hagen  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
--- Makefile24 Apr 2023 11:40:34 -  1.4
+++ Makefile7 May 2023 13:28:19 -
@@ -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
--- distinfo8 Dec 2021 20:34:13 -   1.1.1.1
+++ distinfo7 May 2023 13:01:16 -
@@ -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 -  1.2
+++ pkg/PLIST   7 May 2023 13:03:18 -
@@ -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
 

Re: update audio/cozy

2023-05-07 Thread Stefan Hagen
Solène Rapenne wrote (2023-05-07 15:39 CEST):
> this updates cozy to latest version
> 
> pygobject isn't required anymore, a few other python are now required
> for runtime. I included a patch that isn't merged in upstream yet, but
> without it you can't start cozy at all, except if you want to have to
> set 2 variables in your gsettings

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

> Index: Makefile
> ===
> RCS file: /home/cvs/ports/audio/cozy/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- Makefile  24 Apr 2023 11:40:34 -  1.4
> +++ Makefile  7 May 2023 13:28:19 -
> @@ -2,8 +2,7 @@
>  
>  GH_ACCOUNT = geigi
>  GH_PROJECT = cozy
> -GH_TAGNAME = 1.1.2
> -REVISION =   1
> +GH_TAGNAME = 1.2.1
>  
>  CATEGORIES = audio
>  
> @@ -18,7 +17,6 @@
>  
>  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 @@
>  
>  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 -r1.1.1.1 distinfo
> --- distinfo  8 Dec 2021 20:34:13 -   1.1.1.1
> +++ distinfo  7 May 2023 13:01:16 -
> @@ -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 -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 18:20:07 -  1.2
> +++ pkg/PLIST 7 May 2023 13:03:18 -
> @@ -53,6 +53,7 @@
>  
> 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
>  
> 

update audio/cozy

2023-05-07 Thread Solène Rapenne
this updates cozy to latest version

pygobject isn't required anymore, a few other python are now required
for runtime. I included a patch that isn't merged in upstream yet, but
without it you can't start cozy at all, except if you want to have to
set 2 variables in your gsettings

Index: Makefile
===
RCS file: /home/cvs/ports/audio/cozy/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile24 Apr 2023 11:40:34 -  1.4
+++ Makefile7 May 2023 13:28:19 -
@@ -2,8 +2,7 @@
 
 GH_ACCOUNT =   geigi
 GH_PROJECT =   cozy
-GH_TAGNAME =   1.1.2
-REVISION = 1
+GH_TAGNAME =   1.2.1
 
 CATEGORIES =   audio
 
@@ -18,7 +17,6 @@
 
 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 @@
 
 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 -r1.1.1.1 distinfo
--- distinfo8 Dec 2021 20:34:13 -   1.1.1.1
+++ distinfo7 May 2023 13:01:16 -
@@ -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 -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:07 -  1.2
+++ pkg/PLIST   7 May 2023 13:03:18 -
@@ -53,6 +53,7 @@
 
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/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/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/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/cozy/ui/${MODPY_PYCACHE}media_controller.${MODPY_PYC_MAGIC_TAG}pyc