From 85814637f1df59054910f392c2b3dc8df8498121 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:51:23 +0200 Subject: [PATCH 01/19] Rebuilt for Python 3.11 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 65b9dfe..f153e0d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.24.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.25.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Mon Jun 13 2022 Python Maint - 0-0.25.D20211016git483f4b3 +- Rebuilt for Python 3.11 + * Thu Jan 20 2022 Fedora Release Engineering - 0-0.24.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0ba9fac13561ad26e0c61ab25cb5b9e3bc182b65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:47:25 +0000 Subject: [PATCH 02/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index f153e0d..18ad2c6 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.25.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.26.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0-0.26.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 0-0.25.D20211016git483f4b3 - Rebuilt for Python 3.11 From 6c70db3d45ccaee9ee7c62d516f3ef1ff008d4a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:14:17 +0000 Subject: [PATCH 03/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 18ad2c6..969f401 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.26.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.27.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0-0.27.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0-0.26.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 45394f95d81bfdc6de1adfdfa0242670281709fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:37 +0200 Subject: [PATCH 04/19] Rebuilt for Python 3.12 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 969f401..c026b3d 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.27.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.28.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Jun 13 2023 Python Maint - 0-0.28.D20211016git483f4b3 +- Rebuilt for Python 3.12 + * Thu Jan 19 2023 Fedora Release Engineering - 0-0.27.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e97d0432e4664d3707f718cc9612ff1506933c5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:05:29 +0000 Subject: [PATCH 05/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index c026b3d..889cd20 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.28.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.29.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0-0.29.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 0-0.28.D20211016git483f4b3 - Rebuilt for Python 3.12 From bc737190e347263c26a9cb30b877f96003a0c0c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:12:09 +0000 Subject: [PATCH 06/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 889cd20..301785c 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.29.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.30.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0-0.30.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0-0.29.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b95b63eaafc1837ec0003dfe44ad8731f9065016 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:04:19 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 301785c..0c81286 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.30.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.31.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0-0.31.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0-0.30.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 70e3d8123a183e4e3bd6ecbdc719df816c3896ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:32:48 +0200 Subject: [PATCH 08/19] Rebuilt for Python 3.13 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 0c81286..ab4c204 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.31.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.32.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jun 07 2024 Python Maint - 0-0.32.D20211016git483f4b3 +- Rebuilt for Python 3.13 + * Thu Jan 25 2024 Fedora Release Engineering - 0-0.31.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8be97762fb63d38ff74710cc41753961ff00e168 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:03:32 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index ab4c204..1b66fe3 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.32.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.33.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py License: GPLv2+ @@ -226,6 +226,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0-0.33.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 0-0.32.D20211016git483f4b3 - Rebuilt for Python 3.13 From 83bf78aee870be4c6d31d32e81d5cda4a79efcf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 01:17:57 +0200 Subject: [PATCH 10/19] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mcomix3.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mcomix3.spec b/mcomix3.spec index 1b66fe3..dfc01b2 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,10 +15,11 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.33.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.34.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/multiSnow/mcomix3 # Use git repository directly - with it when modifying source # we can do it *in git repository* and then we can directly submit @@ -226,6 +227,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0-0.34.D20211016git483f4b3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0-0.33.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 641a51345735967016f92fd0ffd15977226afefe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 17 Aug 2024 13:43:15 +0900 Subject: [PATCH 11/19] Workaround for zip archiver for contents info Workaround for zip archiver for contents info Workaround for zip archiver for contents info --- ...nd-on-zip-archiver-for-contents-info.patch | 29 +++++++++++++++++++ mcomix3.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0004-Workaround-on-zip-archiver-for-contents-info.patch diff --git a/0004-Workaround-on-zip-archiver-for-contents-info.patch b/0004-Workaround-on-zip-archiver-for-contents-info.patch new file mode 100644 index 0000000..bac20a9 --- /dev/null +++ b/0004-Workaround-on-zip-archiver-for-contents-info.patch @@ -0,0 +1,29 @@ +From 8fcab042bb7c7c8d012a07515e276a3b5e7df5da Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sat, 17 Aug 2024 12:53:56 +0900 +Subject: [PATCH] Workaround on zip archiver for contents info + +--- + mcomix/mcomix/archive/zip_py.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/archive/zip_py.py b/mcomix/mcomix/archive/zip_py.py +index f579759..41fd8ac 100644 +--- a/mcomix/mcomix/archive/zip_py.py ++++ b/mcomix/mcomix/archive/zip_py.py +@@ -38,7 +38,11 @@ class ZipArchive(archive_base.NonUnicodeArchive): + else: + # zipfile use cp437 to decode non-utf8 filename + # revert to bytes before guessing encode +- fn_bytes = info.filename.encode('cp437') ++ try: ++ fn_bytes = info.filename.encode('cp437') ++ except UnicodeEncodeError: ++ # try as it is ++ fn_bytes = info.filename + self._contents_info[self._unicode_filename(fn_bytes)] = info + + self.is_encrypted = self._has_encryption() +-- +2.46.0 + diff --git a/mcomix3.spec b/mcomix3.spec index dfc01b2..a7bb305 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.34.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.35.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -32,6 +32,7 @@ Source2: mcomix3starter.sh.in # Patches Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch +Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -81,6 +82,7 @@ git checkout -b %{version}-%{release}-fedora %{gitcommit} # Apply patches cat %{PATCH2} | git am cat %{PATCH3} | git am +cat %{PATCH4} | git am %build pushd %{name} @@ -227,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat Aug 17 2024 Mamoru TASAKA - 0-0.35.D20211016git483f4b3 +- Workaround for zip archiver for contents info + * Fri Jul 26 2024 Miroslav Suchý - 0-0.34.D20211016git483f4b3 - convert license to SPDX From 496d2f0808a01c5aee94639e7dc808307e8dd5a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:17:46 +0000 Subject: [PATCH 12/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index a7bb305..a326b2c 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.35.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.36.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0-0.36.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Aug 17 2024 Mamoru TASAKA - 0-0.35.D20211016git483f4b3 - Workaround for zip archiver for contents info From a8d291b99fd9ba231ae9d35bd392c674c397720a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:57:44 +0200 Subject: [PATCH 13/19] Rebuilt for Python 3.14 --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index a326b2c..f1e3246 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.36.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.37.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -229,6 +229,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Mon Jun 02 2025 Python Maint - 0-0.37.D20211016git483f4b3 +- Rebuilt for Python 3.14 + * Fri Jan 17 2025 Fedora Release Engineering - 0-0.36.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e5d9746438b818524fae3d1d36641c6d20e577a6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 3 Jun 2025 14:50:13 +0900 Subject: [PATCH 14/19] Rescue when creating thumbnail fails in load_pixbuf_size (ref: bug 2368354, 2369016) --- ...ting-thumbnail-fails-in-load_pixbuf_.patch | 44 +++++++++++++++++++ mcomix3.spec | 10 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch diff --git a/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch b/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch new file mode 100644 index 0000000..fc69844 --- /dev/null +++ b/0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch @@ -0,0 +1,44 @@ +From 31f6d516fc044d4748dac98ab6117035d938389e Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Tue, 3 Jun 2025 14:02:01 +0900 +Subject: [PATCH] Rescue when creating thumbnail fails in load_pixbuf_size + +--- + mcomix/mcomix/thumbnail_tools.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/mcomix/mcomix/thumbnail_tools.py b/mcomix/mcomix/thumbnail_tools.py +index 35b4692..3b51cd2 100644 +--- a/mcomix/mcomix/thumbnail_tools.py ++++ b/mcomix/mcomix/thumbnail_tools.py +@@ -142,8 +142,11 @@ class Thumbnailer(object): + if not os.path.isfile(image_path): + return None, None + +- pixbuf = image_tools.load_pixbuf_size(image_path, self.width, self.height) +- if self.store_on_disk: ++ try: ++ pixbuf = image_tools.load_pixbuf_size(image_path, self.width, self.height) ++ except: ++ pixbuf = None ++ if pixbuf and self.store_on_disk: + tEXt_data = self._get_text_data(image_path) + # Use the archive's mTime instead of the extracted file's mtime + tEXt_data['tEXt::Thumb::MTime'] = str(os.stat(filepath).st_mtime) +@@ -153,8 +156,11 @@ class Thumbnailer(object): + return pixbuf, tEXt_data + + elif image_tools.is_image_file(filepath, check_mimetype=True): +- pixbuf = image_tools.load_pixbuf_size(filepath, self.width, self.height) +- if self.store_on_disk: ++ try: ++ pixbuf = image_tools.load_pixbuf_size(filepath, self.width, self.height) ++ except: ++ pixbuf = None ++ if pixbuf and self.store_on_disk: + tEXt_data = self._get_text_data(filepath) + else: + tEXt_data = None +-- +2.49.0 + diff --git a/mcomix3.spec b/mcomix3.spec index f1e3246..17cf435 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.37.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.38.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -33,6 +33,9 @@ Source2: mcomix3starter.sh.in Patch2: 0002-Change-domain-name-for-gettext.patch Patch3: 0003-Search-gettext-files-in-system-wide-directory.patch Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch +# Rescue when creating thumbnail fails in load_pixbuf_size +# (ref: bug 2368354, 2369016) +Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -83,6 +86,7 @@ git checkout -b %{version}-%{release}-fedora %{gitcommit} cat %{PATCH2} | git am cat %{PATCH3} | git am cat %{PATCH4} | git am +cat %{PATCH5} | git am %build pushd %{name} @@ -229,6 +233,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Tue Jun 03 2025 Mamoru TASAKA - 0-0.38.D20211016git483f4b3 +- Rescue when creating thumbnail fails in load_pixbuf_size + (ref: bug 2368354, 2369016) + * Mon Jun 02 2025 Python Maint - 0-0.37.D20211016git483f4b3 - Rebuilt for Python 3.14 From afc871a5550f233cbc6f87a8227c6592b67ae8ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:28:14 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 17cf435..5b1a414 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.38.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.39.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -233,6 +233,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0-0.39.D20211016git483f4b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Mamoru TASAKA - 0-0.38.D20211016git483f4b3 - Rescue when creating thumbnail fails in load_pixbuf_size (ref: bug 2368354, 2369016) From 1f57b9ef702b8e6cf3bcf4dfd4c0b2353bbc0067 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:59:18 +0200 Subject: [PATCH 16/19] Rebuilt for Python 3.14.0rc2 bytecode --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index 5b1a414..e621ebf 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.39.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.40.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -233,6 +233,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Aug 15 2025 Python Maint - 0-0.40.D20211016git483f4b3 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 24 2025 Fedora Release Engineering - 0-0.39.D20211016git483f4b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ac83115f870ffade44b92ad121d5687cceb56ab2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 20 Aug 2025 17:24:48 +0900 Subject: [PATCH 17/19] sqlite3.py: support python 3.14 --- 0006-sqlite3.py-support-python-3.14.patch | 27 +++++++++++++++++++++++ mcomix3.spec | 9 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0006-sqlite3.py-support-python-3.14.patch diff --git a/0006-sqlite3.py-support-python-3.14.patch b/0006-sqlite3.py-support-python-3.14.patch new file mode 100644 index 0000000..7b2a899 --- /dev/null +++ b/0006-sqlite3.py-support-python-3.14.patch @@ -0,0 +1,27 @@ +From 077f2ad403bfc47ceb4e4961ad9a4fb1e883d904 Mon Sep 17 00:00:00 2001 +From: mcomix3 Fedora maintainer +Date: Wed, 20 Aug 2025 17:20:58 +0900 +Subject: [PATCH] sqlite3.py: support python 3.14 + +ref: https://github.com/python/cpython/issues/93370 +sqlite3.version is deprecated +--- + mcomix/mcomix/sqlite3.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/sqlite3.py b/mcomix/mcomix/sqlite3.py +index 212cc84..58608bf 100644 +--- a/mcomix/mcomix/sqlite3.py ++++ b/mcomix/mcomix/sqlite3.py +@@ -2,7 +2,7 @@ from mcomix import log + + try: + import sqlite3 +- log.debug(f'SQLite: {sqlite3.sqlite_version} sqlite3 version: {sqlite3.version}') ++ log.debug(f'SQLite: {sqlite3.sqlite_version} sqlite3 version: {sqlite3.sqlite_version}') + except ImportError: + log.warning( _('! Could find sqlite3.') ) + sqlite3 = None +-- +2.50.1 + diff --git a/mcomix3.spec b/mcomix3.spec index e621ebf..e9cef51 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.40.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.41.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -36,6 +36,9 @@ Patch4: 0004-Workaround-on-zip-archiver-for-contents-info.patch # Rescue when creating thumbnail fails in load_pixbuf_size # (ref: bug 2368354, 2369016) Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch +# sqlite3.py: support python 3.14 +# ref: https://github.com/python/cpython/issues/9337 +Patch6: 0006-sqlite3.py-support-python-3.14.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -87,6 +90,7 @@ cat %{PATCH2} | git am cat %{PATCH3} | git am cat %{PATCH4} | git am cat %{PATCH5} | git am +cat %{PATCH6} | git am %build pushd %{name} @@ -233,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Wed Aug 20 2025 Mamoru TASAKA - 0-0.41.D20211016git483f4b3 +- sqlite3.py: support python 3.14 + * Fri Aug 15 2025 Python Maint - 0-0.40.D20211016git483f4b3 - Rebuilt for Python 3.14.0rc2 bytecode From 105894769134d481ec44df1707670b2495471e4f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:30:09 +0200 Subject: [PATCH 18/19] Rebuilt for Python 3.14.0rc3 bytecode --- mcomix3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mcomix3.spec b/mcomix3.spec index e9cef51..82fd420 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.41.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.42.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -237,6 +237,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Fri Sep 19 2025 Python Maint - 0-0.42.D20211016git483f4b3 +- Rebuilt for Python 3.14.0rc3 bytecode + * Wed Aug 20 2025 Mamoru TASAKA - 0-0.41.D20211016git483f4b3 - sqlite3.py: support python 3.14 From e39763d45da90d73fd43fb78b424a088ee2a0ef9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 3 Jan 2026 17:42:35 +0900 Subject: [PATCH 19/19] Restore space / pageup button behavior (bug 2426924) --- ...store-space-pageup-button-behavior-i.patch | 29 +++++++++++++++++++ mcomix3.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0007-Workaround-to-restore-space-pageup-button-behavior-i.patch diff --git a/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch new file mode 100644 index 0000000..f3df5dd --- /dev/null +++ b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch @@ -0,0 +1,29 @@ +From 2c49b1239bde5c789aea1a03beb098539ee01e49 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Sat, 3 Jan 2026 17:36:44 +0900 +Subject: [PATCH] Workaround to restore space / pageup button behavior in + recent GTK + +--- + mcomix/mcomix/keybindings.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mcomix/mcomix/keybindings.py b/mcomix/mcomix/keybindings.py +index 02c586f..725cc82 100644 +--- a/mcomix/mcomix/keybindings.py ++++ b/mcomix/mcomix/keybindings.py +@@ -165,7 +165,10 @@ class _KeybindingManager(object): + # so limit possible states to begin with? + for stored_binding, action in self._binding_to_action.items(): + stored_keycode, stored_flags = stored_binding +- if stored_keycode == keybinding[0] and stored_flags & keybinding[1]: ++ if stored_keycode == keybinding[0] and ( ++ (stored_flags & keybinding[1]) or ++ ((not stored_flags) and (not keybinding[1])) ++ ): + func, args, kwargs = self._action_to_callback[action] + self._window.stop_emission_by_name('key_press_event') + return func(*args, **kwargs) +-- +2.52.0 + diff --git a/mcomix3.spec b/mcomix3.spec index 82fd420..ea05906 100644 --- a/mcomix3.spec +++ b/mcomix3.spec @@ -15,7 +15,7 @@ It has been forked from the original MComix project and ported to python3. Name: mcomix3 # For now, choose version 0 Version: 0 -Release: 0.42.D%{gitdate}git%{shortcommit}%{?dist} +Release: 0.43.D%{gitdate}git%{shortcommit}%{?dist} Summary: %base_summary # GPL version info is from mcomix/mcomixstarter.py # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -39,6 +39,9 @@ Patch5: 0005-Rescue-when-creating-thumbnail-fails-in-load_pixbuf_.patch # sqlite3.py: support python 3.14 # ref: https://github.com/python/cpython/issues/9337 Patch6: 0006-sqlite3.py-support-python-3.14.patch +# Restore space / pageup button behavior in recent GTK +# (ref: bug 2426924 +Patch7: 0007-Workaround-to-restore-space-pageup-button-behavior-i.patch BuildRequires: python3-devel BuildRequires: %{_bindir}/appstream-util @@ -91,6 +94,7 @@ cat %{PATCH3} | git am cat %{PATCH4} | git am cat %{PATCH5} | git am cat %{PATCH6} | git am +cat %{PATCH7} | git am %build pushd %{name} @@ -237,6 +241,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdat %changelog +* Sat Jan 03 2026 Mamoru TASAKA - 0-0.43.D20211016git483f4b3 +- Restore space / pageup button behavior (bug 2426924) + * Fri Sep 19 2025 Python Maint - 0-0.42.D20211016git483f4b3 - Rebuilt for Python 3.14.0rc3 bytecode