diff --git a/6.15.13.tar.gz b/6.15.13.tar.gz deleted file mode 100644 index 15ee1e5..0000000 --- a/6.15.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c93d3c2511d33c44fb5dbb0dce5ceaf500b3ae6fd2f0a8b2c6f2eb95f0f41005 -size 1887119 diff --git a/6.15.15.tar.gz b/6.15.15.tar.gz new file mode 100644 index 0000000..bff5f8f --- /dev/null +++ b/6.15.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1cdafa14a739f739324a0ab6c982f2ca8b546b324abbf1212a8abe77dcbaac7 +size 1889568 diff --git a/python-cx_Freeze.changes b/python-cx_Freeze.changes index 058e29b..437a27b 100644 --- a/python-cx_Freeze.changes +++ b/python-cx_Freeze.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 21 08:52:26 UTC 2024 - Daniel Garcia + +- Add python312.patch, gh#marcelotduarte/cx_Freeze#1925 +- update to 6.15.15: + * **Full Changelog**: https://github.com/marcelotduarte/cx_Freeze/compare/6.15.13...6.15.15 + ------------------------------------------------------------------- Tue Jan 30 12:27:28 UTC 2024 - Dirk Müller diff --git a/python-cx_Freeze.spec b/python-cx_Freeze.spec index 2c4d0b2..e31779d 100644 --- a/python-cx_Freeze.spec +++ b/python-cx_Freeze.spec @@ -18,12 +18,14 @@ %define oldpython python Name: python-cx_Freeze -Version: 6.15.13 +Version: 6.15.15 Release: 0 Summary: Scripts to create standalone executables from Python scripts License: Python-2.0 URL: https://github.com/anthony-tuininga/cx_Freeze Source: https://github.com/anthony-tuininga/cx_Freeze/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM python312.patch gh#marcelotduarte/cx_Freeze#1925 +Patch1: python312.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module devel} BuildRequires: %{python_module hatchling} diff --git a/python312.patch b/python312.patch new file mode 100644 index 0000000..37ad145 --- /dev/null +++ b/python312.patch @@ -0,0 +1,36 @@ +Index: cx_Freeze-6.15.15/cx_Freeze/finder.py +=================================================================== +--- cx_Freeze-6.15.15.orig/cx_Freeze/finder.py ++++ cx_Freeze-6.15.15/cx_Freeze/finder.py +@@ -30,7 +30,10 @@ EXTENDED_ARG = opcode.opmap["EXTENDED_AR + LOAD_CONST = opcode.opmap["LOAD_CONST"] + IMPORT_NAME = opcode.opmap["IMPORT_NAME"] + IMPORT_FROM = opcode.opmap["IMPORT_FROM"] +-IMPORT_STAR = opcode.opmap["IMPORT_STAR"] ++# Python 3.12+ uses CALL_INTRINSIC_1 with argument 2 ++IMPORT_STAR = ( ++ opcode.opmap.get("IMPORT_STAR") or opcode.opmap["CALL_INTRINSIC_1"] ++) + STORE_FAST = opcode.opmap["STORE_FAST"] + STORE_NAME = opcode.opmap["STORE_NAME"] + STORE_GLOBAL = opcode.opmap["STORE_GLOBAL"] +@@ -637,6 +640,7 @@ class ModuleFinder: + # import * statement: copy all global names + elif ( + opc == IMPORT_STAR ++ and (arg == 2 if opc > HAVE_ARGUMENT else None) + and top_level + and imported_module is not None + ): +Index: cx_Freeze-6.15.15/pyproject.toml +=================================================================== +--- cx_Freeze-6.15.15.orig/pyproject.toml ++++ cx_Freeze-6.15.15/pyproject.toml +@@ -31,6 +31,7 @@ classifiers = [ + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", ++ "Programming Language :: Python :: 3.12", + "Topic :: Software Development :: Build Tools", + "Topic :: Software Development :: Libraries :: Python Modules", + "Topic :: System :: Software Distribution",