packages: php4/php4-mnogosearch-fix.patch - make it compatible with 3.2 too

[glen]

Author: glen                         Date: Thu Jun 25 19:15:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make it compatible with 3.2 too

---- Files affected:
packages/php4:
   php4-mnogosearch-fix.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/php4/php4-mnogosearch-fix.patch
diff -u packages/php4/php4-mnogosearch-fix.patch:1.5 packages/php4/php4-mnogosearch-fix.patch:1.6
--- packages/php4/php4-mnogosearch-fix.patch:1.5	Fri Oct 17 19:09:15 2008
+++ packages/php4/php4-mnogosearch-fix.patch	Thu Jun 25 21:15:20 2009
@@ -1,4 +1,3 @@
-diff -burN php-4.3.9RC2.orig/ext/mnogosearch/config.m4 php-4.3.9RC2/ext/mnogosearch/config.m4
 --- php-4.3.9RC2.orig/ext/mnogosearch/config.m4	2004-09-01 18:13:53.495238432 +0200
 +++ php-4.3.9RC2/ext/mnogosearch/config.m4	2004-09-01 18:16:52.696995624 +0200
 @@ -46,8 +46,10 @@
@@ -13,23 +12,32 @@
      PHP_SUBST(MNOGOSEARCH_SHARED_LIBADD)
      
    fi
---- php-4.4.9/ext/mnogosearch/php_mnogo.c.org	2008-10-17 19:01:41.224322154 +0200
-+++ php-4.4.9/ext/mnogosearch/php_mnogo.c	2008-10-17 19:07:34.984802087 +0200
-@@ -902,7 +902,7 @@
+--- php-4.4.9/ext/mnogosearch/php_mnogo.c~	2009-06-25 22:11:26.000000000 +0300
++++ php-4.4.9/ext/mnogosearch/php_mnogo.c	2009-06-25 22:14:22.544491038 +0300
+@@ -901,10 +901,14 @@
+ 			if (UdmSynonymListLoad(Agent->Conf,val)) {
  				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",Agent->Conf->errstr);
  				RETURN_FALSE;
- #if UDM_VERSION_ID >= 30204
--			} else UdmSynonymListSort(&(Agent->Conf->Synonyms));
++#if UDM_VERSION_ID >= 30300
 +			} else UdmSynonymListSort(&(Agent->Conf->Synonym));
++#else
+ #if UDM_VERSION_ID >= 30204
+ 			} else UdmSynonymListSort(&(Agent->Conf->Synonyms));
  #else
  			} else UdmSynonymListSort(&(Agent->Conf->SynList));
++#endif
  #endif			
-@@ -1819,7 +1819,7 @@
+ 			break;
+ 			
+@@ -1819,7 +1823,11 @@
  		if (UdmSynonymListLoad(Agent->Conf,val)) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",Agent->Conf->errstr);
  			RETURN_FALSE;
--		} else UdmSynonymListSort(&(Agent->Conf->Synonyms));
++#if UDM_VERSION_ID >= 30300
 +		} else UdmSynonymListSort(&(Agent->Conf->Synonym));
++#else
+ 		} else UdmSynonymListSort(&(Agent->Conf->Synonyms));
++#endif
  	} else if (!strcasecmp(var,"Stopwordfile")) {
  		if (UdmStopListLoad(Agent->Conf,val)) {
  			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", Agent->Conf->errstr);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4/php4-mnogosearch-fix.patch?r1=1.5&r2=1.6&f=u