Codebase list lwjgl / 4b35d3c debian / patches / p / nomacosx.diff
4b35d3c

Tree @4b35d3c (Download .tar.gz)

nomacosx.diff @4b35d3craw · history · blame

From: Gabriele Giacone <1o5g4r8o@gmail.com>
Subject: [PATCH] p/nomacosx

This patch removes references to macosx-related classes.

Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>

---
 build.xml                                       |    8 ++++----
 platform_build/build-applet.xml                 |    2 +-
 src/java/org/lwjgl/MacOSXSysImplementation.java |    4 ++--
 src/java/org/lwjgl/opengl/MacOSXDisplay.java    |   10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

Index: lwjgl-2.7.1+dfsg/build.xml
===================================================================
--- lwjgl-2.7.1+dfsg.orig/build.xml	2011-03-26 14:25:06.000000000 -0400
+++ lwjgl-2.7.1+dfsg/build.xml	2011-03-26 14:25:37.000000000 -0400
@@ -246,7 +246,7 @@
 			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
 		</javah>
 
-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
+		<!--		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
 			<class name="org.lwjgl.MacOSXSysImplementation" />
 			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
@@ -254,7 +254,7 @@
 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
-		</javah>
+		</javah> -->
 
 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />
@@ -293,13 +293,13 @@
 				</tokenfilter>
 			</filterchain>
 		</loadfile>
-		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
+		<!--		<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
 			<filterchain>
 				<tokenfilter>
 	    		<containsstring contains="JNI_VERSION ="/>
 				</tokenfilter>
 			</filterchain>
-		</loadfile>
+		</loadfile> -->
 		<loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
 			<filterchain>
 				<tokenfilter>
@@ -314,13 +314,13 @@
 				</tokenfilter>
 			</filterchain>
 		</loadfile>
-		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
+		<!--		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
 			<filterchain>
 				<tokenfilter>
 	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
 				</tokenfilter>
 			</filterchain>
-		</loadfile>
+		</loadfile> -->
 		<echo>
 			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
 			lwjgl.native.windows.version = ${lwjgl.native.windows.version}
Index: lwjgl-2.7.1+dfsg/platform_build/build-applet.xml
===================================================================
--- lwjgl-2.7.1+dfsg.orig/platform_build/build-applet.xml	2011-03-26 14:25:06.000000000 -0400
+++ lwjgl-2.7.1+dfsg/platform_build/build-applet.xml	2011-03-26 14:25:09.000000000 -0400
@@ -1,7 +1,7 @@
 <project name="applet">
 
 	<!-- Create our packer task -->
-	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
+<!--	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>	-->
 
 	<target name="applet">
 		<antcall target="-applet">
Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
===================================================================
--- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-03-26 14:25:06.000000000 -0400
+++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java	2011-03-26 14:25:09.000000000 -0400
@@ -33,7 +33,7 @@
 
 import java.awt.Toolkit;
 
-import com.apple.eio.FileManager;
+//import com.apple.eio.FileManager;
 
 /**
  *
@@ -55,7 +55,7 @@
 
 	public boolean openURL(String url) {
 		try {
-			FileManager.openURL(url);
+//			FileManager.openURL(url);
 			return true;
 		} catch (Exception e) {
 			LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java
===================================================================
--- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2011-03-26 14:25:06.000000000 -0400
+++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java	2011-03-26 14:25:09.000000000 -0400
@@ -54,9 +54,9 @@
 import org.lwjgl.LWJGLException;
 import org.lwjgl.LWJGLUtil;
 
-import com.apple.eawt.Application;
-import com.apple.eawt.ApplicationAdapter;
-import com.apple.eawt.ApplicationEvent;
+//import com.apple.eawt.Application;
+//import com.apple.eawt.ApplicationAdapter;
+//import com.apple.eawt.ApplicationEvent;
 
 import static org.lwjgl.opengl.GL11.*;
 
@@ -79,11 +79,11 @@
 		try {
 			AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
 				public Object run() throws Exception {
-					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
+/*					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
 						public void handleQuit(ApplicationEvent event) {
 							doHandleQuit();
 						}
-					});
+					});	*/
 					return null;
 				}
 			});