Package list lwjgl / 6e56266
Simplified the OS X patch Emmanuel Bourg 2 years ago
4 changed file(s) with 22 addition(s) and 75 deletion(s). Raw diff Collapse all Expand all
00 lwjgl (2.9.3+dfsg-4) UNRELEASED; urgency=medium
11
22 * Team upload.
3 * Simplified the OS X patch
34 * Standards-Version updated to 4.2.1
45 * Use salsa.debian.org Vcs-* URLs
56
0 Description: Disables the pack200 task
1 Author: Markus Koschany <apo@debian.org>
2 Forwarded: not-needed
3 --- a/platform_build/build-applet.xml
4 +++ b/platform_build/build-applet.xml
5 @@ -1,7 +1,7 @@
6 <project name="applet">
7
8 <!-- Create our packer task -->
9 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
10 + <!--<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>-->
11
12 <target name="applet">
13 <antcall target="-applet">
00 Description: Disables Mac OS X support
11 Author: Markus Koschany <apo@debian.org>
22 Forwarded: not-needed
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -331,7 +331,7 @@
6 <class name="org.lwjgl.opengl.WindowsPeerInfo"/>
7 </javah>
8
9 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx">
10 + <!--<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx">
11 <class name="org.lwjgl.MacOSXSysImplementation" />
12 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
13 <class name="org.lwjgl.opengl.MacOSXPeerInfo" />
14 @@ -341,7 +341,7 @@
15 <class name="org.lwjgl.opengl.MacOSXNativeKeyboard" />
16 <class name="org.lwjgl.opengl.MacOSXNativeMouse" />
17 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
18 - </javah>
19 + </javah>-->
20
21 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}">
22 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
23 @@ -394,13 +394,13 @@
24 </tokenfilter>
25 </filterchain>
26 </loadfile>
27 - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
28 + <!--<loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
29 <filterchain>
30 <tokenfilter>
31 <containsstring contains="JNI_VERSION ="/>
32 </tokenfilter>
33 </filterchain>
34 - </loadfile>
35 + </loadfile>-->
36 <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
37 <filterchain>
38 <tokenfilter>
39 @@ -415,13 +415,13 @@
40 </tokenfilter>
41 </filterchain>
42 </loadfile>
43 - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
44 + <!--<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
45 <filterchain>
46 <tokenfilter>
47 <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
48 </tokenfilter>
49 </filterchain>
50 - </loadfile>
51 + </loadfile>-->
52 <echo>
53 lwjgl.java.windows.version = ${lwjgl.java.windows.version}
54 lwjgl.native.windows.version = ${lwjgl.native.windows.version}
55 --- a/platform_build/build-applet.xml
56 +++ b/platform_build/build-applet.xml
57 @@ -1,7 +1,7 @@
58 <project name="applet">
59
60 <!-- Create our packer task -->
61 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
62 + <!--<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>-->
63
64 <target name="applet">
65 <antcall target="-applet">
66 @@ -144,4 +144,4 @@
67 <param name="output" value="applet/advance/solaris_natives.jar.lzma"/>
68 </antcall>
69 </target>
70 -</project>
71 \ No newline at end of file
72 +</project>
733 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java
744 +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
75 @@ -31,7 +31,7 @@
5 @@ -31,7 +31,6 @@
766 */
777 package org.lwjgl;
788
799 -import com.apple.eio.FileManager;
80 +//import com.apple.eio.FileManager;
8110 import java.security.AccessController;
8211 import java.security.PrivilegedAction;
8312 import java.security.PrivilegedExceptionAction;
84 @@ -57,7 +57,7 @@
13 @@ -57,8 +56,8 @@
8514
8615 public boolean openURL(String url) {
8716 try {
8817 - FileManager.openURL(url);
89 + //FileManager.openURL(url);
90 return true;
18 - return true;
19 + LWJGLUtil.log("LWJGL build for Debian doesn't support OS X system integration");
20 + return false;
9121 } catch (Exception e) {
9222 LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
23 return false;
00 javadoc.patch
11 nomacosx.patch
2 disable-pack200-task.patch
23 allarchs.patch
34 ppc64el.patch
45 systemjinput.patch