packages: php-pecl-runkit/php-pecl-runkit.spec, php-pecl-runkit/php52-api-w...

[glen]

Author: glen                         Date: Sun Jun  6 15:31:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix some warnings with php52

---- Files affected:
packages/php-pecl-runkit:
   php-pecl-runkit.spec (1.19 -> 1.20) , php52-api-warnings.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pecl-runkit/php-pecl-runkit.spec
diff -u packages/php-pecl-runkit/php-pecl-runkit.spec:1.19 packages/php-pecl-runkit/php-pecl-runkit.spec:1.20
--- packages/php-pecl-runkit/php-pecl-runkit.spec:1.19	Sun Jun  6 16:40:10 2010
+++ packages/php-pecl-runkit/php-pecl-runkit.spec	Sun Jun  6 17:31:37 2010
@@ -11,6 +11,7 @@
 Source0:	http://pecl.php.net/get/%{modname}-%{version}.tgz
 # Source0-md5:	855786f79a3803972b04e44c32cece8d
 Patch0:		branch.diff
+Patch1:		php52-api-warnings.patch
 URL:		http://pecl.php.net/package/runkit/
 BuildRequires:	php-devel >= 4:5.2
 BuildRequires:	rpmbuild(macros) >= 1.344
@@ -41,6 +42,7 @@
 %setup -qc
 mv %{modname}-%{version}/* .
 %patch0 -p0
+%patch1 -p1
 
 %build
 phpize
@@ -80,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/06/06 15:31:37  glen
+- fix some warnings with php52
+
 Revision 1.19  2010/06/06 14:40:10  glen
 - copy ru desc from fedora (seems they copied pl from us)
 

================================================================
Index: packages/php-pecl-runkit/php52-api-warnings.patch
diff -u /dev/null packages/php-pecl-runkit/php52-api-warnings.patch:1.1
--- /dev/null	Sun Jun  6 17:31:43 2010
+++ packages/php-pecl-runkit/php52-api-warnings.patch	Sun Jun  6 17:31:37 2010
@@ -0,0 +1,42 @@
+--- php-pecl-runkit-0.9/runkit.c~	2010-06-06 18:30:08.000000000 +0300
++++ php-pecl-runkit-0.9/runkit.c	2010-06-06 18:30:11.272865268 +0300
+@@ -195,11 +195,7 @@
+  */
+ PHP_MINIT_FUNCTION(runkit)
+ {
+-#ifdef ZTS
+-	ts_allocate_id(&runkit_globals_id, sizeof(zend_runkit_globals), php_runkit_globals_ctor, NULL);
+-#else
+-	php_runkit_globals_ctor(&runkit_globals);
+-#endif
++	ZEND_INIT_MODULE_GLOBALS(runkit, php_runkit_globals_ctor, php_runkit_globals_ctor);
+ 
+ #if defined(PHP_RUNKIT_SUPERGLOBALS) || defined(PHP_RUNKIT_MANIPULATION)
+ 	REGISTER_INI_ENTRIES();
+@@ -364,7 +360,7 @@
+ {
+ #ifdef PHP_RUNKIT_SUPERGLOBALS
+ 	if (RUNKIT_G(superglobals)) {
+-		zend_hash_apply(RUNKIT_G(superglobals), php_runkit_superglobal_dtor TSRMLS_CC);
++		zend_hash_apply(RUNKIT_G(superglobals), (apply_func_t) php_runkit_superglobal_dtor TSRMLS_CC);
+ 
+ 		zend_hash_destroy(RUNKIT_G(superglobals));
+ 		FREE_HASHTABLE(RUNKIT_G(superglobals));
+@@ -374,7 +370,7 @@
+ #ifdef PHP_RUNKIT_MANIPULATION
+ 	if (RUNKIT_G(misplaced_internal_functions)) {
+ 		/* Just wipe out rename-to targets before restoring originals */
+-		zend_hash_apply(RUNKIT_G(misplaced_internal_functions), php_runkit_destroy_misplaced_functions TSRMLS_CC);
++		zend_hash_apply(RUNKIT_G(misplaced_internal_functions), (apply_func_t) php_runkit_destroy_misplaced_functions TSRMLS_CC);
+ 		zend_hash_destroy(RUNKIT_G(misplaced_internal_functions));
+ 		FREE_HASHTABLE(RUNKIT_G(misplaced_internal_functions));
+ 		RUNKIT_G(misplaced_internal_functions) = NULL;
+@@ -382,7 +378,7 @@
+ 
+ 	if (RUNKIT_G(replaced_internal_functions)) {
+ 		/* Restore internal functions */
+-		zend_hash_apply_with_arguments(RUNKIT_G(replaced_internal_functions), php_runkit_restore_internal_functions, 1, RUNKIT_TSRMLS_C);
++		zend_hash_apply_with_arguments(RUNKIT_G(replaced_internal_functions), (apply_func_args_t) php_runkit_restore_internal_functions, 1, RUNKIT_TSRMLS_C);
+ 		zend_hash_destroy(RUNKIT_G(replaced_internal_functions));
+ 		FREE_HASHTABLE(RUNKIT_G(replaced_internal_functions));
+ 		RUNKIT_G(replaced_internal_functions) = NULL;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-runkit/php-pecl-runkit.spec?r1=1.19&r2=1.20&f=u