From b978d7aa083532716512648ba8ba8fcb8630454f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 22 Jan 2004 22:55:38 +0000 Subject: [PATCH] These files just changed in SWIG again, so update the patches again. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/SWIG/swig.python-docstring.patch | 28 ++++++------ wxPython/SWIG/swig.xmlout.patch | 53 +++++++++-------------- 2 files changed, 35 insertions(+), 46 deletions(-) diff --git a/wxPython/SWIG/swig.python-docstring.patch b/wxPython/SWIG/swig.python-docstring.patch index c692852bf8..39a79c6f50 100644 --- a/wxPython/SWIG/swig.python-docstring.patch +++ b/wxPython/SWIG/swig.python-docstring.patch @@ -1,11 +1,11 @@ Index: Source/Modules/python.cxx =================================================================== RCS file: /cvsroot/SWIG/Source/Modules/python.cxx,v -retrieving revision 1.38 -diff -u -4 -r1.38 python.cxx ---- Source/Modules/python.cxx 21 Jan 2004 01:33:07 -0000 1.38 -+++ Source/Modules/python.cxx 22 Jan 2004 01:59:33 -0000 -@@ -54,8 +54,17 @@ +retrieving revision 1.39 +diff -u -4 -r1.39 python.cxx +--- Source/Modules/python.cxx 22 Jan 2004 22:42:17 -0000 1.39 ++++ Source/Modules/python.cxx 22 Jan 2004 22:51:35 -0000 +@@ -50,8 +50,17 @@ static int have_constructor; static int have_repr; static String *real_classname; @@ -23,7 +23,7 @@ diff -u -4 -r1.38 python.cxx Python Options (available with -python)\n\ -ldflags - Print runtime libraries to link with\n\ -globals - Set used to access C global variable [default: 'cvar']\n\ -@@ -421,17 +430,23 @@ +@@ -417,17 +426,23 @@ * functions. * ------------------------------------------------------------ */ @@ -52,7 +52,7 @@ diff -u -4 -r1.38 python.cxx } -@@ -445,8 +460,256 @@ +@@ -441,8 +456,256 @@ } @@ -309,7 +309,7 @@ diff -u -4 -r1.38 python.cxx * Check if there is a %addtofunc directive and it has text * ------------------------------------------------------------ */ -@@ -1702,9 +1965,11 @@ +@@ -1698,9 +1961,11 @@ Printf(f_shadow, modern ? "(object)" : "(_object)"); } } @@ -322,7 +322,7 @@ diff -u -4 -r1.38 python.cxx Printv(f_shadow,tab4,"__swig_setmethods__ = {}\n",NIL); if (Len(base_class)) { Printf(f_shadow,"%sfor _s in [%s]: __swig_setmethods__.update(_s.__swig_setmethods__)\n",tab4,base_class); -@@ -1837,16 +2102,22 @@ +@@ -1833,16 +2098,22 @@ Delete(pyaction); Printv(f_shadow,pycode,"\n",NIL); } else { @@ -352,7 +352,7 @@ diff -u -4 -r1.38 python.cxx } } -@@ -1861,14 +2132,20 @@ +@@ -1857,14 +2128,20 @@ virtual int staticmemberfunctionHandler(Node *n) { String *symname = Getattr(n,"sym:name"); Language::staticmemberfunctionHandler(n); @@ -377,7 +377,7 @@ diff -u -4 -r1.38 python.cxx " = staticmethod(", symname, ")\n", NIL); if (!modern) { -@@ -1953,8 +2230,10 @@ +@@ -1949,8 +2226,10 @@ } Printv(f_shadow, tab4, "def __init__(self, *args", @@ -388,7 +388,7 @@ diff -u -4 -r1.38 python.cxx if (!modern) { Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', ", funcCallHelper(Swig_name_construct(symname), allow_kwargs), ")\n", NIL); -@@ -1968,9 +2247,9 @@ +@@ -1964,9 +2243,9 @@ Printv(f_shadow, tab8, "self.thisown = 1\n", NIL); Printv(f_shadow, tab8, "del newobj.thisown\n", NIL); } @@ -399,7 +399,7 @@ diff -u -4 -r1.38 python.cxx } have_constructor = 1; } else { -@@ -1986,8 +2265,10 @@ +@@ -1982,8 +2261,10 @@ } else { Printv(f_shadow_stubs, "\ndef ", symname, "(*args", @@ -410,7 +410,7 @@ diff -u -4 -r1.38 python.cxx funcCallHelper(Swig_name_construct(symname), allow_kwargs), "\n", NIL); Printv(f_shadow_stubs, tab4, "val.thisown = 1\n", NIL); if ( have_addtofunc(n) ) -@@ -2019,13 +2300,15 @@ +@@ -2015,13 +2296,15 @@ Delete(pyaction); Printv(f_shadow,pycode,"\n", NIL); } else { diff --git a/wxPython/SWIG/swig.xmlout.patch b/wxPython/SWIG/swig.xmlout.patch index c67d056e6d..84988f345b 100644 --- a/wxPython/SWIG/swig.xmlout.patch +++ b/wxPython/SWIG/swig.xmlout.patch @@ -1,11 +1,11 @@ Index: Source/Swig/swig.h =================================================================== RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v -retrieving revision 1.79 -diff -u -4 -r1.79 swig.h ---- Source/Swig/swig.h 15 Jan 2004 22:46:07 -0000 1.79 -+++ Source/Swig/swig.h 22 Jan 2004 01:57:53 -0000 -@@ -354,8 +354,10 @@ +retrieving revision 1.80 +diff -u -4 -r1.80 swig.h +--- Source/Swig/swig.h 22 Jan 2004 22:42:18 -0000 1.80 ++++ Source/Swig/swig.h 22 Jan 2004 22:51:44 -0000 +@@ -364,8 +364,10 @@ extern void Swig_print_tags(File *obj, Node *root); extern void Swig_print_tree(Node *obj); extern void Swig_print_node(Node *obj); @@ -19,11 +19,11 @@ diff -u -4 -r1.79 swig.h Index: Source/Modules/main.cxx =================================================================== RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v -retrieving revision 1.32 -diff -u -4 -r1.32 main.cxx ---- Source/Modules/main.cxx 15 Jan 2004 22:46:05 -0000 1.32 -+++ Source/Modules/main.cxx 22 Jan 2004 01:57:53 -0000 -@@ -94,15 +94,17 @@ +retrieving revision 1.33 +diff -u -4 -r1.33 main.cxx +--- Source/Modules/main.cxx 22 Jan 2004 22:42:15 -0000 1.33 ++++ Source/Modules/main.cxx 22 Jan 2004 22:51:45 -0000 +@@ -91,15 +91,17 @@ -w+321,401,-402 \n\ \n\ where code 321(+) is added, and 401(no sign) and 402(-) \n\ @@ -41,7 +41,7 @@ diff -u -4 -r1.32 main.cxx // ----------------------------------------------------------------------------- // check_suffix(char *name) // -@@ -218,8 +220,9 @@ +@@ -215,8 +217,9 @@ char *includefiles[256]; int includecount = 0; int dump_tags = 0; @@ -51,7 +51,7 @@ diff -u -4 -r1.32 main.cxx int dump_typedef = 0; int dump_classes = 0; int werror = 0; -@@ -486,8 +489,20 @@ +@@ -483,8 +486,20 @@ Swig_mark_arg(i); } else if (strcmp(argv[i],"-dump_tree") == 0) { dump_tree = 1; @@ -72,7 +72,7 @@ diff -u -4 -r1.32 main.cxx Swig_mark_arg(i); Swig_contract_mode_set(0); } else if (strcmp(argv[i],"-browse") == 0) { -@@ -737,8 +752,11 @@ +@@ -734,8 +749,11 @@ } } if (dump_tree) { @@ -87,21 +87,10 @@ diff -u -4 -r1.32 main.cxx Index: Source/Modules/xml.cxx =================================================================== RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v -retrieving revision 1.9 -diff -u -4 -r1.9 xml.cxx ---- Source/Modules/xml.cxx 28 Dec 2003 21:47:58 -0000 1.9 -+++ Source/Modules/xml.cxx 22 Jan 2004 01:57:53 -0000 -@@ -109,9 +109,9 @@ - Printf(stderr,"*** Can't open '%s'\n", outfile); - SWIG_exit(EXIT_FAILURE); - } - } -- Printf( out, " \n" ); -+ Printf( out, " \n" ); - Xml_print_tree(n); - return SWIG_OK; - } - +retrieving revision 1.10 +diff -u -4 -r1.10 xml.cxx +--- Source/Modules/xml.cxx 22 Jan 2004 22:42:18 -0000 1.10 ++++ Source/Modules/xml.cxx 22 Jan 2004 22:51:45 -0000 @@ -197,18 +197,19 @@ Replaceall( o, "&", "&" ); Replaceall( o, "<", "<" ); @@ -137,11 +126,11 @@ diff -u -4 -r1.9 xml.cxx } indent_level -= 4; print_indent(0); -@@ -334,5 +334,36 @@ - - extern "C" Language * - swig_xml( void ) { +@@ -336,5 +336,36 @@ return new XML(); + } + extern "C" Language * swig_xml( void ) { + return new_swig_xml(); +} + + -- 2.45.2