diff --git a/0006-sqlite3.py-support-python-3.14.patch b/0006-sqlite3.py-support-python-3.14.patch deleted file mode 100644 index 7b2a899..0000000 --- a/0006-sqlite3.py-support-python-3.14.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch b/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch deleted file mode 100644 index f3df5dd..0000000 --- a/0007-Workaround-to-restore-space-pageup-button-behavior-i.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 ea05906..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.43.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. @@ -36,12 +36,6 @@ 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 -# 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 @@ -93,8 +87,6 @@ cat %{PATCH2} | git am cat %{PATCH3} | git am cat %{PATCH4} | git am cat %{PATCH5} | git am -cat %{PATCH6} | git am -cat %{PATCH7} | git am %build pushd %{name} @@ -241,21 +233,6 @@ 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 - -* 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 - -* 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)