public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
@ 2016-08-08 12:37 James Le Cuirot
  0 siblings, 0 replies; 5+ messages in thread
From: James Le Cuirot @ 2016-08-08 12:37 UTC (permalink / raw
  To: gentoo-commits

commit:     e5c7b9263708a11ed4c1fc54e5409a131505186e
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug  4 17:53:26 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 16:39:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c7b926

dev-java/swt: remove unused patches/files

 .../swt-3.3-callback-pointer-dereferencing.patch   |  23 --
 dev-java/swt/files/swt-3.4-manifest                |  16 -
 .../swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch  | 325 ---------------------
 dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch   | 325 ---------------------
 dev-java/swt/files/swt-3.6-manifest                |  17 --
 5 files changed, 706 deletions(-)

diff --git a/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
deleted file mode 100644
index 92fbab7..0000000
--- a/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# patch from gcj-overlay, not sure if by geki himself
-# removes QA warning about strict-aliasing
---- callback.c.orig	2006-12-12 17:25:26.000000000 +0100
-+++ callback.c	2006-12-12 18:11:34.000000000 +0100
-@@ -250,12 +250,16 @@
- 
- #ifdef JNI_VERSION_1_2
- 	if (IS_JNI_1_2) {
--		(*jvm)->GetEnv(jvm, (void **)&env, JNI_VERSION_1_2);
-+		/* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */
-+		/* jint GetEnv(JavaVM *vm, void **env, jint version);                 */
-+		(*jvm)->GetEnv(jvm, (void *)&env, JNI_VERSION_1_2);
- 	}
- #endif
- 	
- 	if (env == NULL) {
--		(*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
-+		/* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html    */
-+		/* jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); */
-+		(*jvm)->AttachCurrentThread(jvm, (void *)&env, NULL);
- 		if (IS_JNI_1_2) detach = 1;
- 	}
- 	

diff --git a/dev-java/swt/files/swt-3.4-manifest b/dev-java/swt/files/swt-3.4-manifest
deleted file mode 100644
index c11c42a..0000000
--- a/dev-java/swt/files/swt-3.4-manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.4.0
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true

diff --git a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch
deleted file mode 100644
index db2536b..0000000
--- a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-# Patch by Grant Gayed
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651#c18
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=130751
-Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
-retrieving revision 1.105.2.3
-diff -u -r1.105.2.3 Mozilla.java
---- src/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -00001.105.2.3
-+++ src/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
-@@ -47,6 +47,7 @@
- 	Shell tip = null;
- 	Listener listener;
- 	Vector unhookedDOMWindows = new Vector ();
-+	byte[] htmlBytes;
- 
- 	static nsIAppShell AppShell;
- 	static AppFileLocProvider LocationProvider;
-@@ -1130,21 +1131,21 @@
- 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
- 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
- 				 */
--				awaitingNavigate = true;
--				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
--				if (rc != XPCOM.NS_OK) {
--					browser.dispose ();
--					error (rc);
--				}
--				if (result[0] == 0) {
--					browser.dispose ();
--					error (XPCOM.NS_ERROR_NO_INTERFACE);
--				}
--				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
--			    char[] uri = new char[ABOUT_BLANK.length () + 1];
--			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
--				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
--				webNavigation.Release ();
-+//				awaitingNavigate = true;
-+//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-+//				if (rc != XPCOM.NS_OK) {
-+//					browser.dispose ();
-+//					error (rc);
-+//				}
-+//				if (result[0] == 0) {
-+//					browser.dispose ();
-+//					error (XPCOM.NS_ERROR_NO_INTERFACE);
-+//				}
-+//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-+//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
-+//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-+//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-+//				webNavigation.Release ();
- 			}
- 		}
- 		result[0] = 0;
-@@ -1223,6 +1224,7 @@
- }
- 
- public boolean back () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1425,6 +1427,7 @@
- }
- 
- public boolean forward () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1635,6 +1638,7 @@
- 	webBrowser.Release ();
- 	webBrowser = null;
- 	webBrowserObject = null;
-+	htmlBytes = null;
- 
- 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
- 	tip = null;
-@@ -1696,6 +1700,7 @@
- }
- 
- public void refresh () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1817,11 +1822,45 @@
- 		} else {
- 			result[0] = 0;
- 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
--			if (rc != XPCOM.NS_OK) error (rc);
--			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
--			nsIDocShell docShell = new nsIDocShell (result[0]);
--			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
--			docShell.Release ();
-+			if (rc == XPCOM.NS_OK) {
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				nsIDocShell docShell = new nsIDocShell (result[0]);
-+				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-+				docShell.Release ();
-+			} else {
-+				result[0] = 0;
-+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
-+				if (rc == XPCOM.NS_OK) {
-+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+					/*
-+					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
-+					* load to occur, so the events that usually accompany a page change are not
-+					* fired.  To make this behave as expected, navigate to about:blank first and
-+					* then set the html content once the page has loaded.
-+					*/
-+					new nsISupports (result[0]).Release ();
-+					result[0] = 0;
-+
-+					/*
-+					* If htmlBytes is not null then the about:blank page is already being loaded,
-+					* so no Navigate is required.  Just set the html that is to be shown.
-+					*/
-+					boolean blankLoading = htmlBytes != null;
-+					htmlBytes = data;
-+					if (blankLoading) return true;
-+
-+					/* navigate to about:blank */
-+					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-+					if (rc != XPCOM.NS_OK) error (rc);
-+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-+					result[0] = 0;
-+				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
-+				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
-+					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-+					webNavigation.Release ();
-+				}
-+			}
- 		}
- 	}
- 	if (rc != XPCOM.NS_OK) error (rc);
-@@ -1836,6 +1875,7 @@
- }
- 
- public boolean setUrl (String url) {
-+	htmlBytes = null;
- 	awaitingNavigate = false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1852,6 +1892,7 @@
- }
- 
- public void stop () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -2174,6 +2215,108 @@
- 			unhookedDOMWindows.remove (ptrObject);
- 			new nsISupports (ptrObject.value).Release ();
- 		}
-+
-+		/*
-+		* If htmlBytes is not null then there is html from a previous setText() call
-+		* waiting to be set into the about:blank page once it has completed loading. 
-+		*/
-+		if (htmlBytes != null) {
-+			nsIRequest req = new nsIRequest (aRequest);
-+			long /*int*/ name = XPCOM.nsEmbedCString_new ();
-+			rc = req.GetName (name);
-+			if (rc != XPCOM.NS_OK) error (rc);
-+			int length = XPCOM.nsEmbedCString_Length (name);
-+			long /*int*/ buffer = XPCOM.nsEmbedCString_get (name);
-+			byte[] dest = new byte[length];
-+			XPCOM.memmove (dest, buffer, length);
-+			String url = new String (dest);
-+			XPCOM.nsEmbedCString_delete (name);
-+
-+			if (url.startsWith (ABOUT_BLANK)) {
-+				/*
-+				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
-+				 * DOM listeners that were hooked on it (about:blank), so remove them and
-+				 * add new ones after the content has been set.
-+				 */
-+				unhookDOMListeners ();
-+
-+				rc = XPCOM.NS_GetServiceManager (result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+
-+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-+				result[0] = 0;
-+				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+				serviceManager.Release ();
-+
-+				nsIIOService ioService = new nsIIOService (result[0]);
-+				result[0] = 0;
-+				/*
-+				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
-+				* when the URI protocol for the nsInputStreamChannel
-+				* is about:blank.  The fix is to specify the file protocol.
-+				*/
-+				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
-+				long /*int*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-+				rc = ioService.NewURI (aSpec, null, 0, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+				XPCOM.nsEmbedCString_delete (aSpec);
-+				ioService.Release ();
-+
-+				nsIURI uri = new nsIURI (result[0]);
-+				result[0] = 0;
-+
-+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+
-+				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
-+				result[0] = 0;
-+
-+				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
-+				long /*int*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-+
-+				rc = stream.OpenStream (uri.getAddress (), aContentType);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				long /*int*/ ptr = C.malloc (htmlBytes.length);
-+				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
-+				int pageSize = 8192;
-+				int pageCount = htmlBytes.length / pageSize + 1;
-+				long /*int*/ current = ptr;
-+				for (int i = 0; i < pageCount; i++) {
-+					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
-+					if (length > 0) {
-+						rc = stream.AppendToStream (current, length);
-+						if (rc != XPCOM.NS_OK) error (rc);
-+					}
-+					current += pageSize;
-+				}
-+				rc = stream.CloseStream ();
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				C.free (ptr);
-+				XPCOM.nsEmbedCString_delete (aContentType);
-+				stream.Release ();
-+				uri.Release ();
-+				htmlBytes = null;
-+
-+				rc = webBrowser.GetContentDOMWindow (result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				boolean isTop = result[0] == domWindow.getAddress ();
-+				new nsISupports (result[0]).Release ();
-+				result[0] = 0;
-+				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-+				result[0] = 0;
-+				hookDOMListeners (target, isTop);
-+				target.Release ();
-+			}
-+		}
- 		domWindow.Release ();
- 
- 		/*
-Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
-===================================================================
-RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
-diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,55 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by Netscape are Copyright (C) 1998-1999
-+ * Netscape Communications Corporation.  All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * IBM
-+ * -  Binding to permit interfacing between Mozilla and SWT
-+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+package org.eclipse.swt.internal.mozilla;
-+
-+public class nsIWebBrowserStream extends nsISupports {
-+
-+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-+
-+	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
-+		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
-+
-+	public static final nsID NS_IWEBBROWSERSTREAM_IID =
-+		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
-+
-+	public nsIWebBrowserStream(long /*int*/ address) {
-+		super(address);
-+	}
-+
-+	public int OpenStream(long /*int*/ aBaseURI, long /*int*/ aContentType) {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
-+	}
-+
-+	public int AppendToStream(long /*int*/ aData, int aLen) {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
-+	}
-+
-+	public int CloseStream() {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
-+	}
-+}

