rpms/kdebindings/devel kdebindings-4.3.85-enum.patch, NONE, 1.1 kdebindings.spec, 1.285, 1.286

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24463

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.85-enum.patch 
Log Message:
* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-4
- upstream enum patch


kdebindings-4.3.85-enum.patch:
 generatorvisitor.cpp |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.85-enum.patch ---
--- trunk/KDE/kdebindings/generator/generatorvisitor.cpp	2009/11/28 20:39:22	1055827
+++ trunk/KDE/kdebindings/generator/generatorvisitor.cpp	2009/12/23 20:51:15	1065619
@@ -257,7 +257,22 @@
         if (!nspace.isEmpty())
             nspace.pop_back();
     } while (!nspace.isEmpty());
-    
+
+    QStack<Class*> parentStack = klass;
+    while (!parentStack.isEmpty()) {
+        const Class* clazz = parentStack.pop();
+        foreach (const BasicTypeDeclaration* decl, clazz->children()) {
+            const Enum *e = 0;
+            if (!(e = dynamic_cast<const Enum*>(decl)))
+                continue;
+            foreach (const EnumMember& member, e->members()) {
+                if (member.name() == name) {
+                    return clazz->toString() + "::" + name;
+                }
+            }
+        }
+    }
+
     return QString();
 }
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- kdebindings.spec	23 Dec 2009 20:57:50 -0000	1.285
+++ kdebindings.spec	30 Dec 2009 20:48:07 -0000	1.286
@@ -31,7 +31,7 @@
 
 %define akonadi_version 1.2.80
 %define pykde4_akonadi 1
-%define pyqt4_version 4.6.1
+%define pyqt4_version 4.6.2
 
 %if 0%{?rhel}
 %define falcon 0
@@ -54,7 +54,7 @@
 
 Name: kdebindings
 Version: 4.3.85
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -71,6 +71,7 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 #          commit this upstream without further discussion.
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 ## upstream patches
+Patch100: kdebindings-4.3.85-enum.patch
 
 BuildRequires:  akonadi-devel >= %{akonadi_version} 
 BuildRequires:  kdebase-workspace-devel >= %{version}
@@ -278,6 +279,7 @@ Falcon plugin for the Kross archtecture 
 %patch0 -p1 -b .qyoto_no_examples
 
 # upstream patches
+%patch100 -p3 -b .enum
 
 # do the no-rpath hack last, after the upstream backports (if any)
 %patch1 -p1 -b .no-rpath
@@ -545,6 +547,9 @@ fi
 
 
 %changelog
+* Wed Dec 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.95-4
+- upstream enum patch
+
 * Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-3
 - tarball respin, includes build-fix'es