rpms/kdebindings/devel kdebindings-4.3.85-fix-build.patch, 1.2, 1.3 kdebindings.spec, 1.281, 1.282

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebindings-4.3.85-fix-build.patch kdebindings.spec 
Log Message:
- fix phpqt_internals.cpp for the current smoke.h

kdebindings-4.3.85-fix-build.patch:
 php/phpqt/src/phpqt_internals.cpp |    2 +-
 smoke/CMakeLists.txt              |    2 +-
 smoke/nepomuk/nepomuk_includes.h  |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Index: kdebindings-4.3.85-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.85-fix-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.3.85-fix-build.patch	19 Dec 2009 11:42:33 -0000	1.2
+++ kdebindings-4.3.85-fix-build.patch	19 Dec 2009 12:34:17 -0000	1.3
@@ -1,3 +1,15 @@
+diff -ur kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp
+--- kdebindings-4.3.85/php/phpqt/src/phpqt_internals.cpp	2009-02-12 11:22:44.000000000 +0100
++++ kdebindings-4.3.85-fix-build/php/phpqt/src/phpqt_internals.cpp	2009-12-19 13:26:19.000000000 +0100
+@@ -242,7 +242,7 @@
+ void PHPQt::createMetaObject(smokephp_object* o, zval* this_ptr)
+ {
+     const Smoke::ModuleIndex nameId = o->smoke()->idMethodName("metaObject");
+-    const Smoke::ModuleIndex classIdx = { o->smoke(), o->classId() };
++    const Smoke::ModuleIndex classIdx(o->smoke(), o->classId());
+     const Smoke::ModuleIndex meth = o->smoke()->findMethod( classIdx, nameId );
+     const Smoke::Method &methodId = o->smoke()->methods[ o->smoke()->methodMaps[ meth.index ].method ];
+     const Smoke::ClassFn fn = o->smoke()->classes[methodId.classId].classFn;
 diff -ur kdebindings-4.3.85/smoke/CMakeLists.txt kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt
 --- kdebindings-4.3.85/smoke/CMakeLists.txt	2009-12-11 00:13:50.000000000 +0100
 +++ kdebindings-4.3.85-fix-build/smoke/CMakeLists.txt	2009-12-19 12:03:42.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- kdebindings.spec	19 Dec 2009 11:42:33 -0000	1.281
+++ kdebindings.spec	19 Dec 2009 12:34:17 -0000	1.282
@@ -72,6 +72,8 @@ Patch0:  kdebindings-4.3.85-qyoto_no_exa
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 # also fix its build (missing #include <nepomuk/resourcetypeterm.h>)
+# (subset of http://websvn.kde.org/?view=revision&revision=1063412)
+# also fix phpqt_internals.cpp for the current smoke.h
 Patch2:  kdebindings-4.3.85-fix-build.patch
 ## upstream patches
 
@@ -551,6 +553,7 @@ fi
 * Sat Dec 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.85-2
 - fix NepomukSmoke not getting built, breaking the Ruby and C# bindings
 - fix its build (missing #include <nepomuk/resourcetypeterm.h>)
+- fix phpqt_internals.cpp for the current smoke.h
 
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)