diff --git a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch
deleted file mode 100644
index 8e82994..0000000
--- a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-# Patch by Grant Gayed
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651#c18
-# https://bugs.eclipse.org/bugs/attachment.cgi?id=130751
-Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java
-===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v
-retrieving revision 1.105.2.3
-diff -u -r1.105.2.3 Mozilla.java
---- src/org/eclipse/swt/browser/Mozilla.java	21 Aug 2008 16:02:30 -00001.105.2.3
-+++ src/org/eclipse/swt/browser/Mozilla.java	2 Apr 2009 19:15:06 -0000
-@@ -47,6 +47,7 @@
- 	Shell tip = null;
- 	Listener listener;
- 	Vector unhookedDOMWindows = new Vector ();
-+	byte[] htmlBytes;
- 
- 	static nsIAppShell AppShell;
- 	static AppFileLocProvider LocationProvider;
-@@ -1130,21 +1131,21 @@
- 				 * Once the client does a proper navigate with either setUrl() or setText() then resume as
- 				 * normal.  The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789.
- 				 */
--				awaitingNavigate = true;
--				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
--				if (rc != XPCOM.NS_OK) {
--					browser.dispose ();
--					error (rc);
--				}
--				if (result[0] == 0) {
--					browser.dispose ();
--					error (XPCOM.NS_ERROR_NO_INTERFACE);
--				}
--				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
--			    char[] uri = new char[ABOUT_BLANK.length () + 1];
--			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
--				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
--				webNavigation.Release ();
-+//				awaitingNavigate = true;
-+//				rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-+//				if (rc != XPCOM.NS_OK) {
-+//					browser.dispose ();
-+//					error (rc);
-+//				}
-+//				if (result[0] == 0) {
-+//					browser.dispose ();
-+//					error (XPCOM.NS_ERROR_NO_INTERFACE);
-+//				}
-+//				nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-+//			    char[] uri = new char[ABOUT_BLANK.length () + 1];
-+//			    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uri, 0);
-+//				rc = webNavigation.LoadURI (uri, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-+//				webNavigation.Release ();
- 			}
- 		}
- 		result[0] = 0;
-@@ -1223,6 +1224,7 @@
- }
- 
- public boolean back () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1425,6 +1427,7 @@
- }
- 
- public boolean forward () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1635,6 +1638,7 @@
- 	webBrowser.Release ();
- 	webBrowser = null;
- 	webBrowserObject = null;
-+	htmlBytes = null;
- 
- 	if (tip != null && !tip.isDisposed ()) tip.dispose ();
- 	tip = null;
-@@ -1696,6 +1700,7 @@
- }
- 
- public void refresh () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1817,11 +1822,45 @@
- 		} else {
- 			result[0] = 0;
- 			rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result);
--			if (rc != XPCOM.NS_OK) error (rc);
--			if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
--			nsIDocShell docShell = new nsIDocShell (result[0]);
--			rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
--			docShell.Release ();
-+			if (rc == XPCOM.NS_OK) {
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				nsIDocShell docShell = new nsIDocShell (result[0]);
-+				rc = docShell.LoadStream (inputStream.getAddress (), uri.getAddress (), aContentType,  aContentCharset, 0);
-+				docShell.Release ();
-+			} else {
-+				result[0] = 0;
-+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
-+				if (rc == XPCOM.NS_OK) {
-+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+					/*
-+					* Setting mozilla's content through nsIWebBrowserStream does not cause a page
-+					* load to occur, so the events that usually accompany a page change are not
-+					* fired.  To make this behave as expected, navigate to about:blank first and
-+					* then set the html content once the page has loaded.
-+					*/
-+					new nsISupports (result[0]).Release ();
-+					result[0] = 0;
-+
-+					/*
-+					* If htmlBytes is not null then the about:blank page is already being loaded,
-+					* so no Navigate is required.  Just set the html that is to be shown.
-+					*/
-+					boolean blankLoading = htmlBytes != null;
-+					htmlBytes = data;
-+					if (blankLoading) return true;
-+
-+					/* navigate to about:blank */
-+					rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result);
-+					if (rc != XPCOM.NS_OK) error (rc);
-+					if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+					nsIWebNavigation webNavigation = new nsIWebNavigation (result[0]);
-+					result[0] = 0;
-+				    char[] uriChars = new char[ABOUT_BLANK.length () + 1];
-+				    ABOUT_BLANK.getChars (0, ABOUT_BLANK.length (), uriChars, 0);
-+					rc = webNavigation.LoadURI (uriChars, nsIWebNavigation.LOAD_FLAGS_NONE, 0, 0, 0);
-+					webNavigation.Release ();
-+				}
-+			}
- 		}
- 	}
- 	if (rc != XPCOM.NS_OK) error (rc);
-@@ -1836,6 +1875,7 @@
- }
- 
- public boolean setUrl (String url) {
-+	htmlBytes = null;
- 	awaitingNavigate = false;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -1852,6 +1892,7 @@
- }
- 
- public void stop () {
-+	htmlBytes = null;
- 	if (awaitingNavigate) return;
- 
- 	long /*int*/[] result = new long /*int*/[1];
-@@ -2174,6 +2215,108 @@
- 			unhookedDOMWindows.remove (ptrObject);
- 			new nsISupports (ptrObject.value).Release ();
- 		}
-+
-+		/*
-+		* If htmlBytes is not null then there is html from a previous setText() call
-+		* waiting to be set into the about:blank page once it has completed loading. 
-+		*/
-+		if (htmlBytes != null) {
-+			nsIRequest req = new nsIRequest (aRequest);
-+			int /*long*/ name = XPCOM.nsEmbedCString_new ();
-+			rc = req.GetName (name);
-+			if (rc != XPCOM.NS_OK) error (rc);
-+			int length = XPCOM.nsEmbedCString_Length (name);
-+			int /*long*/ buffer = XPCOM.nsEmbedCString_get (name);
-+			byte[] dest = new byte[length];
-+			XPCOM.memmove (dest, buffer, length);
-+			String url = new String (dest);
-+			XPCOM.nsEmbedCString_delete (name);
-+
-+			if (url.startsWith (ABOUT_BLANK)) {
-+				/*
-+				 * Setting mozilla's content with nsIWebBrowserStream invalidates the 
-+				 * DOM listeners that were hooked on it (about:blank), so remove them and
-+				 * add new ones after the content has been set.
-+				 */
-+				unhookDOMListeners ();
-+
-+				rc = XPCOM.NS_GetServiceManager (result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+
-+				nsIServiceManager serviceManager = new nsIServiceManager (result[0]);
-+				result[0] = 0;
-+				rc = serviceManager.GetService (XPCOM.NS_IOSERVICE_CID, nsIIOService.NS_IIOSERVICE_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+				serviceManager.Release ();
-+
-+				nsIIOService ioService = new nsIIOService (result[0]);
-+				result[0] = 0;
-+				/*
-+				* Note.  Mozilla ignores LINK tags used to load CSS stylesheets
-+				* when the URI protocol for the nsInputStreamChannel
-+				* is about:blank.  The fix is to specify the file protocol.
-+				*/
-+				byte[] aString = MozillaDelegate.wcsToMbcs (null, URI_FROMMEMORY, false);
-+				int /*long*/ aSpec = XPCOM.nsEmbedCString_new (aString, aString.length);
-+				rc = ioService.NewURI (aSpec, null, 0, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+				XPCOM.nsEmbedCString_delete (aSpec);
-+				ioService.Release ();
-+
-+				nsIURI uri = new nsIURI (result[0]);
-+				result[0] = 0;
-+
-+				rc = webBrowser.QueryInterface (nsIWebBrowserStream.NS_IWEBBROWSERSTREAM_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
-+
-+				nsIWebBrowserStream stream = new nsIWebBrowserStream (result[0]);
-+				result[0] = 0;
-+
-+				byte[] contentTypeBuffer = MozillaDelegate.wcsToMbcs (null, "text/html", true); // $NON-NLS-1$
-+				int /*long*/ aContentType = XPCOM.nsEmbedCString_new (contentTypeBuffer, contentTypeBuffer.length);
-+
-+				rc = stream.OpenStream (uri.getAddress (), aContentType);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				int /*long*/ ptr = C.malloc (htmlBytes.length);
-+				XPCOM.memmove (ptr, htmlBytes, htmlBytes.length);
-+				int pageSize = 8192;
-+				int pageCount = htmlBytes.length / pageSize + 1;
-+				int /*long*/ current = ptr;
-+				for (int i = 0; i < pageCount; i++) {
-+					length = i == pageCount - 1 ? htmlBytes.length % pageSize : pageSize;
-+					if (length > 0) {
-+						rc = stream.AppendToStream (current, length);
-+						if (rc != XPCOM.NS_OK) error (rc);
-+					}
-+					current += pageSize;
-+				}
-+				rc = stream.CloseStream ();
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				C.free (ptr);
-+				XPCOM.nsEmbedCString_delete (aContentType);
-+				stream.Release ();
-+				uri.Release ();
-+				htmlBytes = null;
-+
-+				rc = webBrowser.GetContentDOMWindow (result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				boolean isTop = result[0] == domWindow.getAddress ();
-+				new nsISupports (result[0]).Release ();
-+				result[0] = 0;
-+				rc = domWindow.QueryInterface (nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
-+				if (rc != XPCOM.NS_OK) error (rc);
-+				if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
-+				nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]);
-+				result[0] = 0;
-+				hookDOMListeners (target, isTop);
-+				target.Release ();
-+			}
-+		}
- 		domWindow.Release ();
- 
- 		/*
-Index: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
-===================================================================
-RCS file: Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
-diff -N Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,55 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is Mozilla Communicator client code, released March 31, 1998.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by Netscape are Copyright (C) 1998-1999
-+ * Netscape Communications Corporation.  All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * IBM
-+ * -  Binding to permit interfacing between Mozilla and SWT
-+ * -  Copyright (C) 2003, 2009 IBM Corp.  All Rights Reserved.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+package org.eclipse.swt.internal.mozilla;
-+
-+public class nsIWebBrowserStream extends nsISupports {
-+
-+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 3;
-+
-+	public static final String NS_IWEBBROWSERSTREAM_IID_STR =
-+		"86d02f0e-219b-4cfc-9c88-bd98d2cce0b8";
-+
-+	public static final nsID NS_IWEBBROWSERSTREAM_IID =
-+		new nsID(NS_IWEBBROWSERSTREAM_IID_STR);
-+
-+	public nsIWebBrowserStream(int /*long*/ address) {
-+		super(address);
-+	}
-+
-+	public int OpenStream(int /*long*/ aBaseURI, int /*long*/ aContentType) {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aBaseURI, aContentType);
-+	}
-+
-+	public int AppendToStream(int /*long*/ aData, int aLen) {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aData, aLen);
-+	}
-+
-+	public int CloseStream() {
-+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress());
-+	}
-+}

