Fixed gcc-4.1 compilation failure, bug #130708.

Package-Manager: portage-2.1_rc2-r3

4 files changed, 139 insertions, 23 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 1b89b5fd9293..7d4248c3ade4 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.43 2006/05/01 11:07:23 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.44 2006/05/29 18:32:34 ehmsen Exp $
+
+  29 May 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/texmacs-1.0.6-gcc-4.1.patch, texmacs-1.0.6-r1.ebuild:
+  Fixed gcc-4.1 compilation failure, bug #130708.
 
   01 May 2006; Martin Ehmsen <ehmsen@gentoo.org> texmacs-1.0.4-r1.ebuild,
   texmacs-1.0.5.6.ebuild, texmacs-1.0.6-r1.ebuild:
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 7f731aa3a014..576a792aa296 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,35 +1,39 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 baca78d1d4965ee4075158953a4c3fed26e855eb SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 size 267
+AUX TeXmacs.desktop 267 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 SHA1 baca78d1d4965ee4075158953a4c3fed26e855eb SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08
 MD5 235442e11a960e89fe244ad6307eccf5 files/TeXmacs.desktop 267
 RMD160 9c538fb430c4e496a9571e84d0c1622c16279045 files/TeXmacs.desktop 267
 SHA256 f6292ac99e7adc8efd006df2dc458b4f8bc075dd5c4be2b8fdeb30a63198ff08 files/TeXmacs.desktop 267
-AUX texmacs-1.0.6-maxima-5.9.3.patch 3124 RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a SHA1 3ee2b964d65d3210bc13d4ecfb00533779e05c5e SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68 size 3124
+AUX texmacs-1.0.6-gcc-4.1.patch 3178 RMD160 9d1751b8ad20c4f0d66d1f1ce07b94332b44ded5 SHA1 73566ca36669826f5378484b54e98bbcfd49cf2c SHA256 551e4b3cbff71b53e3f0d7cf10da20f284f779c7835a765cf7a859afebe95040
+MD5 12b2077d5fb4ffb7e62bc08832304e68 files/texmacs-1.0.6-gcc-4.1.patch 3178
+RMD160 9d1751b8ad20c4f0d66d1f1ce07b94332b44ded5 files/texmacs-1.0.6-gcc-4.1.patch 3178
+SHA256 551e4b3cbff71b53e3f0d7cf10da20f284f779c7835a765cf7a859afebe95040 files/texmacs-1.0.6-gcc-4.1.patch 3178
+AUX texmacs-1.0.6-maxima-5.9.3.patch 3124 RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a SHA1 3ee2b964d65d3210bc13d4ecfb00533779e05c5e SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68
 MD5 9b7c2d85c61c9a916d877889fa4ff8bc files/texmacs-1.0.6-maxima-5.9.3.patch 3124
 RMD160 5f2e3a770f6c4262e4590cf19f76c6f68dc04f6a files/texmacs-1.0.6-maxima-5.9.3.patch 3124
 SHA256 9bb18a81fb457894ff72c09ca0dc569859e373ae6beda2a7ee10f2924114bd68 files/texmacs-1.0.6-maxima-5.9.3.patch 3124
-DIST TeXmacs-1.0.4-R3-src.tar.gz 2456451 size 2456451
-DIST TeXmacs-1.0.5.6-src.tar.gz 2994800 size 2994800
-DIST TeXmacs-1.0.6-src.tar.gz 3617687 RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16 size 3617687
-DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81 size 2899193
-EBUILD texmacs-1.0.4-r1.ebuild 1594 RMD160 7efe4d0ad4bebc2aef4df01a160eb3406e7edc5f SHA1 7ac21ec28368bbfddb80ab594e899b3c26431ccf SHA256 dfbc482218dc4a1a37f944f34f4cb0511f5937aa898b5cb7f08e5ba31e68a148 size 1594
+DIST TeXmacs-1.0.4-R3-src.tar.gz 2456451
+DIST TeXmacs-1.0.5.6-src.tar.gz 2994800
+DIST TeXmacs-1.0.6-src.tar.gz 3617687 RMD160 c7825cd81eee2f76864ae6559fecb2e8ac45ebd5 SHA1 8ff6d97880f529d85575b792df778cb856f00c21 SHA256 27734426db5f678a122eb765299e4050361bb59e15b5705b2e8eafef48d0bc16
+DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
+EBUILD texmacs-1.0.4-r1.ebuild 1594 RMD160 7efe4d0ad4bebc2aef4df01a160eb3406e7edc5f SHA1 7ac21ec28368bbfddb80ab594e899b3c26431ccf SHA256 dfbc482218dc4a1a37f944f34f4cb0511f5937aa898b5cb7f08e5ba31e68a148
 MD5 a051fc8410c1ce3632d1956f93635c54 texmacs-1.0.4-r1.ebuild 1594
 RMD160 7efe4d0ad4bebc2aef4df01a160eb3406e7edc5f texmacs-1.0.4-r1.ebuild 1594
 SHA256 dfbc482218dc4a1a37f944f34f4cb0511f5937aa898b5cb7f08e5ba31e68a148 texmacs-1.0.4-r1.ebuild 1594
