[lwjgl] 06/35: Drop nomacosx.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository lwjgl.

commit a65cc7b0cd8c556588f07919bfa2cc0bacc51db2
Author: Markus Koschany <apo at debian.org>
Date:   Sat Apr 9 18:46:40 2016 +0200

    Drop nomacosx.patch
---
 debian/patches/nomacosx.patch | 115 ------------------------------------------
 debian/patches/series         |   1 -
 2 files changed, 116 deletions(-)

diff --git a/debian/patches/nomacosx.patch b/debian/patches/nomacosx.patch
deleted file mode 100644
index c9cbf3f..0000000
--- a/debian/patches/nomacosx.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-Description: remove references to macosx-related classes
-
---- a/build.xml
-+++ b/build.xml
-@@ -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}
---- a/platform_build/build-applet.xml
-+++ b/platform_build/build-applet.xml
-@@ -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">
---- a/src/java/org/lwjgl/MacOSXSysImplementation.java
-+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
-@@ -33,7 +33,7 @@ package org.lwjgl;
- 
- import java.awt.Toolkit;
- 
--import com.apple.eio.FileManager;
-+//import com.apple.eio.FileManager;
- 
- /**
-  *
-@@ -55,7 +55,7 @@ final class MacOSXSysImplementation exte
- 
- 	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);
---- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
-+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
-@@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
- 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 @@ final class MacOSXDisplay implements Dis
- 		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;
- 				}
- 			});
diff --git a/debian/patches/series b/debian/patches/series
index fee2916..352a151 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-nomacosx.patch
 allarchs.patch
 systemjinput.patch
 javadoc.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lwjgl.git