update patch to fix compile on gcc-3.4

Package-Manager: portage-2.0.51.19

4 files changed, 94 insertions, 6 deletions

diff --git a/dev-java/sun-j2sdk/ChangeLog b/dev-java/sun-j2sdk/ChangeLog
index 6fac521b93ba..ac0ceab319de 100644
--- a/dev-java/sun-j2sdk/ChangeLog
+++ b/dev-java/sun-j2sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-j2sdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.34 2005/01/31 21:01:28 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/ChangeLog,v 1.35 2005/04/21 22:56:04 cretin Exp $
+
+  21 Apr 2005; Stefan Jones <cretin@gentoo.org>
+  files/1.5.0/j2sdk-1.5.0-syntax.patch:
+  Updated patch to include gcc-3.4 fixes
 
 *sun-j2sdk-1.5.0 (31 Jan 2005)
 
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest
index ee637c6b2748..255dcf879ce7 100644
--- a/dev-java/sun-j2sdk/Manifest
+++ b/dev-java/sun-j2sdk/Manifest
@@ -1,6 +1,6 @@
 MD5 c06e2a9da33afc0c4cede26fd96ac628 sun-j2sdk-1.4.2.ebuild 3857
-MD5 b1a6381c673a7a36ae4ced3ad544f9b3 sun-j2sdk-1.5.0.ebuild 3496
-MD5 24655c7ec77edfe65b7d2eb0b086cc77 ChangeLog 5009
+MD5 166b01707726a6ed1ef30004a3fe463f sun-j2sdk-1.5.0.ebuild 3496
+MD5 7b190b554551d72b653283b62824207a ChangeLog 5139
 MD5 f4eeb1e3cd292967d0a36065d8bc1e3e sun-j2sdk-1.4.1-r1.ebuild 3990
 MD5 e6418a470f5fcef0c9f4a4de3e2dceea metadata.xml 243
 MD5 3151dccccac816a78850fca950201f6f files/sun-j2sdk-1.4.1 447
@@ -24,4 +24,4 @@ MD5 276f4ce091acd44428e36c15de66f7d1 files/1.4.2/j2sdk-1.4.2-gcc3.3-fixes.patch
 MD5 df6db4b858ad836d290f1862857622d9 files/1.4.2/j2sdk-1.4.2-remove-fixed-paths.patch 4525
 MD5 db4df45b4212ae4c82f6ac2fcf75057f files/1.4.2/j2sdk-1.4.2-gcc3.4-fixes.patch 1958
 MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.2/j2sdk-1.4.2-force-motif.patch 3137
-MD5 e48ae8c6d4f6dbe4485638fc58df6605 files/1.5.0/j2sdk-1.5.0-syntax.patch 6758
+MD5 042607a504dfd2603895fe9397244d47 files/1.5.0/j2sdk-1.5.0-syntax.patch 9281
diff --git a/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch b/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch
index 1c57b16b69f0..29199ca795df 100644
--- a/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch
+++ b/dev-java/sun-j2sdk/files/1.5.0/j2sdk-1.5.0-syntax.patch
@@ -142,3 +142,87 @@
  // do not include  precompiled  header file
  # include "incls/_os_linux.cpp.incl"
  
+--- ./hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp.jj	2004-10-19 11:41:46.000000000 -0700
++++ ./hotspot/src/os_cpu/linux_i486/vm/atomic_linux_i486.inline.hpp	2005-04-20 15:43:20.000000000 -0700
+@@ -111,7 +111,7 @@
+                     "cmpxchg8b (%5); xchgl %%ebx, %1"
+                     : "=A" (old_value), "=r" (lo)
+                     : "1" (lo), "c" (hi), "A" (compare_value), "r" (dest), "m" (mp)
+-                    : "%ebx", "cc", "memory");
++                    : "cc", "memory");
+   return old_value;
+ }
+ 
+
+--- ./j2se/src/share/native/sun/font/bidi/uchardir.c.jj	2004-10-19 12:00:29.000000000 -0700
++++ ./j2se/src/share/native/sun/font/bidi/uchardir.c	2005-04-21 09:49:51.000000000 -0700
+@@ -581,22 +581,6 @@
+     11, 14, 16, 12, 15
+ };
+ 
+-UCharDirection u_getDirection(uint32_t cp) {
+-  if (cp < ASCII_LIMIT) {
+-    return ASCII[cp];
+-  }
+-  if (cp < RTL_START) {
+-    return u_getDirectionInternal(cp);
+-  }
+-  if (cp < RTL_LIMIT) {
+-    return RTL[cp - RTL_START];
+-  }
+-  if (cp < 0x110000) {
+-    return u_getDirectionInternal(cp);
+-  }
+-  return 0;
+-}
+-
+ static UCharDirection u_getDirectionInternal(uint32_t cp) {
+   int dc;
+   int n;
+@@ -624,6 +608,22 @@
+   return dc;
+ }
+ 
++UCharDirection u_getDirection(uint32_t cp) {
++  if (cp < ASCII_LIMIT) {
++    return ASCII[cp];
++  }
++  if (cp < RTL_START) {
++    return u_getDirectionInternal(cp);
++  }
++  if (cp < RTL_LIMIT) {
++    return RTL[cp - RTL_START];
++  }
++  if (cp < 0x110000) {
++    return u_getDirectionInternal(cp);
++  }
++  return 0;
++}
++
+ UCharDirection
+ u_charDirection(UChar ch) {
+     return u_getDirection(ch);
+--- ./j2se/src/solaris/bin/java_md.c.jj	2004-10-19 12:01:43.000000000 -0700
++++ ./j2se/src/solaris/bin/java_md.c	2005-04-20 21:08:13.000000000 -0700
+@@ -1136,7 +1136,7 @@
+                     : /* Inputs */
+                     "m" (arg)
+                     : /* Clobbers */
+-                    "%eax", "%ebx", "%ecx", "%edx"
++                    "%eax", "%ecx", "%edx"
+                     );
+   *eaxp = value_of_eax;
+   *ebxp = value_of_ebx;
+--- ./mozilla/share/plugin/mozilla_headers_ns7/nscore.h.jj	2002-09-07 10:12:44.000000000 -0700
++++ ./mozilla/share/plugin/mozilla_headers_ns7/nscore.h	2005-04-21 11:12:36.000000000 -0700
+@@ -202,6 +202,10 @@
+   #define HAVE_CPP_2BYTE_WCHAR_T
+ #endif
+ 
++#if defined(__GNUC__)
++#define HAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX
++#endif
++
+   /* until we get an autoconf test for this, we'll assume it's on (since we're using it already) */
+ #define HAVE_CPP_TYPENAME
+ 
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
index 853a3d05cb5c..5eb210c2fc23 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild,v 1.2 2005/01/31 21:01:28 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.5.0.ebuild,v 1.3 2005/04/21 22:56:04 cretin Exp $
 
 inherit java