rpms/kdebindings/devel kdebindings-4.2.96-php-5.3.patch, NONE, 1.1 kdebindings.spec, 1.220, 1.221

[Than Ngo]

Author: than

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.2.96-php-5.3.patch 
Log Message:
fix build issue with php-5.3.x



kdebindings-4.2.96-php-5.3.patch:
 config.h.in        |    4 ++--
 handlers.cpp       |    2 +-
 zphp/z_extension.h |    1 -
 zphp/z_handler.cpp |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE kdebindings-4.2.96-php-5.3.patch ---
diff -up kdebindings-4.2.96/php/phpqt/src/config.h.in.orig kdebindings-4.2.96/php/phpqt/src/config.h.in
--- kdebindings-4.2.96/php/phpqt/src/config.h.in.orig	2009-07-20 11:07:07.000000000 +0200
+++ kdebindings-4.2.96/php/phpqt/src/config.h.in	2009-07-20 11:24:57.000000000 +0200
@@ -16,7 +16,7 @@
 #cmakedefine PHPQT_MAPHANDLE_DEBUG 1
 #cmakedefine PHPQT_UNMAPHANDLE_DEBUG 1
 
-#if PHP_MAJOR_VERSION > 5 && PHP_MINOR_VERSION > 2
+#if PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION > 2
 #define refcount__GC refcount__gc
 #define is_ref__GC is_ref__gc
 #else
@@ -27,4 +27,4 @@
 #undef ZEND_DLEXPORT
 #define ZEND_DLEXPORT Q_DECL_EXPORT
 
-#endif
\ Kein Zeilenumbruch am Dateiende.
+#endif
diff -up kdebindings-4.2.96/php/phpqt/src/handlers.cpp.orig kdebindings-4.2.96/php/phpqt/src/handlers.cpp
--- kdebindings-4.2.96/php/phpqt/src/handlers.cpp.orig	2009-07-20 11:27:20.000000000 +0200
+++ kdebindings-4.2.96/php/phpqt/src/handlers.cpp	2009-07-20 11:27:59.000000000 +0200
@@ -359,7 +359,7 @@ static void marshall_IntR(Marshall *m)
     case Marshall::FromZVAL:
     {
         m->item().s_voidp = &( Z_LVAL_P( m->var() ) );
-	m->var()->refcount = 100;
+	m->var()->refcount__GC = 100;
         break;
     }
     case Marshall::ToZVAL:
diff -up kdebindings-4.2.96/php/phpqt/src/phpqt_internals.cpp.orig kdebindings-4.2.96/php/phpqt/src/phpqt_internals.cpp
diff -up kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.cpp.orig kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.cpp
diff -up kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.h.orig kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.h
--- kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.h.orig	2009-07-17 23:10:28.000000000 +0200
+++ kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.h	2009-07-20 10:57:11.000000000 +0200
@@ -44,7 +44,6 @@
 
 // this is needed for override return_value, see qobject_cast
 #if(PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0)
-static
     ZEND_BEGIN_ARG_INFO_EX(phpqt_cast_arginfo, 0, 1, 0)
     ZEND_END_ARG_INFO();
 #endif
diff -up kdebindings-4.2.96/php/phpqt/src/zphp/z_handler.cpp.orig kdebindings-4.2.96/php/phpqt/src/zphp/z_handler.cpp
--- kdebindings-4.2.96/php/phpqt/src/zphp/z_handler.cpp.orig	2009-07-20 11:07:25.000000000 +0200
+++ kdebindings-4.2.96/php/phpqt/src/zphp/z_handler.cpp	2009-07-20 11:25:16.000000000 +0200
@@ -40,7 +40,7 @@ int (*originalConstantMethodHandler)(ZEN
 int (*originalCloneSpecCvHandler)(ZEND_OPCODE_HANDLER_ARGS);
 opcode_handler_t *phpqt_original_opcode_handlers;
 
-#if PHP_MAJOR_VERSION > 5 && PHP_MINOR_VERSION > 2
+#if PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION > 2
 user_opcode_handler_t phpqt_opcode_handlers[PHPQT_OPHANDLER_COUNT];
 #else
 opcode_handler_t phpqt_opcode_handlers[PHPQT_OPHANDLER_COUNT];


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- kdebindings.spec	18 Jul 2009 20:20:05 -0000	1.220
+++ kdebindings.spec	20 Jul 2009 09:33:51 -0000	1.221
@@ -32,7 +32,7 @@
 
 Name: kdebindings
 Version: 4.2.96
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -49,7 +49,8 @@ Patch1:  kdebindings-4.2.85-old-PyQt4.pa
 Patch2:  kdebindings-4.2.4-fix-kpythonpluginfactory.patch
 ## upstream patches
 # http://bugs.kde.org/198632#c5
-Patch100:  kdebindings-4.2.96-kdebug#198632.patch
+Patch100: kdebindings-4.2.96-kdebug#198632.patch
+Patch101: kdebindings-4.2.96-php-5.3.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -255,7 +256,10 @@ Falcon plugin for the Kross archtecture 
 %patch0
 %patch1 -p0 -b .old-PyQt4
 %patch2 -p1 -b .fix-kpythonpluginfactory
+
+# upstream patches
 %patch100 -p1 -b .kdebug#198632
+%patch101 -p1 -b .php-5.3
 
 
 %build
@@ -491,6 +495,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 20 2009 Than Ngo <than at redhat.com> - 4.2.96-3
+- fix build issue with php-5.3.x
+
 * Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
 - fix pykdeuic4-related install bits (kdebug#198162)
 - pyqt4_version 4.5.2