diff --git a/swig.spec b/swig.spec index fa891da..9f83fd0 100644 --- a/swig.spec +++ b/swig.spec @@ -18,6 +18,7 @@ Source: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig- Patch4: swig203-rh706140.patch Patch6: swig204-rh752054.patch Patch7: swig207-rh830660.patch +Patch8: swig207-r13128.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl, python-devel, pcre-devel @@ -57,6 +58,7 @@ This package contains documentation for SWIG and useful examples #%patch6 -p1 -b .rh752054 %patch7 -p1 -b .rh830660 +%patch8 -p0 -b .r13128 # as written on https://fedoraproject.org/wiki/Packaging_talk:Perl, section 2 # (specific req/prov filtering). Before you remove this hack make sure you don't @@ -134,6 +136,7 @@ rm -rf %{buildroot} %changelog * Tue Jun 12 2012 Adam Tkac 2.0.7-2 - fix generating of python3 wrappers (#830660) +- don't crash when attepmting to warn about wrong descructor (#830249) * Thu Jun 07 2012 Adam Tkac 2.0.7-1 - update to 2.0.7 diff --git a/swig207-r13128.patch b/swig207-r13128.patch new file mode 100644 index 0000000..89bfc7f --- /dev/null +++ b/swig207-r13128.patch @@ -0,0 +1,22 @@ +Index: Source/Modules/lang.cxx +=================================================================== +--- Source/Modules/lang.cxx (revision 13127) ++++ Source/Modules/lang.cxx (revision 13128) +@@ -2623,7 +2623,7 @@ + Delete(expected_name_resolved); + } + if (illegal_name) { +- Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name)); ++ Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n)); + Swig_restore(n); + return SWIG_NOWRAP; + } +@@ -2760,7 +2760,7 @@ + } + + if (illegal_name) { +- Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name)); ++ Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n)); + Swig_restore(n); + Delete(expected_name); + return SWIG_NOWRAP;