From afc871a5550f233cbc6f87a8227c6592b67ae8ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:28:14 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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