CVS eclipse/debian/patches
Stephan Michels
tashiro-guest at haydn.debian.org
Sun Oct 30 12:10:50 UTC 2005
Update of /cvsroot/pkg-java/eclipse/debian/patches
In directory haydn:/tmp/cvs-serv24024/patches
Modified Files:
eclipse-libswt-mozilla-classic.dpatch
Log Message:
Updated debian/extra/config.ini
to fix the problem with the missing splash screen.
Updated debian/control, debian/extra/eclipse.sh
and debian/patches/eclipse-libswt-mozilla-classic.dpatch
to make it possible to use Firefox instead of Mozilla. Closes: #336285
--- /cvsroot/pkg-java/eclipse/debian/patches/eclipse-libswt-mozilla-classic.dpatch 2005/10/24 19:47:46 1.1
+++ /cvsroot/pkg-java/eclipse/debian/patches/eclipse-libswt-mozilla-classic.dpatch 2005/10/30 12:10:50 1.2
@@ -22,10 +22,9 @@
exit 0
@DPATCH@
-
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java
+diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java
--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java 1970-01-01 01:00:00.000000000 +0100
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java 2005-09-11 13:40:44.000000000 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChromeRegistry.java 2005-10-29 22:31:31.000000000 +0200
@@ -0,0 +1,44 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
@@ -71,9 +70,9 @@
+ super(address);
+ }
+}
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java
+diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java
--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java 1970-01-01 01:00:00.000000000 +0100
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java 2005-09-11 13:40:44.000000000 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXULChromeRegistry.java 2005-10-29 22:31:31.000000000 +0200
@@ -0,0 +1,56 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
@@ -131,10 +130,10 @@
+ return XPCOM.VtblCall(nsIChromeRegistry.LAST_METHOD_ID + 10, getAddress(), runtimeProvider);
+ }
+}
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
---- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-09-11 12:32:26.000000000 +0200
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-09-11 13:40:43.000000000 +0200
-@@ -52,6 +52,7 @@
+diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-10-29 22:19:31.000000000 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java 2005-10-29 22:31:31.000000000 +0200
+@@ -54,6 +54,7 @@
public static final String NS_MEMORY_CONTRACTID = "@mozilla.org/xpcom/memory-service;1"; //$NON-NLS-1$
public static final String NS_PROMPTSERVICE_CONTRACTID = "@mozilla.org/embedcomp/prompt-service;1"; //$NON-NLS-1$
public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
@@ -142,45 +141,48 @@
/* XPCOM constants */
public static final int NS_OK = 0;
-diff -P -r -u ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java
---- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-09-11 12:32:27.000000000 +0200
-+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-09-11 13:40:44.000000000 +0200
-@@ -201,6 +201,38 @@
+diff -u -r -P ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java
+--- ../source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-10-29 22:19:31.000000000 +0200
++++ source-tree/plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/Browser.java 2005-10-29 22:38:18.000000000 +0200
+@@ -201,6 +201,41 @@
rc = windowWatcher.SetWindowCreator(WindowCreator.getAddress());
if (rc != XPCOM.NS_OK) error(rc);
windowWatcher.Release();
+
-+ // get service manager
-+ rc = XPCOM.NS_GetServiceManager(result);
-+ if (rc != XPCOM.NS_OK) error(rc);
-+ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
++ // Get service manager
++ rc = XPCOM.NS_GetServiceManager(result);
++ if (rc != XPCOM.NS_OK) error(rc);
++ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
+
-+ // get chrome registry
-+ serviceManager = new nsIServiceManager(result[0]);
-+ result[0] = 0;
-+ buffer = XPCOM.NS_CHROMEREGISTRY_CONTRACTID.getBytes();
-+ aContractID = new byte[buffer.length + 1];
-+ System.arraycopy(buffer, 0, aContractID, 0, buffer.length);
-+ rc = serviceManager.GetServiceByContractID(aContractID, nsIXULChromeRegistry.NS_XULCHROMEREGISTRY_IID, result);
-+ if (rc != XPCOM.NS_OK) error(rc);
-+ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
-+ serviceManager.Release();
++ // Get chrome registry
++ serviceManager = new nsIServiceManager(result[0]);
++ result[0] = 0;
++ buffer = XPCOM.NS_CHROMEREGISTRY_CONTRACTID.getBytes();
++ aContractID = new byte[buffer.length + 1];
++ System.arraycopy(buffer, 0, aContractID, 0, buffer.length);
++ rc = serviceManager.GetServiceByContractID(aContractID, nsIXULChromeRegistry.NS_XULCHROMEREGISTRY_IID, result);
++ serviceManager.Release();
++
++ if (rc == XPCOM.NS_OK) {
++ // if chrome registry is available
++ if (result[0] == 0) error(XPCOM.NS_NOINTERFACE);
+
-+ // set classic theme
-+ nsIXULChromeRegistry chromRegistry = new nsIXULChromeRegistry(result[0]);
-+ result[0] = 0;
-+ // set runtime provider
-+ rc = chromRegistry.SetRuntimeProvider(true);
-+ if (rc != XPCOM.NS_OK) error(rc);
-+ // set theme
-+ buffer = "classic/1.0".getBytes(); //$NON-NLS-1$
-+ byte[] aThemeBuffer = new byte[buffer.length + 1];
-+ System.arraycopy(buffer, 0, aThemeBuffer, 0, buffer.length);
-+ int /*long*/ aTheme = XPCOM.nsEmbedCString_new(aThemeBuffer, aThemeBuffer.length);
-+ rc = chromRegistry.SelectSkin(aTheme, false);
-+ XPCOM.nsEmbedCString_delete(aTheme);
-+ if (rc != XPCOM.NS_OK) error(rc);
-+ chromRegistry.Release();
++ // Set classic theme
++ nsIXULChromeRegistry chromRegistry = new nsIXULChromeRegistry(result[0]);
++ result[0] = 0;
++ // Set runtime provider
++ rc = chromRegistry.SetRuntimeProvider(true);
++ if (rc != XPCOM.NS_OK) error(rc);
++ // Set theme
++ buffer = "classic/1.0".getBytes(); //$NON-NLS-1$
++ byte[] aThemeBuffer = new byte[buffer.length + 1];
++ System.arraycopy(buffer, 0, aThemeBuffer, 0, buffer.length);
++ int /*long*/ aTheme = XPCOM.nsEmbedCString_new(aThemeBuffer, aThemeBuffer.length);
++ rc = chromRegistry.SelectSkin(aTheme, false);
++ XPCOM.nsEmbedCString_delete(aTheme);
++ if (rc != XPCOM.NS_OK) error(rc);
++ chromRegistry.Release();
++ }
PromptServiceFactory factory = new PromptServiceFactory();
factory.AddRef();
More information about the pkg-java-commits
mailing list