diff --git a/dev-java/swt/files/swt-3.6-manifest b/dev-java/swt/files/swt-3.6-manifest
deleted file mode 100644
index cf217b0..0000000
--- a/dev-java/swt/files/swt-3.6-manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 3.6
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.mozilla; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
@ 2021-05-02  6:41 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2021-05-02  6:41 UTC (permalink / raw
  To: gentoo-commits

commit:     01e23220a6c881cc18a61732ad91a6f211328c0e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat May  1 17:51:37 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May  2 06:41:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e23220

dev-java/swt: remove unused patches

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20634
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/swt-4.2-as-needed-and-flag-fixes.patch   | 243 ---------------------
 dev-java/swt/files/swt-4.2-manifest                |  16 --
 2 files changed, 259 deletions(-)

diff --git a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
deleted file mode 100644
index 98773c15569..00000000000
--- a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- make_linux.mak-	2012-07-02 00:49:48.729100052 +0000
-+++ make_linux.mak	2012-07-02 00:53:16.753499389 +0000
-@@ -66,7 +66,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -106,7 +106,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
-+CFLAGS += \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
-@@ -130,13 +130,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
- 
- $(SWT_LIB): $(SWT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
- 
- callback.o: callback.c callback.h
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -155,7 +155,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -171,7 +171,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -179,7 +179,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -187,7 +187,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -204,7 +204,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -221,7 +221,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -242,7 +242,7 @@
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
- 	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -262,7 +262,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -279,7 +279,7 @@
- make_webkit: $(WEBKIT_LIB)
- 
- $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
- 
- webkit.o: webkitgtk.c 
- 	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
-@@ -296,7 +296,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak-	2012-07-02 00:53:28.553351871 +0000
-+++ make_freebsd.mak	2012-07-02 00:55:37.369741444 +0000
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
- 
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS += \
- 	-DSWT_VERSION=$(SWT_VERSION) \
- 	$(NATIVE_STATS) \
- 	-DMOZILLA_STRICT_API=1 \
-@@ -91,7 +91,7 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
- 
--CFLAGS = -O -Wall \
-+CFLAGS += \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DFREEBSD -DGTK \
-@@ -115,13 +115,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
- 
- $(SWT_LIB): $(SWT_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
- 
- callback.o: callback.c callback.h
- 	$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
- 
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
--	$(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
- 
- swt.o: swt.c swt.h
- 	$(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
- 
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
- 
- cairo.o: cairo.c cairo.h swt.h
- 	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +156,7 @@
- make_cde: $(CDE_LIB)
- 
- $(CDE_LIB): $(CDE_OBJECTS)
--	$(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
- 
- #
- # AWT lib
-@@ -164,7 +164,7 @@
- make_awt:$(AWT_LIB)
- 
- $(AWT_LIB): $(AWT_OBJECTS)
--	$(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+	$(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
- 
- #
- # Atk lib
-@@ -172,7 +172,7 @@
- make_atk: $(ATK_LIB)
- 
- $(ATK_LIB): $(ATK_OBJECTS)
--	$(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
- 
- atk.o: atk.c atk.h
- 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
- 
- $(GNOME_LIB): $(GNOME_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
- 
- gnome.o: gnome.c 
- 	$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
- 
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
--	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
- 
- xpcom.o: xpcom.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
- 
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
--	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcomxul.o: xpcom.cpp
- 	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +252,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
- 
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
--	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+	$(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
- 
- xpcominit.o: xpcominit.cpp
- 	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +269,7 @@
- make_glx: $(GLX_LIB)
- 
- $(GLX_LIB): $(GLX_OBJECTS)
--	$(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+	$(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
- 
- glx.o: glx.c 
- 	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c

diff --git a/dev-java/swt/files/swt-4.2-manifest b/dev-java/swt/files/swt-4.2-manifest
deleted file mode 100644
index 36736a0db72..00000000000
--- a/dev-java/swt/files/swt-4.2-manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version=4.2.0
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 4.2
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
- org.eclipse.swt.internal.webkit; x-internal:=true


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
@ 2023-03-21  6:07 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2023-03-21  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     dab82896df0e604b23b16da9cfd359d217f76a85
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 20 12:14:42 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 06:07:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab82896

dev-java/swt: No more CFLAGS += -Werror

Closes: https://bugs.gentoo.org/902201
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30259
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/swt-4.27-as-needed-and-flag-fixes.patch  | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
index fffbc910c521..4f769cf9d71b 100644
--- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
@@ -1,7 +1,8 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
-@@ -98,7 +98,7 @@
+diff --git a/make_linux.mak b/make_linux.mak
+index 65c168f..c3a059a 100644
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
@@ -10,7 +11,16 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  		-DSWT_VERSION=$(SWT_VERSION) \
  		$(NATIVE_STATS) \
  		$(SWT_DEBUG) \
-@@ -130,13 +130,13 @@
+@@ -111,7 +111,7 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ 
+ # Treat all warnings as errors. If your new code produces a warning, please
+ # take time to properly understand and fix/silence it as necessary.
+-CFLAGS += -Werror
++# CFLAGS += -Werror
+ 
+ ifndef NO_STRIP
+ 	# -s = Remove all symbol table and relocation information from the executable.
+@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit
  make_swt: $(SWT_LIB) $(SWTPI_LIB)
  
  $(SWT_LIB): $(SWT_OBJECTS)
@@ -26,7 +36,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  swt.o: swt.c swt.h
  	$(CC) $(CFLAGS) -c swt.c
-@@ -169,7 +169,7 @@
+@@ -169,7 +169,7 @@ gtk4_stats.o: gtk4_stats.c gtk4_structs.h gtk4.h gtk4_stats.h swt.h
  make_cairo: $(CAIRO_LIB)
  
  $(CAIRO_LIB): $(CAIRO_OBJECTS)
@@ -35,7 +45,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  cairo.o: cairo.c cairo.h swt.h
  	$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
  make_awt:$(AWT_LIB)
  
  $(AWT_LIB): $(AWT_OBJECTS)
@@ -44,7 +54,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  #
  # Atk lib
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
  make_atk: $(ATK_LIB)
  
  $(ATK_LIB): $(ATK_OBJECTS)
@@ -53,7 +63,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  atk.o: atk.c atk.h
  	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -209,7 +209,7 @@
+@@ -209,7 +209,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
  make_webkit: $(WEBKIT_LIB)
  
  $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
@@ -62,16 +72,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak
  
  webkitgtk.o: webkitgtk.c webkitgtk_custom.h
  	$(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
-# @@ -217,7 +217,7 @@
-#  make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
-#  
-#  $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
-# -	$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-# +	$(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
-#  
-#  webkitgtk_extension.o : webkitgtk_extension.c
-#  	$(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ webkitgtk_custom.o: webkitgtk_custom.c
  make_glx: $(GLX_LIB)
  
  $(GLX_LIB): $(GLX_OBJECTS)


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
@ 2023-03-21  6:07 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2023-03-21  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     424c58e349f472b244d353e66e1a1ed803d50ebd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 06:05:23 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 06:07:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424c58e3

dev-java/swt/files: scrubbed patches

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch      | 8 ++++----
 dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch | 5 ++---
 dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch | 2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
index fba4a36aaf1c..d6cc763ea968 100644
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -1,5 +1,5 @@
---- a/make_linux.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_linux.mak	2010-08-09 22:48:01.515433721 +0000
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -66,7 +66,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
@@ -124,8 +124,8 @@
  
  glx.o: glx.c 
  	$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- a/make_freebsd.mak	2010-06-08 17:30:58.000000000 +0000
-+++ b/make_freebsd.mak	2010-08-09 22:50:26.173246263 +0000
+--- a/make_freebsd.mak
++++ b/make_freebsd.mak
 @@ -64,7 +64,7 @@
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS

diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
index 09bed21d58f8..cb70122aa411 100644
--- a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
@@ -1,6 +1,5 @@
-diff -Naur a/make_linux.mak b/make_linux.mak
---- a/make_linux.mak	2019-01-07 14:08:00.269147198 +0100
-+++ b/make_linux.mak	2019-01-07 14:10:28.645155241 +0100
+--- a/make_linux.mak
++++ b/make_linux.mak
 @@ -101,7 +101,7 @@
  WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
  GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o

diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
index 4f769cf9d71b..c8ea6322f8a1 100644
--- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
+++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch
@@ -1,5 +1,3 @@
-diff --git a/make_linux.mak b/make_linux.mak
-index 65c168f..c3a059a 100644
 --- a/make_linux.mak
 +++ b/make_linux.mak
 @@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
@ 2024-05-29  8:32 Florian Schmaus
  0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2024-05-29  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     92632350c74e25fbcfa41e88c8dbc110baa5d67c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue May 28 16:26:18 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed May 29 08:31:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92632350

dev-java/swt: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/swt/files/build.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml
deleted file mode 100644
index ea775871bf09..000000000000
--- a/dev-java/swt/files/build.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}"/>
-   </target>
-
-   <target name="jar">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-05-29  8:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-29  8:32 [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2023-03-21  6:07 Miroslav Šulc
2023-03-21  6:07 Miroslav Šulc
2021-05-02  6:41 Miroslav Šulc
2016-08-08 12:37 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox