Skip to content

Commit 9bbd84f

Browse files
committed
py-wxpython-4.0: update patches
1 parent ee81cd2 commit 9bbd84f

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

python/py-wxpython-4.0/files/build_py.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
--- build.py.orig 2024-09-11 18:27:32.000000000 -0500
2-
+++ build.py 2025-10-04 08:16:57.000000000 -0500
3-
@@ -1550,9 +1550,6 @@
1+
--- build.py.orig 2025-10-29 01:38:50
2+
+++ build.py 2026-01-30 09:09:01
3+
@@ -1549,9 +1549,6 @@
4+
if isDarwin:
45
if options.osx_cocoa:
56
build_options.append("--osx_cocoa")
6-
7+
-
78
- if options.mac_arch:
89
- build_options.append("--mac_universal_binary=%s" % options.mac_arch)
9-
-
10+
1011
if options.no_config:
1112
build_options.append('--no_config')
12-
elif not options.force_config:
13-
@@ -1616,9 +1611,6 @@
13+
@@ -1634,9 +1631,6 @@
1414
" rebuilt. Please install gettext and associated tools.")
1515

1616
def copyWxDlls(options):
@@ -20,7 +20,7 @@
2020
if isWindows:
2121
# Copy the wxWidgets DLLs to the wxPython package folder
2222
msw = getMSWSettings(options)
23-
@@ -1661,8 +1653,6 @@
23+
@@ -1679,8 +1673,6 @@
2424
cfg = Config()
2525
wxlibdir = os.path.join(getBuildDir(options), "lib")
2626
dlls = sorted(glob.glob(wxlibdir + '/*.dylib'))
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- buildtools/config.py.orig
2-
+++ buildtools/config.py
3-
@@ -840,7 +840,7 @@
1+
--- buildtools/config.py.orig 2025-10-29 01:38:50
2+
+++ buildtools/config.py 2026-01-30 09:12:08
3+
@@ -842,7 +842,7 @@
44
line = line.strip()
55
endPos = line.rfind(' (')
66
curName = line[:endPos]
@@ -9,19 +9,19 @@
99
cmd = 'install_name_tool -change %s %s %s' % (curName, newName, filename)
1010
os.system(cmd)
1111

12-
@@ -1074,13 +1074,9 @@
12+
@@ -1064,14 +1064,10 @@
13+
for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'gpl.txt']:
1314
copy_file(opj(cfg.WXDIR, 'docs', filename), opj('license',filename),
1415
update=1, verbose=1)
15-
16+
-
1617
- # Get the sip license too
1718
- copy_file(opj('sip', 'siplib', 'LICENSE'), opj('license', 'sip-license.txt'),
1819
- update=1, verbose=1)
19-
-
20+
2021
# Combine the relevant files into a single LICENSE.txt file
2122
text = ''
2223
- for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
2324
+ for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt']:
2425
with open(opj('license', filename), 'r', encoding='utf-8') as f:
2526
text += f.read() + '\n\n'
2627
with open('LICENSE.txt', 'w') as f:
27-

python/py-wxpython-4.0/files/dd3f2509499e0e6aac4ebf8dab72b5d496c5bfbc.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Don't do this any longer.
1111
Closes #25798.
1212

1313
Upstream-Status: Backport [https://github.com/wxWidgets/wxWidgets/commit/dd3f2509499e0e6aac4ebf8dab72b5d496c5bfbc]
14-
--- ext/wxWidgets/configure.orig 2024-09-03 06:43:24.000000000 -0500
15-
+++ ext/wxWidgets/configure 2025-10-14 11:54:16.000000000 -0500
16-
@@ -32255,7 +32255,7 @@
14+
--- ext/wxWidgets/configure.orig 2025-05-25 19:15:56
15+
+++ ext/wxWidgets/configure 2026-01-30 09:15:53
16+
@@ -32397,7 +32397,7 @@
1717

1818

1919
if test "$wxUSE_OSX_COCOA" = 1; then

0 commit comments

Comments
 (0)