Attachment 145171 Details for Bug 77217 – 3.5.1 patch for SPARC

[patch] 3.5.1 patch for SPARC

sparcPatch (text/plain), 4.53 KB, created by Grant Gayed

on 2009-08-20 15:14:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Grant Gayed

Created: 2009-08-20 15:14:57 EDT

Size: 4.53 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java,v
>retrieving revision 1.17
>diff -u -r1.17 AppFileLocProvider.java
>--- Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java	2 Dec 2008 20:32:30 -0000	1.17
>+++ Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java	20 Aug 2009 19:16:24 -0000
>@@ -33,6 +33,13 @@
> 	static final String PLUGINS_DIR = "plugins"; //$NON-NLS-1$
> 	static final String USER_PLUGINS_DIR = ".mozilla" + SEPARATOR_OS + "plugins"; //$NON-NLS-1$ //$NON-NLS-2$
> 	static final String PREFERENCES_FILE = "prefs.js"; //$NON-NLS-1$
>+
>+	static boolean IsSparc;
>+	static {
>+		String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$
>+		String osArch = System.getProperty ("os.arch").toLowerCase (); //$NON-NLS-1$
>+		IsSparc = (osName.startsWith ("sunos") || osName.startsWith ("solaris")) && osArch.startsWith("sparc"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
>+	}
> 	
> AppFileLocProvider (String path) {
> 	mozillaPath = path + SEPARATOR_OS;
>@@ -174,18 +181,28 @@
> 						if (segment.length () > 0) segments.addElement (segment);
> 					} while (end != -1);
> 					int segmentsSize = segments.size ();
>-					pluginDirs = new String [segmentsSize + 2];
>+					pluginDirs = new String [segmentsSize + (IsSparc ? 1 : 2)];
> 					for (index = 0; index < segmentsSize; index++) {
> 						pluginDirs[index] = (String)segments.elementAt (index);
> 					}
> 				}
> 			}
> 			if (pluginDirs == null) {
>-				pluginDirs = new String[2];
>+				pluginDirs = new String[IsSparc ? 1 : 2];
> 			}
> 
> 			/* set the next value to the GRE path + "plugins" */
>-			pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
>+
>+			/*
>+			* Bug on Solaris SPARC.  Attempting to start the java plug-in fails with an
>+			* error indicating that PR_NewMonitor could not be found.  This is a well-
>+			* known problem that many other apps have also encountered, with no
>+			* resolution other than to remove this plug-in.  The Browser workaround is
>+			* to not add the directory containing this plug-in to the plug-in search path. 
>+			*/
>+			if (!IsSparc) {
>+				pluginDirs[index++] = mozillaPath + PLUGINS_DIR;
>+			}
> 
> 			/* set the next value to the home directory + "/.mozilla/plugins" */
> 			pluginDirs[index++] = System.getProperty("user.home") + SEPARATOR_OS + USER_PLUGINS_DIR;
>Index: Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java,v
>retrieving revision 1.20
>diff -u -r1.20 MozillaDelegate.java
>--- Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java	29 May 2009 21:30:19 -0000	1.20
>+++ Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java	20 Aug 2009 19:16:24 -0000
>@@ -35,9 +35,14 @@
> 
> MozillaDelegate (Browser browser) {
> 	super ();
>+	/*
>+	* The mozilla libraries on SPARC need the C++ runtime library to be loaded, but they do not declare
>+	* this dependency because they usually get it for free as a result of the mozilla executable pulling it
>+	* in.  Load this library here and scope it globally so that the mozilla libraries can resolve.
>+	*/
> 	if (IsSparc) {
>-		browser.dispose ();
>-		SWT.error (SWT.ERROR_NO_HANDLES, null, " [Unsupported platform]"); //$NON-NLS-1$
>+		byte[] buffer = Converter.wcsToMbcs (null, "libCrun.so.1", true); //$NON-NLS-1$
>+		OS.dlopen (buffer, OS.RTLD_NOW | OS.RTLD_GLOBAL);
> 	}
> 	this.browser = browser;
> }
>Index: Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java,v
>retrieving revision 1.525
>diff -u -r1.525 OS.java
>--- Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	29 May 2009 21:30:08 -0000	1.525
>+++ Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	20 Aug 2009 19:16:25 -0000
>@@ -407,7 +407,9 @@
> 	public static final int PANGO_WEIGHT_NORMAL = 0x190;
> 	public static final int PANGO_WRAP_WORD = 0;
> 	public static final int PANGO_WRAP_WORD_CHAR = 2;
>+	public static final int RTLD_GLOBAL = 0x100;
> 	public static final int RTLD_LAZY = 1;
>+	public static final int RTLD_NOW = 2;
> 	public static final int XA_CARDINAL = 6;
> 	public static final int XA_WINDOW = 33;
>

Actions: View | Diff

Attachments on bug 77217: 64892 | 83318 | 132756 | 136075 | 136076 | 137061 | 143267 | 145171 | 146000 | 146001