Author: qboosh Date: Sat Nov 18 20:15:42 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.3.30
---- Files affected:
SOURCES:
swig-format.patch (1.1 -> 1.2) , swig-php-freearg.patch (1.1 -> 1.2) ,
swig-php-vdecl.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/swig-format.patch
diff -u SOURCES/swig-format.patch:1.1 SOURCES/swig-format.patch:1.2
--- SOURCES/swig-format.patch:1.1 Sat Apr 12 11:17:53 2003
+++ SOURCES/swig-format.patch Sat Nov 18 21:15:37 2006
@@ -1,15 +1,16 @@
---- SWIG-1.3.19/Source/Modules/perl5.cxx.orig Tue Dec 3 21:33:33 2002
-+++ SWIG-1.3.19/Source/Modules/perl5.cxx Sat Apr 12 10:56:55 2003
-@@ -129,10 +129,10 @@
- for (i = 1; i < argc; i++) {
+--- swig-1.3.30/Source/Modules/perl5.cxx.orig 2006-11-02 00:54:52.000000000
+0100
++++ swig-1.3.30/Source/Modules/perl5.cxx 2006-11-18 20:37:10.532401750
+0100
+@@ -136,11 +136,11 @@
if (argv[i]) {
- if(strcmp(argv[i],"-package") == 0) {
-- Printf(stderr,"*** -package is no longer supported\n*** use the
directive '%module A::B::C' in your interface file instead\n*** see the Perl
section in the manual for details.\n");
-+ Printf(stderr,"*** -package is no longer supported\n*** use the
directive '%%module A::B::C' in your interface file instead\n*** see the Perl
section in the manual for details.\n");
+ if (strcmp(argv[i], "-package") == 0) {
+ Printf(stderr,
+- "*** -package is no longer supported\n*** use the directive
'%module A::B::C' in your interface file instead\n*** see the Perl section in
the manual for details.\n");
++ "*** -package is no longer supported\n*** use the directive
'%%module A::B::C' in your interface file instead\n*** see the Perl section in
the manual for details.\n");
SWIG_exit(EXIT_FAILURE);
- } else if(strcmp(argv[i],"-interface") == 0) {
-- Printf(stderr,"*** -interface is no longer supported\n*** use the
directive '%module A::B::C' in your interface file instead\n*** see the Perl
section in the manual for details.\n");
-+ Printf(stderr,"*** -interface is no longer supported\n*** use the
directive '%%module A::B::C' in your interface file instead\n*** see the Perl
section in the manual for details.\n");
+ } else if (strcmp(argv[i], "-interface") == 0) {
+ Printf(stderr,
+- "*** -interface is no longer supported\n*** use the directive
'%module A::B::C' in your interface file instead\n*** see the Perl section in
the manual for details.\n");
++ "*** -interface is no longer supported\n*** use the directive
'%%module A::B::C' in your interface file instead\n*** see the Perl section in
the manual for details.\n");
SWIG_exit(EXIT_FAILURE);
- } else if (strcmp(argv[i],"-exportall") == 0) {
+ } else if (strcmp(argv[i], "-exportall") == 0) {
export_all = 1;
================================================================
Index: SOURCES/swig-php-freearg.patch
diff -u SOURCES/swig-php-freearg.patch:1.1 SOURCES/swig-php-freearg.patch:1.2
--- SOURCES/swig-php-freearg.patch:1.1 Tue Oct 7 22:13:21 2003
+++ SOURCES/swig-php-freearg.patch Sat Nov 18 21:15:37 2006
@@ -1,20 +1,20 @@
---- SWIG/Source/Modules/php4.cxx.orig 2003-10-07 22:11:59.308330872 +0200
-+++ SWIG/Source/Modules/php4.cxx 2003-10-07 22:11:33.000000000 +0200
-@@ -1149,6 +1149,8 @@
+--- swig-1.3.30/Source/Modules/php4.cxx.orig 2006-11-02 00:54:52.000000000
+0100
++++ swig-1.3.30/Source/Modules/php4.cxx 2006-11-18 20:49:44.639530500
+0100
+@@ -1172,6 +1172,8 @@
/* Insert cleanup code */
for (i = 0, p = l; p; i++) {
+ if(i>= (num_required))
+ Printf(cleanup,"\tif(arg_count > %d) {\n", i);
- if ((tm = Getattr(p,"tmap:freearg"))) {
- Replaceall(tm,"$source",Getattr(p,"lname"));
- Printv(cleanup,tm,"\n",NIL);
-@@ -1156,6 +1158,8 @@
+ if ((tm = Getattr(p, "tmap:freearg"))) {
+ Replaceall(tm, "$source", Getattr(p, "lname"));
+ Printv(cleanup, tm, "\n", NIL);
+@@ -1179,6 +1181,8 @@
} else {
p = nextSibling(p);
}
+ if (i >= num_required)
+ Printf(cleanup,"}\n");
}
-
+
/* Insert argument output code */
================================================================
Index: SOURCES/swig-php-vdecl.patch
diff -u SOURCES/swig-php-vdecl.patch:1.3 SOURCES/swig-php-vdecl.patch:1.4
--- SOURCES/swig-php-vdecl.patch:1.3 Tue Oct 18 19:40:31 2005
+++ SOURCES/swig-php-vdecl.patch Sat Nov 18 21:15:37 2006
@@ -1,28 +1,28 @@
---- swig-1.3.27/Source/Modules/php4.cxx.orig 2005-10-18 18:32:40.296808424
+0200
-+++ swig-1.3.27/Source/Modules/php4.cxx 2005-10-18 19:13:17.642275592
+0200
-@@ -954,10 +954,10 @@
-
- if (mvr) { // do prop[gs]et header
+--- swig-1.3.30/Source/Modules/php4.cxx.orig 2006-11-18 20:50:19.513710000
+0100
++++ swig-1.3.30/Source/Modules/php4.cxx 2006-11-18 21:01:47.056678750
+0100
+@@ -1019,9 +1019,9 @@
+
+ if (mvr) { // do prop[gs]et header
if (mvrset) {
-- Printf(f->def, "static int _wrap_%s(zend_property_reference
*property_reference, pval *value) {\n",iname);
-+ Printf(f->def, "static int _wrap_%s(zend_property_reference
*property_reference, pval *value) {\nTSRMLS_FETCH();\n",iname);
- }
- else {
-- Printf(f->def, "static pval _wrap_%s(zend_property_reference
*property_reference) {\n",iname);
-+ Printf(f->def, "static pval _wrap_%s(zend_property_reference
*property_reference) {\nTSRMLS_FETCH();\n",iname);
+- Printf(f->def, "static int _wrap_%s(zend_property_reference
*property_reference, pval *value) {\n", iname);
++ Printf(f->def, "static int _wrap_%s(zend_property_reference
*property_reference, pval *value) {\nTSRMLS_FETCH();\n", iname);
+ } else {
+- Printf(f->def, "static pval _wrap_%s(zend_property_reference
*property_reference) {\n", iname);
++ Printf(f->def, "static pval _wrap_%s(zend_property_reference
*property_reference) {\nTSRMLS_FETCH();\n", iname);
}
} else {
// regular header
-@@ -1653,10 +1653,10 @@
- }
+@@ -2262,11 +2262,11 @@
if (base.item) {
-- Printf(s_oinit,"if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL)))
zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
-+ Printf(s_oinit,"if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL
TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
- shadow_classname,shadow_classname,GetChar(base.item,
"sym:name"), shadow_classname);
+ Printf(s_oinit,
+- "if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL)))
zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
++ "if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,&ce_swig_%s,NULL
TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
+ shadow_classname, shadow_classname, GetChar(base.item,
"sym:name"), shadow_classname);
} else {
-- Printf(s_oinit,"if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL)))
zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
-+ Printf(s_oinit,"if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL
TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
- shadow_classname,shadow_classname, shadow_classname);
+ Printf(s_oinit,
+- "if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL)))
zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
++ "if (!
(ptr_ce_swig_%s=zend_register_internal_class_ex(&ce_swig_%s,NULL,NULL
TSRMLS_CC))) zend_error(E_ERROR,\"Error registering wrapper for class %s\");\n",
+ shadow_classname, shadow_classname, shadow_classname);
}
- Printf(s_oinit,"\n");
+ Printf(s_oinit, "\n");
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/swig-format.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/swig-php-freearg.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/swig-php-vdecl.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
