Accepting request 32511 from devel:tools:building

Copy from devel:tools:building/swig based on submit request 32511 from user coolo

OBS-URL: https://build.opensuse.org/request/show/32511
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/swig?expand=0&rev=15

swig-fixassert.diff

@@ -0,0 +1,51 @@
+------------------------------------------------------------------------
+r11841 | wsfulton | 2010-02-05 23:22:35 +0100 (Fr, 05. Feb 2010) | 1 Zeile
+
+Fix #2894405 - assertion when using -xmlout.
+------------------------------------------------------------------------
+Index: Source/Modules/swigmain.cxx
+===================================================================
+--- Source/Modules/swigmain.cxx	(Revision 11840)
++++ Source/Modules/swigmain.cxx	(Revision 11841)
+@@ -196,7 +196,8 @@
+       dl = (fac) ();
+     }
+   }
++
+   int res = SWIG_main(argc, argv, dl);
+-  delete dl;
++
+   return res;
+ }
+Index: Source/Modules/main.cxx
+===================================================================
+--- Source/Modules/main.cxx	(Revision 11840)
++++ Source/Modules/main.cxx	(Revision 11841)
+@@ -25,7 +25,7 @@
+ 
+ // Global variables
+ 
+-Language *lang;			// Language method
++static Language *lang = 0;	// Language method
+ int CPlusPlus = 0;
+ int Extend = 0;			// Extend flag
+ int ForceExtern = 0;		// Force extern mode
+@@ -1231,6 +1231,8 @@
+       Swig_print_tree(Getattr(top, "module"));
+     }
+     if (dump_xml && top) {
++      delete lang;
++      lang = 0;
+       Swig_print_xml(top, xmlout);
+     }
+     Delete(top);
+@@ -1265,6 +1267,9 @@
+   if ((werror) && (Swig_warn_count())) {
+     return Swig_warn_count();
+   }
++
++  delete lang;
++
+   return Swig_error_count();
+ }
+ 

swig.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Feb 14 09:54:04 UTC 2010 - coolo@novell.com
+
+- take patch from swig svn to fix assertion on -xmlout (fix
+  yast2-storage build)
+
 -------------------------------------------------------------------
 Thu Dec 17 10:21:40 UTC 2009 - kkaempf@novell.com
 

swig.spec

@@ -49,9 +49,10 @@ Group:          Development/Languages/C and C++
 AutoReqProv:    on
 Summary:        Simplified Wrapper and Interface Generator
 Version:        1.3.40
-Release:        1
+Release:        2
 Source:         swig-%{version}.tar.bz2
 Patch1:         swig-1.3.36-perl-long-long.patch
+Patch2:         swig-fixassert.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -126,6 +127,7 @@ Authors:
 %prep
 %setup -q
 %patch1
+%patch2
 
 %build
 v1=$(awk '/^# Generated by GNU Autoconf / { print $6; exit; }' configure)