diff options
author | obache <obache@pkgsrc.org> | 2014-01-08 09:15:58 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2014-01-08 09:15:58 +0000 |
commit | f16ca023d806c3b5f47c0637d8587936b41e09fb (patch) | |
tree | b923353a7f3e63d9b966240a459c5cc44987b827 /print | |
parent | 90ff33726d9600556e5342aaaf3dd13025ec6923 (diff) | |
download | pkgsrc-f16ca023d806c3b5f47c0637d8587936b41e09fb.tar.gz |
Fixes build on Solaris, taken from upstream.
Diffstat (limited to 'print')
-rw-r--r-- | print/py-reportlab/distinfo | 3 | ||||
-rw-r--r-- | print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c | 41 |
2 files changed, 43 insertions, 1 deletions
diff --git a/print/py-reportlab/distinfo b/print/py-reportlab/distinfo index 6f21d203535..8e288ed67c2 100644 --- a/print/py-reportlab/distinfo +++ b/print/py-reportlab/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2011/04/15 08:29:19 adam Exp $ +$NetBSD: distinfo,v 1.16 2014/01/08 09:15:58 obache Exp $ SHA1 (pfbfer.zip) = 38753493035ee5b96746051df63ce4884763622d RMD160 (pfbfer.zip) = 70097e97f2fccc7f4df6b276b21a0fa765a57f55 @@ -6,3 +6,4 @@ Size (pfbfer.zip) = 676909 bytes SHA1 (reportlab-2.5.tar.gz) = 49bd7c2c0b42569323fe4726cac696d4249cd1a5 RMD160 (reportlab-2.5.tar.gz) = adc6db9f724c18988acbc85595acc95b8511f40b Size (reportlab-2.5.tar.gz) = 1917306 bytes +SHA1 (patch-src_rl__addons_renderPM___renderPM.c) = 97672612c2da8c54f7fe7a5fddd52d520f41e45e diff --git a/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c b/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c new file mode 100644 index 00000000000..d4d79a86acd --- /dev/null +++ b/print/py-reportlab/patches/patch-src_rl__addons_renderPM___renderPM.c @@ -0,0 +1,41 @@ +$NetBSD: patch-src_rl__addons_renderPM___renderPM.c,v 1.1 2014/01/08 09:15:58 obache Exp $ + +* change label ERR to RL_ERROR_EXIT fixes breakage in solaris + https://bitbucket.org/rptlab/reportlab/commits/88247310430c31f3e12fc3bc2a1f53be0cca30b7 + +--- src/rl_addons/renderPM/_renderPM.c.orig 2010-05-28 12:52:12.000000000 +0000 ++++ src/rl_addons/renderPM/_renderPM.c +@@ -13,7 +13,7 @@ + #endif + + +-#define VERSION "1.07" ++#define VERSION "1.08" + #define MODULE "_renderPM" + static PyObject *moduleError; + static PyObject *_version; +@@ -77,8 +77,8 @@ static PyObject* parse_utf8(PyObject* se + first = c[i++]; + if(first<0x80) PyList_Append(r, PyInt_FromLong(first)); + else if(first<0xc0){ +-E0: msg = "Imvalid UTF-8 String"; +- goto ERR; ++E0: msg = "Invalid UTF-8 String"; ++ goto RL_ERROR_EXIT; + } + else if(first<0xE0){ + second = c[i++]; +@@ -93,11 +93,11 @@ E0: msg = "Imvalid UTF-8 String"; + } + else{ + msg = "UTF-8 characters outside 16-bit range not supported"; +- goto ERR; ++ goto RL_ERROR_EXIT; + } + } + return r; +-ERR: ++RL_ERROR_EXIT: + Py_DECREF(r); + PyErr_SetString(PyExc_ValueError,msg); + Py_INCREF(Py_None); |