diff options
| author |   Keri Harris <keri@gentoo.org> | 2007-02-25 04:31:02 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2007-02-25 04:31:02 +0000 |
| commit | b6cbca7499d07720fdc54238c54e332ba23f4c39 (patch) | |
| tree | f49a1a5354b7fc9e8667294db16f2d50f1928898 /dev-lang | |
| parent | version bump - ebuild submitted by Paul Bredbury via bug #168059 (diff) | |
| download | gentoo-2-b6cbca7499d07720fdc54238c54e332ba23f4c39.tar.gz gentoo-2-b6cbca7499d07720fdc54238c54e332ba23f4c39.tar.bz2 gentoo-2-b6cbca7499d07720fdc54238c54e332ba23f4c39.zip | |
Fix assertion failure in set_prolog_IO/3
(Portage version: 2.1.2-r11)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/swi-prolog/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch | 11 | ||||
| -rw-r--r-- | dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 264f8aa1eae8..f29db1de5da1 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.66 2007/02/25 00:36:18 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.67 2007/02/25 04:31:02 keri Exp $ + + 25 Feb 2007; keri <keri@gentoo.org> +files/swi-prolog-set_prolog_IO.patch, + swi-prolog-5.6.28.ebuild: + Fix assertion failure in set_prolog_IO/3 25 Feb 2007; keri <keri@gentoo.org> +files/swi-prolog-jpl-check_java-r1.patch, swi-prolog-5.6.28.ebuild: diff --git a/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch b/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch new file mode 100644 index 000000000000..ed2eab29e8fb --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-set_prolog_IO.patch @@ -0,0 +1,11 @@ +--- pl-5.6.28.orig/src/pl-file.c 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.28/src/pl-file.c 2007-02-25 16:34:14.000000000 +1300 +@@ -3611,7 +3611,7 @@ + releaseStream(in); + if ( out ) + releaseStream(out); +- if ( error && error != out ) ++ if ( error && PL_compare(A2, A3) != 0 ) + releaseStream(error); + + return rval; diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild index 26befba6cd7e..733cc16482f6 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.5 2007/02/25 00:36:18 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.6 2007/02/25 04:31:02 keri Exp $ inherit eutils java-pkg-opt-2 @@ -52,6 +52,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-ltx2htm.patch epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch epatch "${FILESDIR}"/${PN}-ssl-cert.patch + epatch "${FILESDIR}"/${PN}-set_prolog_IO.patch epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch |