Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ibus-cangjie for openSUSE:Factory checked in at 2025-03-19 22:34:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-cangjie (Old) and /work/SRC/openSUSE:Factory/.ibus-cangjie.new.4956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-cangjie" Wed Mar 19 22:34:25 2025 rev:3 rq:1254465 version:2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-cangjie/ibus-cangjie.changes 2018-10-08 17:46:23.322410156 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-cangjie.new.4956/ibus-cangjie.changes 2025-03-19 22:34:50.124933842 +0100 @@ -1,0 +2,8 @@ +Wed Mar 19 15:01:17 UTC 2025 - Marguerite Su <i...@marguerite.su> + +- add ibus-cangjie-py312.patch + * FTBFS Factory + * starting from python 3.12, imp module was deprecated + and dropped, port to importlib.util instead + +------------------------------------------------------------------- New: ---- ibus-cangjie-py312.patch BETA DEBUG BEGIN: New: - add ibus-cangjie-py312.patch * FTBFS Factory BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-cangjie.spec ++++++ --- /var/tmp/diff_new_pack.K3lpuf/_old 2025-03-19 22:34:50.664956576 +0100 +++ /var/tmp/diff_new_pack.K3lpuf/_new 2025-03-19 22:34:50.664956576 +0100 @@ -1,7 +1,7 @@ # # spec file for package ibus-cangjie # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,13 +21,15 @@ Version: 2.4 Release: 0 Summary: An IBus engine for users of the Cangjie and Quick input methods -License: GPL-3.0 +License: GPL-3.0-only Group: System/I18n/Chinese -Url: http://cangjians.github.io/projects/%{name} +URL: http://cangjians.github.io/projects/%{name} Source: https://github.com/Cangjians/%{name}/releases/download/v2.4/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE fix_import_version.patch wner...@eienteiland.org # Use python3 'gi' coding import format to insure it can be built success in openSUSE build env. Patch0: ibus-cangjie-fix_import_version.patch +# PATCH-FIX-UPSTREAM -- py312 dropped imp module +Patch1: ibus-cangjie-py312.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes ++++++ ibus-cangjie-py312.patch ++++++ Index: ibus-cangjie-2.4/py-compile =================================================================== --- ibus-cangjie-2.4.orig/py-compile +++ ibus-cangjie-2.4/py-compile @@ -116,7 +116,12 @@ else fi $PYTHON -c " -import sys, os, py_compile, imp +import sys, os, py_compile + +if sys.version_info[0] == 3 and sys.version_info[1] >= 12: + import importlib +else: + import imp files = '''$files''' @@ -129,15 +134,22 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - if hasattr(imp, 'get_tag'): - py_compile.compile(filepath, imp.cache_from_source(filepath), path) + if sys.version_info[0] == 3 and sys.version_info[1] >= 12 and hasattr(importlib.util, 'cache_from_source'): + py_compile.compile(filepath, importlib.util.cache_from_source(filepath), path) + elif hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) else: py_compile.compile(filepath, filepath + 'c', path) sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " -import sys, os, py_compile, imp +import sys, os, py_compile + +if sys.version_info[0] == 3 and sys.version_info[1] >= 12: + import importlib +else: + import imp # pypy does not use .pyo optimization if hasattr(sys, 'pypy_translation_info'): @@ -153,8 +165,10 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - if hasattr(imp, 'get_tag'): - py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + if sys.version_info[0] == 3 and sys.version_info[1] >= 12 and hasattr(importlib.util, 'cache_from_source'): + py_compile.compile(filepath, importlib.util.cache_from_source(filepath, False), path) + elif hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) else: py_compile.compile(filepath, filepath + 'o', path) sys.stdout.write('\n')" 2>/dev/null || :
