summaryrefslogtreecommitdiff
path: root/dev-python/wxpython/files
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-06-04 05:48:38 -0500
committerroot <root@alpha.trunkmasters.com>2026-06-04 05:48:38 -0500
commitbfd9c39e4712ebdb442d4ca0673061faed1e70e1 (patch)
tree0d7a74b4463ee387f9cf9368ceb1b757f694f72a /dev-python/wxpython/files
parentf716a9fe6455d39eef01e718aae68dae61c19704 (diff)
downloadbaldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.tar.gz
baldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.tar.xz
baldeagleos-repo-bfd9c39e4712ebdb442d4ca0673061faed1e70e1.zip
Revert "Adding metadata"
This reverts commit f716a9fe6455d39eef01e718aae68dae61c19704.
Diffstat (limited to 'dev-python/wxpython/files')
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.0-flags.patch16
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch27
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.1-x86-time.patch34
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch16
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch38
-rw-r--r--dev-python/wxpython/files/wxpython-4.2.4-setuptools.patch78
6 files changed, 209 insertions, 0 deletions
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-flags.patch b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
new file mode 100644
index 000000000000..12af1e211b4a
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch
@@ -0,0 +1,16 @@
+--- a/buildtools/config.py
++++ b/buildtools/config.py
+@@ -236,9 +236,12 @@ class Configuration(object):
+ for lst in [self.cflags, self.cxxflags]:
+ lst.append('-O3')
+
++ self.cflags += os.environ.get('CFLAGS', '').split()
++ self.cxxflags += os.environ.get('CXXFLAGS', '').split()
++
+ lflags = self.getWxConfigValue('--libs')
+ self.MONOLITHIC = (lflags.find("_xrc") == -1)
+- self.lflags = lflags.split()
++ self.lflags = lflags.split() + os.environ.get('LDFLAGS', '').split()
+
+ self.WXBASENAME = self.getWxConfigValue('--basename')
+ self.WXRELEASE = self.getWxConfigValue('--release')
diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
new file mode 100644
index 000000000000..5ab48cef727d
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch
@@ -0,0 +1,27 @@
+--- a/wscript
++++ b/wscript
+@@ -244,15 +244,6 @@
+ uselib_store='WXGL', mandatory=True,
+ msg='Finding libs for WXGL')
+
+- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'):
+- wv_libs = '--libs webview,core,net'
+- else:
+- wv_libs = '--libs core,net'
+- conf.check_cfg(path=conf.options.wx_config, package='',
+- args='--cxxflags ' + wv_libs + rpath,
+- uselib_store='WXWEBVIEW', mandatory=True,
+- msg='Finding libs for WXWEBVIEW')
+-
+ conf.check_cfg(path=conf.options.wx_config, package='',
+ args='--cxxflags --libs xml,core,net' + rpath,
+ uselib_store='WXXML', mandatory=True,
+@@ -600,7 +591,6 @@
+ makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC')
+ makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML')
+ makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL')
+- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW')
+ makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML')
+ makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC')
+ makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT')
+
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-x86-time.patch b/dev-python/wxpython/files/wxpython-4.2.1-x86-time.patch
new file mode 100644
index 000000000000..ea144419833e
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.1-x86-time.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/922328
+https://github.com/wxWidgets/Phoenix/issues/1910
+https://github.com/wxWidgets/Phoenix/issues/2197 (specifically https://github.com/wxWidgets/Phoenix/issues/2197#issuecomment-1169378156)
+https://github.com/StefanBruens/Phoenix/commit/8b743981d557d0465ba53e938784be94f4679145 but w/ s/SIP_SSIZE_T/long
+i.e. a revert of https://github.com/wxWidgets/Phoenix/commit/c78823549bac1b28d99a1ad6dc1008485a2afb33.
+
+From 8b743981d557d0465ba53e938784be94f4679145 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Tue, 28 Jun 2022 18:32:32 +0200
+Subject: [PATCH] Fix time_t ETG typedef, extend DateTime.FromTimeT tests
+
+Before c78823549bac ("Ensure time_t is treated as a 64-bit value by SIP")
+the typedef used "long" instead of wxInt64, which caused issues on Win64,
+as long is 32bit there (LLP64). On the other hand, wxInt64 is wrong on
+32 bit Linux (e.g. armv7, i586), and thus the code crashes.
+
+As SIP_SSIZE_T is 64 bit for both LLP64 (Windows) and LP64 (Linux), but
+32 bit on 32bit archs, it matches time_t better (though, according to the
+C standard, it could even be a double).
+
+Fixes #2197.
+ etg/defs.py | 2 +-
+
+--- a/etg/defs.py
++++ b/etg/defs.py
+@@ -73,7 +73,7 @@ def run():
+ td = module.find('wxUIntPtr')
+ module.insertItemAfter(td, etgtools.TypedefDef(type='wchar_t', name='wxUChar'))
+ module.insertItemAfter(td, etgtools.TypedefDef(type='wchar_t', name='wxChar'))
+- module.insertItemAfter(td, etgtools.TypedefDef(type='wxInt64', name='time_t'))
++ module.insertItemAfter(td, etgtools.TypedefDef(type='long', name='time_t'))
+ module.insertItemAfter(td, etgtools.TypedefDef(type='long long', name='wxFileOffset'))
+ module.insertItemAfter(td, etgtools.TypedefDef(type='SIP_SSIZE_T', name='ssize_t'))
+ module.insertItemAfter(td, etgtools.TypedefDef(type='unsigned char', name='byte', pyInt=True))
diff --git a/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch b/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch
new file mode 100644
index 000000000000..f387612522bd
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.2-no-stacktrace.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/924057
+
+--- a/sip/cpp/sip_corewxAppTraits.cpp
++++ b/sip/cpp/sip_corewxAppTraits.cpp
+@@ -471,7 +471,11 @@
+ PyErr_Clear();
+
+ Py_BEGIN_ALLOW_THREADS
++ #ifdef __GLIBC__
+ sipRes = new ::wxString((sipSelfWasArg ? sipCpp->::wxAppTraits::GetAssertStackTrace() : sipCpp->GetAssertStackTrace()));
++ #else
++ sipRes = new ::wxString("");
++ #endif
+ Py_END_ALLOW_THREADS
+
+ if (PyErr_Occurred())
diff --git a/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch b/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch
new file mode 100644
index 000000000000..229d372aa5af
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.2-setuppy.patch
@@ -0,0 +1,38 @@
+Created by Quincy Fleming
+https://bugs.gentoo.org/909973
+
+--- a/setup.py
++++ b/setup.py
+@@ -113,6 +113,7 @@
+ """
+ user_options = [
+ ('skip-build', None, 'skip building the C/C++ code (assumes it has already been done)'),
++ ('buildpy-options=', None, 'string of commands and options passed to build.py'),
+ ]
+ boolean_options = ['skip-build']
+
+@@ -120,6 +121,7 @@
+ def initialize_options(self):
+ orig_build.initialize_options(self)
+ self.skip_build = '--skip-build' in sys.argv
++ self.buildpy_options = 'build'
+
+ def finalize_options(self):
+ orig_build.finalize_options(self)
+@@ -135,7 +137,7 @@
+ 'message and the wxWidgets and Phoenix build steps in the future.\n')
+
+ # Use the same Python that is running this script.
+- cmd = ['"{}"'.format(sys.executable), '-u', 'build.py', 'build']
++ cmd = ['"{}"'.format(sys.executable), '-u', 'build.py',self.buildpy_options]
+ cmd = ' '.join(cmd)
+ runcmd(cmd)
+
+@@ -143,7 +145,6 @@
+ # build/lib folder like normal.
+ orig_build.run(self)
+
+-
+ def _cleanup_symlinks(cmd):
+ # Clean out any libwx* symlinks in the build_lib folder, as they will
+ # turn into copies in the egg since zip files can't handle symlinks.
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
+