Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Artur Frenszek-Iwicki
67faeb1c39 Fix crash at startup and file conflicts 2023-03-28 08:18:19 +02:00
2 changed files with 41 additions and 2 deletions

View file

@ -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

View file

@ -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 <fedora@svgames.pl> - 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 <fedora@svgames.pl> - 1.2.1-1
- Update to v1.2.1