[37372] trunk/dports/python/py-sip
erickt at macports.org
erickt at macports.org
Wed Jun 4 16:30:32 PDT 2008
Revision: 37372
http://trac.macosforge.org/projects/macports/changeset/37372
Author: erickt at macports.org
Date: 2008-06-04 16:30:32 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
Fix a segfault in sip.
Modified Paths:
--------------
trunk/dports/python/py-sip/Portfile
Added Paths:
-----------
trunk/dports/python/py-sip/files/patch-gencode.c.diff
Modified: trunk/dports/python/py-sip/Portfile
===================================================================
--- trunk/dports/python/py-sip/Portfile 2008-06-04 23:30:30 UTC (rev 37371)
+++ trunk/dports/python/py-sip/Portfile 2008-06-04 23:30:32 UTC (rev 37372)
@@ -4,6 +4,7 @@
name py-sip
version 4.7.6
+revision 1
categories python devel
maintainers blair openmaintainer
description create Python bindings for C and C++ libraries
@@ -28,7 +29,7 @@
depends_lib port:python24
-patchfiles patch-siputils.py.diff
+patchfiles patch-siputils.py.diff patch-gencode.c.diff
configure.cmd ${prefix}/bin/python2.4 configure.py
configure.pre_args -d ${prefix}/lib/python2.4/site-packages \
Added: trunk/dports/python/py-sip/files/patch-gencode.c.diff
===================================================================
--- trunk/dports/python/py-sip/files/patch-gencode.c.diff (rev 0)
+++ trunk/dports/python/py-sip/files/patch-gencode.c.diff 2008-06-04 23:30:32 UTC (rev 37372)
@@ -0,0 +1,27 @@
+diff --git sipgen/gencode.c sipgen/gencode.c
+index 035c666..41c7e39 100644
+--- sipgen/gencode.c
++++ sipgen/gencode.c
+@@ -2152,10 +2152,19 @@ static void generateEncodedClass(moduleDef *mod, classDef *cd, int last,
+
+ prcode(fp, "{%u, ", cd->classnr);
+
+- if (cmod == mod)
++ if (cmod == mod) {
+ prcode(fp, "255");
+- else
+- prcode(fp, "%u", cmod->modulenr);
++ } else {
++ moduleListDef* m = mod->allimports;
++ int i = 0;
++
++ for (; m != NULL; m = m->next, i++) {
++ if (cmod == m->module) {
++ prcode(fp, "%u", i);
++ break;
++ }
++ }
++ }
+
+ prcode(fp, ", %u}", last);
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080604/dcc2fc35/attachment.htm
More information about the macports-changes
mailing list