Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update sip to v6.8.5

Browse Source
This commit is contained in:
Scott Talbert
2024-07-05 11:08:25 -04:00
parent 50d93a7874
commit fd8781c97a
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildtools/config.py
View File

@@ -1065,7 +1065,7 @@ def updateLicenseFiles(cfg):
# Combine the relevant files into a single LICENSE.txt file # Combine the relevant files into a single LICENSE.txt file
text = '' text = ''
for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']: for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
with open(opj('license', filename), 'r') as f: with open(opj('license', filename), 'r', encoding='utf-8') as f:
text += f.read() + '\n\n' text += f.read() + '\n\n'
with open('LICENSE.txt', 'w') as f: with open('LICENSE.txt', 'w') as f:
f.write(text) f.write(text)

2
requirements/devel.txt
View File

@@ -3,7 +3,7 @@
appdirs appdirs
setuptools < 45 ; python_version < '3.0' setuptools < 45 ; python_version < '3.0'
setuptools ; python_version >= '3.0' setuptools ; python_version >= '3.0'
sip == 6.8.3 sip == 6.8.5
wheel wheel
twine twine

1
wscript
View File

@@ -570,7 +570,6 @@ def build(bld):
features = 'c cxx cshlib cxxshlib pyext', features = 'c cxx cshlib cxxshlib pyext',
target = makeTargetName(bld, 'siplib'), target = makeTargetName(bld, 'siplib'),
source = ['sip/siplib/apiversions.c', source = ['sip/siplib/apiversions.c',
'sip/siplib/bool.cpp',
'sip/siplib/descriptors.c', 'sip/siplib/descriptors.c',
'sip/siplib/int_convertors.c', 'sip/siplib/int_convertors.c',
'sip/siplib/objmap.c', 'sip/siplib/objmap.c',