diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-04-08 07:13:47 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-04-08 07:13:47 +0000 |
| commit | a6a2723d14d4f75c9ff0ca130d38adb96945ada5 (patch) | |
| tree | ace138fb5a1eb1ee0988577ad0689b2c01c3dabd /dev-python/wxpython | |
| parent | 63cc2c766bddbc62e012b702853544b13e1d9612 (diff) | |
| download | baldeagleos-repo-a6a2723d14d4f75c9ff0ca130d38adb96945ada5.tar.gz baldeagleos-repo-a6a2723d14d4f75c9ff0ca130d38adb96945ada5.tar.xz baldeagleos-repo-a6a2723d14d4f75c9ff0ca130d38adb96945ada5.zip | |
Adding metadata
Diffstat (limited to 'dev-python/wxpython')
| -rw-r--r-- | dev-python/wxpython/files/wxpython-4.2.4-setuptools.patch | 78 | ||||
| -rw-r--r-- | dev-python/wxpython/wxpython-4.2.4.ebuild | 1 |
2 files changed, 79 insertions, 0 deletions
diff --git a/dev-python/wxpython/files/wxpython-4.2.4-setuptools.patch b/dev-python/wxpython/files/wxpython-4.2.4-setuptools.patch new file mode 100644 index 000000000000..06e8bfd2e90e --- /dev/null +++ b/dev-python/wxpython/files/wxpython-4.2.4-setuptools.patch @@ -0,0 +1,78 @@ +https://github.com/wxWidgets/Phoenix/commit/b91db9a2eff6460dd7189e24020bff1573c63211 + +From b91db9a2eff6460dd7189e24020bff1573c63211 Mon Sep 17 00:00:00 2001 +From: Scott Talbert <swt@techie.net> +Date: Fri, 6 Feb 2026 20:31:33 -0500 +Subject: [PATCH] Fix build with setuptools 81+ + +Unfortunately distutils changed the API of copy_file and +copy_tree, so we need to replace our monkey patched versions. + +(cherry picked from commit 1dec4c8fc560795b01bb54ca5f62a598fda2d8dd) +--- + setup.py | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 71d57d699..9bcef61c5 100644 +--- a/setup.py ++++ b/setup.py +@@ -9,6 +9,7 @@ + # License: wxWindows License + #---------------------------------------------------------------------- + ++import inspect + import sys, os + import glob + import stat +@@ -260,9 +261,29 @@ def wx_copy_file(src, dst, preserve_mode=1, preserve_times=1, update=0, + os.symlink(linkdst, dst) + return (dst, 1) + ++def wx_copy_file_new(src, dst, preserve_mode=True, preserve_times=True, ++ update=False, link=None, verbose=True): ++ if not os.path.islink(src): ++ return orig_copy_file( ++ src, dst, preserve_mode, preserve_times, update, link, verbose) ++ else: ++ # make a new, matching symlink in dst ++ if os.path.isdir(dst): ++ dst = os.path.join(dst, os.path.basename(src)) ++ linkdst = os.readlink(src) ++ if verbose: ++ from distutils import log ++ log.info("%s %s -> %s", 'copying symlink', src, dst) ++ if not os.path.exists(dst): ++ os.symlink(linkdst, dst) ++ return (dst, True) ++ + import distutils.file_util + orig_copy_file = distutils.file_util.copy_file +-distutils.file_util.copy_file = wx_copy_file ++if 'dry_run' not in inspect.signature(orig_copy_file).parameters.keys(): ++ distutils.file_util.copy_file = wx_copy_file_new ++else: ++ distutils.file_util.copy_file = wx_copy_file + + + +@@ -271,9 +292,17 @@ def wx_copy_tree(src, dst, preserve_mode=1, preserve_times=1, + return orig_copy_tree( + src, dst, preserve_mode, preserve_times, 1, update, verbose, dry_run) + ++def wx_copy_tree_new(src, dst, preserve_mode=True, preserve_times=True, ++ preserve_symlinks=False, update=False, verbose=True): ++ return orig_copy_tree( ++ src, dst, preserve_mode, preserve_times, True, update, verbose) ++ + import distutils.dir_util + orig_copy_tree = distutils.dir_util.copy_tree +-distutils.dir_util.copy_tree = wx_copy_tree ++if 'dry_run' not in inspect.signature(orig_copy_tree).parameters.keys(): ++ distutils.dir_util.copy_tree = wx_copy_tree_new ++else: ++ distutils.dir_util.copy_tree = wx_copy_tree + + + # Monkey-patch make_writeable too. Sometimes the link is copied before the + diff --git a/dev-python/wxpython/wxpython-4.2.4.ebuild b/dev-python/wxpython/wxpython-4.2.4.ebuild index efe2ae19870e..cfedabd6bf02 100644 --- a/dev-python/wxpython/wxpython-4.2.4.ebuild +++ b/dev-python/wxpython/wxpython-4.2.4.ebuild @@ -58,6 +58,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.2.0-flags.patch" "${FILESDIR}/${PN}-4.2.1-x86-time.patch" "${FILESDIR}/${PN}-4.2.2-setuppy.patch" + "${FILESDIR}/${PN}-4.2.4-setuptools.patch" ) python_prepare_all() { |
