diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2002-11-27 02:45:42 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2002-11-27 02:45:42 +0000 |
| commit | 2761d2a6b208c6f725608ea348485bce3d831560 (patch) | |
| tree | f5f9c8b414ab3bb0fbf10bed5cd4ffbf15c90469 /app-text/sablotron | |
| parent | libpng-1.2.5 fix (diff) | |
| download | gentoo-2-2761d2a6b208c6f725608ea348485bce3d831560.tar.gz gentoo-2-2761d2a6b208c6f725608ea348485bce3d831560.tar.bz2 gentoo-2-2761d2a6b208c6f725608ea348485bce3d831560.zip | |
patch a la rajiv - thanks!
Diffstat (limited to 'app-text/sablotron')
| -rw-r--r-- | app-text/sablotron/ChangeLog | 4 | ||||
| -rw-r--r-- | app-text/sablotron/files/Sablot-0.96.1.patch | 46 | ||||
| -rw-r--r-- | app-text/sablotron/sablotron-0.96.ebuild | 4 |
3 files changed, 52 insertions, 2 deletions
diff --git a/app-text/sablotron/ChangeLog b/app-text/sablotron/ChangeLog index 13d26a8a7a5d..17952a2c94f2 100644 --- a/app-text/sablotron/ChangeLog +++ b/app-text/sablotron/ChangeLog @@ -1,11 +1,13 @@ # ChangeLog for app-text/sablotron # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.7 2002/11/26 15:04:24 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/ChangeLog,v 1.8 2002/11/27 02:45:42 mcummings Exp $ *sablotron-0.96 (26 Nov 2002) 26 Nov 2002; Michael Cummings <mcummings@gentoo.org> sablotron-0.96.ebuild: + added patch thanks to rajiv in bug 11085 (rajiv@gentoo.org, that is) + new version, masked for testing, seeing if it resolves bug 11085 *sablotron-0.95-r1 (13 Jul 2002) diff --git a/app-text/sablotron/files/Sablot-0.96.1.patch b/app-text/sablotron/files/Sablot-0.96.1.patch new file mode 100644 index 000000000000..b6a099cf7a93 --- /dev/null +++ b/app-text/sablotron/files/Sablot-0.96.1.patch @@ -0,0 +1,46 @@ +Index: parser.cpp +diff -c parser.cpp:1.63 parser.cpp:1.63.2.1 +*** parser.cpp:1.63 Mon Sep 2 12:06:48 2002 +--- parser.cpp Mon Sep 9 12:39:21 2002 +*************** +*** 428,436 **** + if (!(firstTime && rawBuffer[0] == (char) 0xEF && + rawBuffer[1] == (char) 0xBB && rawBuffer[2] == (char) 0xBF)) + S.setCurrLine(XML_GetCurrentLineNumber(parser)); +! int code = XML_GetErrorCode(parser); + Str eCodeStr, eNameStr; +! eCodeStr = code; + eNameStr = (char*) XML_ErrorString(code); + // XML_ParserFree(parser); -- done later + Err2T(this_, S, E_XML, eCodeStr, eNameStr); +--- 428,436 ---- + if (!(firstTime && rawBuffer[0] == (char) 0xEF && + rawBuffer[1] == (char) 0xBB && rawBuffer[2] == (char) 0xBF)) + S.setCurrLine(XML_GetCurrentLineNumber(parser)); +! XML_Error code = XML_GetErrorCode(parser); + Str eCodeStr, eNameStr; +! eCodeStr = (int)code; + eNameStr = (char*) XML_ErrorString(code); + // XML_ParserFree(parser); -- done later + Err2T(this_, S, E_XML, eCodeStr, eNameStr); +Index: situa.cpp +diff -c situa.cpp:1.23 situa.cpp:1.23.6.1 +*** situa.cpp:1.23 Thu Jul 4 16:12:34 2002 +--- situa.cpp Mon Sep 9 13:12:12 2002 +*************** +*** 262,268 **** + { + if (l[i] > size / __numargs) + { +! b[i] = new char[size / __numargs]; + strcpy(b[i], "..."); + strcpy(b[i] + 3, a[i] + (l[i] - size / __numargs + 3)); + } +--- 262,268 ---- + { + if (l[i] > size / __numargs) + { +! b[i] = new char[size / __numargs + 1]; + strcpy(b[i], "..."); + strcpy(b[i] + 3, a[i] + (l[i] - size / __numargs + 3)); + } diff --git a/app-text/sablotron/sablotron-0.96.ebuild b/app-text/sablotron/sablotron-0.96.ebuild index e60f2246f858..5d80b0a46d39 100644 --- a/app-text/sablotron/sablotron-0.96.ebuild +++ b/app-text/sablotron/sablotron-0.96.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-0.96.ebuild,v 1.1 2002/11/26 15:04:24 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sablotron/sablotron-0.96.ebuild,v 1.2 2002/11/27 02:45:42 mcummings Exp $ MY_P="Sablot-${PV}" S=${WORKDIR}/${MY_P} @@ -17,6 +17,8 @@ DEPEND=">=dev-libs/expat-1.95.1" src_unpack() { unpack ${A} cd ${S}/src/engine + patch -p0 < ${FILESDIR}/Sablot-0.96.1.patch || die + } src_compile() { |