From 9aed124e20232fc21d19d6c16badd1cf1ce953dd Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jul 20 2009 11:03:21 +0000 Subject: allow for build php-5.2.x --- diff --git a/kdebindings-4.2.96-php-5.3.patch b/kdebindings-4.2.96-php-5.3.patch index db31895..521e468 100644 --- a/kdebindings-4.2.96-php-5.3.patch +++ b/kdebindings-4.2.96-php-5.3.patch @@ -10,13 +10,6 @@ diff -up kdebindings-4.2.96/php/phpqt/src/config.h.in.orig kdebindings-4.2.96/ph #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 @@ -33,12 +26,16 @@ diff -up kdebindings-4.2.96/php/phpqt/src/phpqt_internals.cpp.orig kdebindings-4 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 @@ ++++ kdebindings-4.2.96/php/phpqt/src/zphp/z_extension.h 2009-07-20 12:53:16.000000000 +0200 +@@ -43,8 +43,10 @@ + #define PHP_QT_ME(classname, name, arg_info, flags) PHP_QT_FENTRY(name, ZEND_MN(classname##_##name), arg_info, flags) // this is needed for override return_value, see qobject_cast - #if(PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) --static +-#if(PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) ++#if PHP_MAJOR_VERSION >= 5 ++#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 2) + static ++#endif ZEND_BEGIN_ARG_INFO_EX(phpqt_cast_arginfo, 0, 1, 0) ZEND_END_ARG_INFO(); #endif diff --git a/kdebindings.spec b/kdebindings.spec index fee8582..924b779 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -32,7 +32,7 @@ Name: kdebindings Version: 4.2.96 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE bindings to non-C++ languages # http://techbase.kde.org/Policies/Licensing_Policy @@ -495,6 +495,9 @@ rm -rf %{buildroot} %changelog +* Mon Jul 20 2009 Than Ngo - 4.2.96-4 +- allow for build php-5.2.x + * Mon Jul 20 2009 Than Ngo - 4.2.96-3 - fix build issue with php-5.3.x