Accepting request 246683 from devel:tools:building

1

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

nested_classes.diff

@@ -0,0 +1,20 @@
+--- ./Source/CParse/parser.c.orig	2014-08-26 12:24:53.381788068 +0000
++++ ./Source/CParse/parser.c	2014-08-26 12:36:45.700287073 +0000
+@@ -1065,7 +1065,7 @@ static Node *nested_forward_declaration(
+     }
+   }
+ 
+-  if (!GetFlag(currentOuterClass, "nested")) {
++  if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) {
+     if (nn && Equal(nodeType(nn), "classforward")) {
+       Node *n = nn;
+       SWIG_WARN_NODE_BEGIN(n);
+@@ -7562,6 +7562,8 @@ yyreduce:
+ 		   } else if (nscope_inner) {
+ 		     /* this is tricky */
+ 		     /* we add the declaration in the original namespace */
++		     if (Strcmp(nodeType(nscope_inner), "class") == 0 && cparse_cplusplus && ignore_nested_classes && !GetFlag((yyval.node), "feature:flatnested"))
++		       (yyval.node) = nested_forward_declaration((yyvsp[(1) - (9)].id), (yyvsp[(2) - (9)].id), (yyvsp[(3) - (9)].str), Copy((yyvsp[(3) - (9)].str)), (yyvsp[(9) - (9)].node));
+ 		     appendChild(nscope_inner, (yyval.node));
+ 		     Swig_symbol_setscope(Getattr(nscope_inner, "symtab"));
+ 		     Delete(Namespaceprefix);

swig.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 25 14:17:29 CEST 2014 - mls@suse.de
+
+- support nested classes in ruby [bnc#892480]
+  new patch: nested_classes.diff
+
 -------------------------------------------------------------------
 Thu Jun  5 07:20:40 UTC 2014 - kkaempf@suse.com
 

swig.spec

@@ -25,6 +25,7 @@ Group:          Development/Languages/C and C++
 Url:            http://www.swig.org/
 Source:         http://sourceforge.net/projects/swig/files/swig/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.rpmlintrc
+Patch:          nested_classes.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  boost-devel
@@ -119,6 +120,7 @@ understandig SWIG usage.
 
 %prep
 %setup -q
+%patch
 
 %build
 %configure --disable-ccache