-EBUILD texmacs-1.0.5.6.ebuild 1742 RMD160 b49bc3afdcfe897cf9230df44317c4ca88312717 SHA1 406c550f025775435de2e07de87895003a694ba3 SHA256 fe59ed1e9dc9c3e4489a909bceb78baa09b6ace1b8fd7a6a8ef8cea90ee52fb0 size 1742
+EBUILD texmacs-1.0.5.6.ebuild 1742 RMD160 b49bc3afdcfe897cf9230df44317c4ca88312717 SHA1 406c550f025775435de2e07de87895003a694ba3 SHA256 fe59ed1e9dc9c3e4489a909bceb78baa09b6ace1b8fd7a6a8ef8cea90ee52fb0
 MD5 2e9639e625c9111c28e5aac5f6ff0fd9 texmacs-1.0.5.6.ebuild 1742
 RMD160 b49bc3afdcfe897cf9230df44317c4ca88312717 texmacs-1.0.5.6.ebuild 1742
 SHA256 fe59ed1e9dc9c3e4489a909bceb78baa09b6ace1b8fd7a6a8ef8cea90ee52fb0 texmacs-1.0.5.6.ebuild 1742
-EBUILD texmacs-1.0.6-r1.ebuild 1861 RMD160 0821ab4920d87ca373a4a414718e84b40d7851ce SHA1 607f5b30f42a2d558b84d05c6494591ae3a6962c SHA256 29e92a2fbbc0678b8a182a5b88f36b4510081e11b28d18ad0b4572d0adcafcbb size 1861
-MD5 c4e4cd7056e10b26f4eb0daa0acecd45 texmacs-1.0.6-r1.ebuild 1861
-RMD160 0821ab4920d87ca373a4a414718e84b40d7851ce texmacs-1.0.6-r1.ebuild 1861
-SHA256 29e92a2fbbc0678b8a182a5b88f36b4510081e11b28d18ad0b4572d0adcafcbb texmacs-1.0.6-r1.ebuild 1861
-MISC ChangeLog 7192 RMD160 5149f26d0cd1a2a99d0e5d991c78c586c7b304c3 SHA1 9f5b0e639071d0481f4b808fedbd6e7905b03ca3 SHA256 f70e1dc6f1580fcbfd2f88eb7edbee3bfd4b2be425a0d9d489cf217d805fa0ab size 7192
-MD5 e12260e42108d63b947c25983fc7d68b ChangeLog 7192
-RMD160 5149f26d0cd1a2a99d0e5d991c78c586c7b304c3 ChangeLog 7192
-SHA256 f70e1dc6f1580fcbfd2f88eb7edbee3bfd4b2be425a0d9d489cf217d805fa0ab ChangeLog 7192
-MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
+EBUILD texmacs-1.0.6-r1.ebuild 1939 RMD160 e15e9e01f89b51ae45a905cc221cb9e142060136 SHA1 a73d6af30469e4c74d532f85a23896cbc611f0be SHA256 c9e1761ebacd267a4fb446b6c40d73b13aa4ada530492e97a8f9724fd817a2ba
+MD5 041f404757db48a41ecf82e9f9ba8952 texmacs-1.0.6-r1.ebuild 1939
+RMD160 e15e9e01f89b51ae45a905cc221cb9e142060136 texmacs-1.0.6-r1.ebuild 1939
+SHA256 c9e1761ebacd267a4fb446b6c40d73b13aa4ada530492e97a8f9724fd817a2ba texmacs-1.0.6-r1.ebuild 1939
+MISC ChangeLog 7355 RMD160 6453750509779c871be5ee9b0c3bcefdd5f6416a SHA1 111c07ff5f123fc871c1a12458d8ce58b81849c4 SHA256 27b197e8919f69196bc8be46cbaa1238dc0300a88894d4fd440fe94548cafdc9
+MD5 c2f551537a30f6858f157f7180b3c96f ChangeLog 7355
+RMD160 6453750509779c871be5ee9b0c3bcefdd5f6416a ChangeLog 7355
+SHA256 27b197e8919f69196bc8be46cbaa1238dc0300a88894d4fd440fe94548cafdc9 ChangeLog 7355
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
@@ -45,7 +49,7 @@ SHA256 c238c221d642c684e5f2273747a5a57b36eae686d9f1bd3e4e860f49b5a2c300 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVev4zxUa4FWw6mwRAuw9AJ92FYHtNOMfkPIkl5+eEegZETzWlQCgj6bw
-o+6qvFLLv76Kk1w08Ybr0/8=
-=W2LK
+iD8DBQFEez5RzxUa4FWw6mwRAjTwAJ0Xi+bv4sPq++S7lQHOZhrHhT8q9QCfeESC
+K9fcQR61xjpfa1SEzXWSSZk=
+=xW4h
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch b/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch
new file mode 100644
index 000000000000..7c684b3160dc
--- /dev/null
+++ b/app-office/texmacs/files/texmacs-1.0.6-gcc-4.1.patch
@@ -0,0 +1,107 @@
+--- texmacs-1.0.6.orig/src/Classes/Atomic/parse_string.hpp
++++ texmacs-1.0.6/src/Classes/Atomic/parse_string.hpp
+@@ -48,4 +48,6 @@
+ };
+ CONCRETE_CODE(parse_string);
+ 
++bool test (parse_string s, string what);
++
+ #endif // defined PARSE_STRING_H
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/System/Classes/url.hpp
++++ texmacs-1.0.6/src/System/Classes/url.hpp
+@@ -42,6 +42,8 @@
+ };
+ CONCRETE_CODE(url);
+ 
++inline url as_url (tree t);
++
+ ostream& operator << (ostream& out, url u);
+ string as_string (url u, int type= URL_SYSTEM);
+ 
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Typeset/boxes.hpp
++++ texmacs-1.0.6/src/Typeset/boxes.hpp
+@@ -252,6 +252,8 @@
+ };
+ ABSTRACT_NULL_CODE(box);
+ 
++void make_eps (url dest, ::display dis, box b, int dpi);
++
+ extern int box_count;
+ inline box_rep::box_rep (path ip2):
+   x0(0), y0(0), x1(0), y1(0), x2(0), y2(0), x3(0), y3(0), x4(0), y4(0),
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Typeset/env.hpp
++++ texmacs-1.0.6/src/Typeset/env.hpp
+@@ -433,5 +433,6 @@
+ tree texmacs_exec (edit_env env, tree cmd);
+ void extract_format (tree fm, tree* r, int n);
+ tree load_inclusion (url u); // implemented in tm_file.cpp
++ostream& operator << (ostream& out, edit_env env);
+ 
+ #endif // defined ENV_H
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Typeset/Bridge/bridge.hpp
++++ texmacs-1.0.6/src/Typeset/Bridge/bridge.hpp
+@@ -73,6 +73,7 @@
+ };
+ ABSTRACT_NULL_CODE(bridge);
+ 
++bridge make_bridge (typesetter ttt, tree st, path ip);
+ ostream& operator << (ostream& out, bridge br);
+ extern bridge nil_bridge;
+ tree substitute (tree t, path p, tree u);
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Typeset/Concat/concater.hpp
++++ texmacs-1.0.6/src/Typeset/Concat/concater.hpp
+@@ -169,6 +169,9 @@
+   friend array<line_item> typeset_marker (edit_env env, path ip);
+ };
+ 
++array<line_item> typeset_concat (edit_env env, tree t, path ip);
++array<line_item> typeset_marker (edit_env env, path ip);
++
+ typedef concater_rep* concater;
+ 
+ #endif // defined CONCATER_H
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Window/ps_device.hpp
++++ texmacs-1.0.6/src/Window/ps_device.hpp
+@@ -102,4 +102,8 @@
+   virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0;
+ };
+ 
++void abs_round (SI& l);
++void abs_round (SI& x, SI& y);
++void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2);
++
+ #endif // defined PS_DEVICE_H
+only in patch2:
+unchanged:
+--- texmacs-1.0.6.orig/src/Window/Widget/Basic/basic_widget.cpp
++++ texmacs-1.0.6/src/Window/Widget/Basic/basic_widget.cpp
+@@ -259,7 +259,7 @@
+ test_window_attached (event ev, widget w) {
+   if (!w->attached ()) {
+     cerr << "\n" << HRULE << "\n";
+-    cerr << ev << " was sent to\n" << w;
++    cerr << (tree)ev << " was sent to\n" << w;
+     cerr << HRULE << "\n";
+     fatal_error ("widget was not yet attached to window",
+ 		 "basic_widget::handle", "basic_diwget.cpp");
+@@ -268,7 +268,7 @@
+ 
+ bool
+ basic_widget_rep::handle (event ev) {
+-  if (DEBUG_EVENTS) cout << "TeXmacs] " << ev << "\n";
++  if (DEBUG_EVENTS) cout << "TeXmacs] " << (tree)ev << "\n";
+   // " ---> " << widget(this) << "\n";
+   if (attached ()) win->set_origin (ox, oy);
+   switch (ev->type) {
diff --git a/app-office/texmacs/texmacs-1.0.6-r1.ebuild b/app-office/texmacs/texmacs-1.0.6-r1.ebuild
index e883a3d3077a..7ed23fd81229 100644
--- a/app-office/texmacs/texmacs-1.0.6-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6-r1.ebuild,v 1.2 2006/05/01 11:07:23 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6-r1.ebuild,v 1.3 2006/05/29 18:32:34 ehmsen Exp $
 
 # although flag-o-matic functions in portage, we should inherit it
 inherit flag-o-matic eutils
@@ -39,7 +39,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-maxima-5.9.3.patch" || die "patch failed"
+	epatch "${FILESDIR}/${P}-maxima-5.9.3.patch" || die "maxima patch failed"
+	epatch "${FILESDIR}/${P}-gcc-4.1.patch" || die "gcc-4.1 patch failed"
 }
 
 src_compile() {