From f4d0cc1e94ed46d0b96852e4353ffdf04f032ec0 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Dec 19 2009 12:34:17 +0000
Subject: - fix phpqt_internals.cpp for the current smoke.h


---

diff --git a/kdebindings-4.3.85-fix-build.patch b/kdebindings-4.3.85-fix-build.patch
index 09faad8..a62a75a 100644
--- a/kdebindings-4.3.85-fix-build.patch
+++ b/kdebindings-4.3.85-fix-build.patch
@@ -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
diff --git a/kdebindings.spec b/kdebindings.spec
index d281f7f..d54d250 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -72,6 +72,8 @@ Patch0:  kdebindings-4.3.85-qyoto_no_examples.patch
 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@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@fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)