From: Robin Dunn <robin@alldunn.com>
Date: Sat, 18 Mar 2006 01:03:08 +0000 (+0000)
Subject: SWIG 1.3.29 updates
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0ae3258d7ad2231d653c1f0d62e0e2952f1dfb5f

SWIG 1.3.29 updates


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/SWIG/README.txt b/wxPython/SWIG/README.txt
index 2b6d3cc13a..43a91ee864 100644
--- a/wxPython/SWIG/README.txt
+++ b/wxPython/SWIG/README.txt
@@ -8,7 +8,7 @@ wxPython.  These have been submitted to SWIG's SourceForge patch
 tracker, so hopefully they will get incorporated into the main SWIG
 source tree soon.
 
-wxPython currently uses the 1.3.27 version of SWIG, which you can get
+wxPython currently uses the 1.3.29 version of SWIG, which you can get
 from https://sourceforge.net/projects/swig/, plus the patch(es) in
 this directory.  Download the SWIG sources, apply the patch(es) here
 and then build as normal.  I have also have made available a tarball
@@ -26,6 +26,21 @@ executable when running setup.py, like this:
 
 
 
+------------------------------------------------------------------------
+
+swig-1.3.29.patch
+
+    SWIG changed how the import statments are output to the proxy
+    file, but this also caused the order to change (they all moved to
+    the very top of the file) so this broke the module docstring, as
+    well as some behavior that Chandler development is depending upon,
+    so this patch changes back to how it was done in prior releases.
+
+    Changed the exception message used for TypeErrors to make a little
+    more sense.
+
+
+
 ------------------------------------------------------------------------
 
 swig-1.3.27.patch
diff --git a/wxPython/SWIG/swig-1.3.29.patch b/wxPython/SWIG/swig-1.3.29.patch
index 8078c790a0..c6ed275851 100644
--- a/wxPython/SWIG/swig-1.3.29.patch
+++ b/wxPython/SWIG/swig-1.3.29.patch
@@ -4,7 +4,7 @@ RCS file: /cvsroot/swig/SWIG/Lib/typemaps/exception.swg,v
 retrieving revision 1.8
 diff -u -4 -r1.8 exception.swg
 --- Lib/typemaps/exception.swg	7 Mar 2006 00:14:10 -0000	1.8
-+++ Lib/typemaps/exception.swg	10 Mar 2006 00:39:14 -0000
++++ Lib/typemaps/exception.swg	17 Mar 2006 00:10:52 -0000
 @@ -12,9 +12,9 @@
  
  /* macros for error manipulation */
@@ -19,10 +19,10 @@ diff -u -4 -r1.8 exception.swg
 Index: Source/Modules/python.cxx
 ===================================================================
 RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
-retrieving revision 1.202
-diff -u -4 -r1.202 python.cxx
---- Source/Modules/python.cxx	7 Mar 2006 22:02:54 -0000	1.202
-+++ Source/Modules/python.cxx	10 Mar 2006 00:39:14 -0000
+retrieving revision 1.203
+diff -u -4 -r1.203 python.cxx
+--- Source/Modules/python.cxx	16 Mar 2006 01:46:50 -0000	1.203
++++ Source/Modules/python.cxx	17 Mar 2006 00:10:52 -0000
 @@ -39,9 +39,8 @@
  static  File         *f_directors_h = 0;
  static  File         *f_init = 0;
diff --git a/wxPython/config.py b/wxPython/config.py
index 09e89eaf53..0188ea6fd0 100644
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -903,6 +903,7 @@ if USE_SWIG:
                        '-fvirtual',
                        '-fastinit',
                        '-fastunpack',
+                       #'-outputtuple',  Currently setting this with a -D define above
                        ]
              
 if UNICODE: