From 05cea37b601a0dfba82f228e02f3f849d9c915c5 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Tue, 27 Feb 2007 07:57:23 +0000 Subject: [PATCH] wchar_t fix for sgml package. Package-Manager: portage-2.1.2-r11 --- dev-lang/swi-prolog/ChangeLog | 7 +++- dev-lang/swi-prolog/Manifest | 36 ++++++++++--------- .../files/swi-prolog-sgml-no_attribute.patch | 11 ++++++ dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild | 3 +- dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild | 3 +- dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild | 3 +- 6 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index cc9733e3216a..77f52db3b854 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,11 @@ # 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.68 2007/02/26 07:42:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.69 2007/02/27 07:57:23 keri Exp $ + + 27 Feb 2007; keri + +files/swi-prolog-sgml-no_attribute.patch, swi-prolog-5.6.25.ebuild, + swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild: + wchar_t fix for sgml package. 26 Feb 2007; keri +files/swi-prolog-thread-sandbox.patch, swi-prolog-5.6.25.ebuild, diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index a8c47ac56dcd..aace303050dc 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -142,6 +142,10 @@ AUX swi-prolog-set_prolog_IO.patch 338 RMD160 f45cf6b5e8fa802025e0adcc2da4a7c9ad 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-sgml-no_attribute.patch 543 RMD160 050e3d76c5f9a3d62b90ca282d623f77365426c1 SHA1 43f7fb21589a829d88f02ac8d5ad71e2fef5392d SHA256 69ce7c60540e4c3c5170172006f20ee5367f82adc4ae394485c13597c8670e6a +MD5 3f77c573da3dc4c86469c049bb8d4c6b files/swi-prolog-sgml-no_attribute.patch 543 +RMD160 050e3d76c5f9a3d62b90ca282d623f77365426c1 files/swi-prolog-sgml-no_attribute.patch 543 +SHA256 69ce7c60540e4c3c5170172006f20ee5367f82adc4ae394485c13597c8670e6a files/swi-prolog-sgml-no_attribute.patch 543 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,22 +229,22 @@ EBUILD swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e815191544342 MD5 526d97ded7389423ff88faed8c9aeb91 swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e8151915443426a9f swi-prolog-5.6.24.ebuild 3442 SHA256 05a0ba0adb0321b21ac543124a86fd67719577f03d7308fd47b8ce6254512517 swi-prolog-5.6.24.ebuild 3442 -EBUILD swi-prolog-5.6.25.ebuild 3824 RMD160 0599077151a7054489adb0ced3121388caeaabaf SHA1 c352bb9c0d2ee32bcd0e2c4c48b5716fc5635425 SHA256 ca7747f32b4d8ddd856b98de041652944626f32e6b161f5af63c14bbc55f9c72 -MD5 522cfb161633ccf3f6b817e3c6ab81d5 swi-prolog-5.6.25.ebuild 3824 -RMD160 0599077151a7054489adb0ced3121388caeaabaf swi-prolog-5.6.25.ebuild 3824 -SHA256 ca7747f32b4d8ddd856b98de041652944626f32e6b161f5af63c14bbc55f9c72 swi-prolog-5.6.25.ebuild 3824 -EBUILD swi-prolog-5.6.27.ebuild 3675 RMD160 91013e7d5e60edf669e3c37791514884a1325f4d SHA1 383668d8535e2945939796fcc39f5b5293a7ed9c SHA256 310da5256e2d95dc778c09d271b0e1208c791ce786467578205e14c711ad21c1 -MD5 b5810801f4e1a46c4db69afc86231b17 swi-prolog-5.6.27.ebuild 3675 -RMD160 91013e7d5e60edf669e3c37791514884a1325f4d swi-prolog-5.6.27.ebuild 3675 -SHA256 310da5256e2d95dc778c09d271b0e1208c791ce786467578205e14c711ad21c1 swi-prolog-5.6.27.ebuild 3675 -EBUILD swi-prolog-5.6.28.ebuild 3766 RMD160 f471047dd8e414cbc344a77f5a4d36841a6e9f32 SHA1 b360d1a4e925a9d1c7de532589611116fa198441 SHA256 8b9e79c9f5aa2614e6d422e4ca03fc2b189743932997fcf83f8c078293a20eb3 -MD5 2ce9dca31f3ec2e7ceef78be0c4f4209 swi-prolog-5.6.28.ebuild 3766 -RMD160 f471047dd8e414cbc344a77f5a4d36841a6e9f32 swi-prolog-5.6.28.ebuild 3766 -SHA256 8b9e79c9f5aa2614e6d422e4ca03fc2b189743932997fcf83f8c078293a20eb3 swi-prolog-5.6.28.ebuild 3766 -MISC ChangeLog 13489 RMD160 a8fdd2233fba53ae7c792708068dce8c5ef735d3 SHA1 4cd02927602d64729fb4494c04f19ff324477b84 SHA256 855e9f7f3f215c1e05239677835df6d470c03dccc2ee49ed9ceadba4dfa3b7ad -MD5 c670269d2588bc1213593a345aa4c7ea ChangeLog 13489 -RMD160 a8fdd2233fba53ae7c792708068dce8c5ef735d3 ChangeLog 13489 -SHA256 855e9f7f3f215c1e05239677835df6d470c03dccc2ee49ed9ceadba4dfa3b7ad ChangeLog 13489 +EBUILD swi-prolog-5.6.25.ebuild 3876 RMD160 d3b32a680732a82b574f208228ead341b8c508da SHA1 1b9cf8047672ce29d2452bfb73964f3d132417db SHA256 d3fe47525bccbe08967e18261dc12883d8bf670c9f47881602c0380b2d74e0f3 +MD5 bbbc38e95c1ad8d707a13979f37cf4cd swi-prolog-5.6.25.ebuild 3876 +RMD160 d3b32a680732a82b574f208228ead341b8c508da swi-prolog-5.6.25.ebuild 3876 +SHA256 d3fe47525bccbe08967e18261dc12883d8bf670c9f47881602c0380b2d74e0f3 swi-prolog-5.6.25.ebuild 3876 +EBUILD swi-prolog-5.6.27.ebuild 3727 RMD160 45b860c518f00036651fdf8e21ac2eb58022ddeb SHA1 5eb74c0b23df4ab839f9c92cfdc49a285ada028a SHA256 c326e316725bcbdf380884db010e17792f5362ca906c3f3aad747371fda32604 +MD5 714a90eeb508c8457f05ad7cd4e24a46 swi-prolog-5.6.27.ebuild 3727 +RMD160 45b860c518f00036651fdf8e21ac2eb58022ddeb swi-prolog-5.6.27.ebuild 3727 +SHA256 c326e316725bcbdf380884db010e17792f5362ca906c3f3aad747371fda32604 swi-prolog-5.6.27.ebuild 3727 +EBUILD swi-prolog-5.6.28.ebuild 3818 RMD160 d1d739c1a94f367aec47467c1d663eb0f2c2f9c8 SHA1 daa8086c60964d172a904cf4120a07df67dd2168 SHA256 fdae73b4d87f6d6775de9aa713eb8dc337af9168d36b34185a6a060af02b3896 +MD5 debdd339e21779fa4414292585f7815d swi-prolog-5.6.28.ebuild 3818 +RMD160 d1d739c1a94f367aec47467c1d663eb0f2c2f9c8 swi-prolog-5.6.28.ebuild 3818 +SHA256 fdae73b4d87f6d6775de9aa713eb8dc337af9168d36b34185a6a060af02b3896 swi-prolog-5.6.28.ebuild 3818 +MISC ChangeLog 13685 RMD160 18f5ca6a63df7369f6a18098f8755fa21f5a79d2 SHA1 e3a1ca1cf167b549f222c92298220d11c3ac7296 SHA256 4aca6df7438b7cf22a306d532ffbf409115bb375d55f797348d2776e021cb603 +MD5 fe8012583105c5fc1f15069dfb9be8df ChangeLog 13685 +RMD160 18f5ca6a63df7369f6a18098f8755fa21f5a79d2 ChangeLog 13685 +SHA256 4aca6df7438b7cf22a306d532ffbf409115bb375d55f797348d2776e021cb603 ChangeLog 13685 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-sgml-no_attribute.patch b/dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch new file mode 100644 index 000000000000..e84e88425bb3 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-sgml-no_attribute.patch @@ -0,0 +1,11 @@ +--- pl-5.6.25.orig/packages/sgml/parser.c 2006-11-11 01:58:12.000000000 +1300 ++++ pl-5.6.25/packages/sgml/parser.c 2007-02-27 20:43:08.000000000 +1300 +@@ -5438,7 +5438,7 @@ + { const wchar_t *elem = va_arg(args, wchar_t *); /* element */ + const wchar_t *attr = va_arg(args, wchar_t *); /* attribute */ + +- swprintf(buf, 1024, L"Element \"%ls\" has no attribute \"%s\"", ++ swprintf(buf, 1024, L"Element \"%ls\" has no attribute \"%ls\"", + elem, attr); + error.argv[0] = buf; + error.severity = ERS_WARNING; diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild index d193070a6fb7..ec37e2ca64a7 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.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.25.ebuild,v 1.7 2007/02/26 07:42:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $ inherit eutils java-pkg-opt-2 @@ -51,6 +51,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-ltx2htm.patch epatch "${FILESDIR}"/${PN}-semweb-bitmatrix.patch epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch + epatch "${FILESDIR}"/${PN}-sgml-no_attribute.patch epatch "${FILESDIR}"/${PN}-ssl-cert.patch epatch "${FILESDIR}"/${PN}-ssl-SIO_FLUSHOUTPUT.patch epatch "${FILESDIR}"/${PN}-thread-sandbox.patch diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild index 5269447ec91b..3bb2f64f5390 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.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.27.ebuild,v 1.5 2007/02/26 07:42:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.6 2007/02/27 07:57:23 keri Exp $ inherit eutils java-pkg-opt-2 @@ -50,6 +50,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-jpl-check_java.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch + epatch "${FILESDIR}"/${PN}-sgml-no_attribute.patch epatch "${FILESDIR}"/${PN}-ssl-cert.patch epatch "${FILESDIR}"/${PN}-thread-sandbox.patch epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch 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 f4a1ddc89dac..f7e8025def4a 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.7 2007/02/26 07:42:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $ inherit eutils java-pkg-opt-2 @@ -51,6 +51,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch + epatch "${FILESDIR}"/${PN}-sgml-no_attribute.patch epatch "${FILESDIR}"/${PN}-ssl-cert.patch epatch "${FILESDIR}"/${PN}-set_prolog_IO.patch epatch "${FILESDIR}"/${PN}-thread-sandbox.patch -- 2.26.2