...
 
Commits (3)
wxpython4.0 (4.0.1+dfsg-5) unstable; urgency=medium
* Cherry-pick waf 2.0.7 updates to fix Python 3.7 FTBFS
* d/control: Update standards version to 4.1.4 (no changes needed)
-- Scott Talbert <swt@techie.net> Tue, 03 Jul 2018 19:47:38 -0400
wxpython4.0 (4.0.1+dfsg-4) unstable; urgency=medium
* Update team email address due to alioth retirement (Closes: #899942)
......
......@@ -21,7 +21,7 @@ Build-Depends:
python3-requests,
python3-setuptools,
python3-sip-dev,
Standards-Version: 4.1.3
Standards-Version: 4.1.4
Vcs-Git: https://salsa.debian.org/freewx-team/wxpython4.0.git
Vcs-Browser: https://salsa.debian.org/freewx-team/wxpython4.0
Homepage: https://www.wxpython.org/
......
unbundle-sip.patch
lib-copy-destination.patch
waf-2.0.7-1.patch
waf-2.0.7-2.patch
This source diff could not be displayed because it is too large. You can view the blob instead.
From e0cde8741295d08b599f39f33a2a95eef5fd5b87 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sat, 5 May 2018 21:03:30 -0700
Subject: [PATCH] Update waf to version 2.0.7
---
build.py | 4 ++--
wscript | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.py b/build.py
index 4117e85f7..518012b16 100755
--- a/build.py
+++ b/build.py
@@ -83,8 +83,8 @@
'linux64' : 'b349127a4d46452936e4181d96b12c2d',
}
-wafCurrentVersion = '1.7.15-p1'
-wafMD5 = 'e44003373c965f4221bbdc4c9b846128'
+wafCurrentVersion = '2.0.7'
+wafMD5 = '48ac1250bcccd0674cf461937875ce9a'
doxygenCurrentVersion = '1.8.8'
doxygenMD5 = {
diff --git a/wscript b/wscript
index d051ebbce..c4bc96fde 100644
--- a/wscript
+++ b/wscript
@@ -30,7 +30,7 @@ def options(opt):
if isWindows:
opt.load('msvc')
else:
- opt.load('compiler_cc compiler_cxx')
+ opt.load('compiler_c compiler_cxx')
opt.load('python')
opt.add_option('--debug', dest='debug', action='store_true', default=False,
@@ -78,7 +78,7 @@ def configure(conf):
conf.env['MSVC_TARGETS'] = [conf.options.msvc_arch]
conf.load('msvc')
else:
- conf.load('compiler_cc compiler_cxx')
+ conf.load('compiler_c compiler_cxx')
if conf.options.python:
conf.env.PYTHON = conf.options.python