SOURCES: graphviz-php.patch - old one obsolete; now update swig op...

[qboosh]

Author: qboosh                       Date: Wed Dec 27 16:07:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- old one obsolete; now update swig option for php 5.x

---- Files affected:
SOURCES:
   graphviz-php.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/graphviz-php.patch
diff -u SOURCES/graphviz-php.patch:1.2 SOURCES/graphviz-php.patch:1.3
--- SOURCES/graphviz-php.patch:1.2	Sun Feb 12 00:13:35 2006
+++ SOURCES/graphviz-php.patch	Wed Dec 27 17:07:31 2006
@@ -1,40 +1,22 @@
---- graphviz-2.8/tclpkg/gv/gv_php.cpp.orig	2006-02-03 23:38:22.000000000 +0100
-+++ graphviz-2.8/tclpkg/gv/gv_php.cpp	2006-02-11 20:13:04.627942250 +0100
-@@ -704,8 +704,9 @@
-   swig_module_info *ret = 0;
+--- graphviz-2.12/configure.ac.orig	2006-12-27 15:51:47.804344000 +0100
++++ graphviz-2.12/configure.ac	2006-12-27 15:53:32.174292416 +0100
+@@ -631,7 +631,7 @@
+ AC_ARG_ENABLE(php,
+   [AC_HELP_STRING([--disable-php], [don't support php language bindings])])
+ if test "x$enable_php" != "xno"; then
+-if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
++if test `$SWIG -help 2>&1 | $GREP -c '\-php5 *- Generate'` = 0; then
+ 	PHP=
+ 	AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
+ else
+--- graphviz-2.12/tclpkg/gv/Makefile.am.orig	2006-12-27 15:09:27.243566000 +0100
++++ graphviz-2.12/tclpkg/gv/Makefile.am	2006-12-27 15:53:44.046969001 +0100
+@@ -86,7 +86,7 @@
+ libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
+ libgv_php_la_LDFLAGS = 
+ gv_php.cpp $(PHP_hdr): gv.i
+-	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
++	$(SWIG) -c++ -php5 -o gv_php.cpp $(srcdir)/gv.i
  
-   MAKE_STD_ZVAL(pointer);
-+  TSRMLS_FETCH();
- 
--  if (zend_get_constant(const_name, sizeof(const_name), pointer)) {
-+  if (zend_get_constant(const_name, sizeof(const_name), pointer TSRMLS_CC)) {
-     if (pointer->type == IS_LONG) {
-       ret = (swig_module_info *) pointer->value.lval;
-     }
-@@ -714,6 +715,7 @@
- }
- 
- static void SWIG_Php4_SetModule(swig_module_info *pointer) {
-+  TSRMLS_FETCH();
-   REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0);
- }
- 
-@@ -759,8 +761,8 @@
- ZEND_END_MODULE_GLOBALS(gv)
- ZEND_DECLARE_MODULE_GLOBALS(gv)
- #ifdef ZTS
--#define ErrorMsg() TSRMG(gv_globals_id, zend_gv_globals *, error_msg );
--#define ErrorCode() TSRMG(gv_globals_id, zend_gv_globals *, error_code );
-+#define ErrorMsg() TSRMG(gv_globals_id, zend_gv_globals *, error_msg )
-+#define ErrorCode() TSRMG(gv_globals_id, zend_gv_globals *, error_code )
- #else
- #define ErrorMsg() (gv_globals.error_msg)
- #define ErrorCode() (gv_globals.error_code)
-@@ -773,6 +775,7 @@
- static void gv_destroy_globals(zend_gv_globals *gv_globals) { }
- 
- void SWIG_ResetError() {
-+  TSRMLS_FETCH();
-   ErrorMsg() = default_error_msg;
-   ErrorCode() = default_error_code;
- }
+ pkgpythondir = $(pkglibdir)/python
+ PYTHON_hdr = gv.py
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/graphviz-php.patch?r1=1.2&r2=1.3&f=u