Fix assertion failure in set_prolog_IO/3

Package-Manager: portage-2.1.2-r11

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 264f8aa1eae848794602e6b073ab76e892eb3711..f29db1de5da1e3572cd45cb8e64a154887bc30d2 100644 (file)
--- 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/Manifest b/dev-lang/swi-prolog/Manifest
index c622af2784ba7b21cc273060c487cc1a842b10d8..30e62a04539a97848c97644fdf5d8696d18630c1 100644 (file)
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -138,6 +138,10 @@ AUX swi-prolog-semweb-sparc-alignment.patch 493 RMD160 01dbb170b0ba4f808fcedfa4e
 MD5 6e51d8bc5b62b73596a976e4e9ce4dc5 files/swi-prolog-semweb-sparc-alignment.patch 493
 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 files/swi-prolog-semweb-sparc-alignment.patch 493
 SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a files/swi-prolog-semweb-sparc-alignment.patch 493
+AUX swi-prolog-set_prolog_IO.patch 338 RMD160 f45cf6b5e8fa802025e0adcc2da4a7c9ad833d7b SHA1 308429c4db438f8b3a6bbcc409de4c65c201cd32 SHA256 790b453dbe4f24d47eee02b0f4736358bbdb5de7c50c679c173e59a96b60e896
+MD5 dba78a89fac0da6e87ee0914db41b0e8 files/swi-prolog-set_prolog_IO.patch 338
+RMD160 f45cf6b5e8fa802025e0adcc2da4a7c9ad833d7b files/swi-prolog-set_prolog_IO.patch 338
+SHA256 790b453dbe4f24d47eee02b0f4736358bbdb5de7c50c679c173e59a96b60e896 files/swi-prolog-set_prolog_IO.patch 338
 AUX swi-prolog-ssl-SIO_FLUSHOUTPUT.patch 302 RMD160 4c15cb3f7baa3812d6417a69a9d0c3bc5887aa0a SHA1 5450dcd8c536039f6ce92f1a105d5162d5d97024 SHA256 fd20ebe3a0d5f78bbd80d93d2f5809804c54fe114dc88f39cebd699e32298154
 MD5 0d07c1907732c495ec8f0c673993af18 files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch 302
 RMD160 4c15cb3f7baa3812d6417a69a9d0c3bc5887aa0a files/swi-prolog-ssl-SIO_FLUSHOUTPUT.patch 302
@@ -225,14 +229,14 @@ EBUILD swi-prolog-5.6.27.ebuild 3626 RMD160 8f69edb8f1f827f89326eded518df97aff49
 MD5 7c8223ff19ce5ba9e1556dc7b93ad154 swi-prolog-5.6.27.ebuild 3626
 RMD160 8f69edb8f1f827f89326eded518df97aff494a6c swi-prolog-5.6.27.ebuild 3626
 SHA256 a33f6bd214218b66970120daf0d7d711d0d796e00d7af14bf96c273174d438a6 swi-prolog-5.6.27.ebuild 3626
-EBUILD swi-prolog-5.6.28.ebuild 3669 RMD160 09263dc6b77c9c06b35c8fddb215f009a942e995 SHA1 13c3552f8328a30c2c76206b245e1b602d12bcf4 SHA256 03a95e352a23ee98dc43cd315040f30503ff4df2407a33b455887bb1befade4e
-MD5 a485d547dcd294bb97f96510cc85e3a7 swi-prolog-5.6.28.ebuild 3669
-RMD160 09263dc6b77c9c06b35c8fddb215f009a942e995 swi-prolog-5.6.28.ebuild 3669
-SHA256 03a95e352a23ee98dc43cd315040f30503ff4df2407a33b455887bb1befade4e swi-prolog-5.6.28.ebuild 3669
-MISC ChangeLog 13109 RMD160 6c3f553fd160f56ce415dcd6311f55a49280b932 SHA1 904efa42b02bb2e53c4b1cade214f7ac8ea995b0 SHA256 1dd3508ca3e194d4edfe28a15458f43b604d70276270321f66908557ea206d8c
-MD5 f3e1af40cfb65e03b8d05c3089ed628b ChangeLog 13109
-RMD160 6c3f553fd160f56ce415dcd6311f55a49280b932 ChangeLog 13109
-SHA256 1dd3508ca3e194d4edfe28a15458f43b604d70276270321f66908557ea206d8c ChangeLog 13109
+EBUILD swi-prolog-5.6.28.ebuild 3717 RMD160 7f57fd0d5c3827a15e634fcc8c8215fa8a303b1c SHA1 584ed75b5f1f549de28b08166ed79eac4b36caa0 SHA256 807ad6c1e5211fb0faeb61d8857eda6190479d80efc6368511102d0b03b9fe34
+MD5 c2ca81114a7b9c1f85c98124fb4e1b86 swi-prolog-5.6.28.ebuild 3717
+RMD160 7f57fd0d5c3827a15e634fcc8c8215fa8a303b1c swi-prolog-5.6.28.ebuild 3717
+SHA256 807ad6c1e5211fb0faeb61d8857eda6190479d80efc6368511102d0b03b9fe34 swi-prolog-5.6.28.ebuild 3717
+MISC ChangeLog 13258 RMD160 41adf6a4afc16e1b3c7448b1df59d0567a215fd9 SHA1 493c7812436a24ac45a3b8fd9ced786252fa4412 SHA256 c9dfd61e4f74966258b8ed7627244c2ad588125da7e0c9b8cfdfe8cc67f8dcdd
+MD5 07ddb349747e56da06921e406b04b67f ChangeLog 13258
+RMD160 41adf6a4afc16e1b3c7448b1df59d0567a215fd9 ChangeLog 13258
+SHA256 c9dfd61e4f74966258b8ed7627244c2ad588125da7e0c9b8cfdfe8cc67f8dcdd ChangeLog 13258
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159

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 (file)
index 0000000..ed2eab2
--- /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 26befba6cd7eae3a545fff7313ec0401fa2d6f32..733cc16482f6272c3ea6d8d7f1041c459ebc57dc 100644 (file)
--- 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