Codebase list lwjgl / debian/2.7.1+dfsg-4
release 2.7.1+dfsg-4 Michael Gilbert 9 years ago
15 changed file(s) with 254 addition(s) and 301 deletion(s). Raw diff Collapse all Expand all
+3
-1
debian/changelog less more
0 lwjgl (2.7.1+dfsg-4) UNRELEASED; urgency=medium
0 lwjgl (2.7.1+dfsg-4) unstable; urgency=low
11
2 * Update packaging standards.
23 * Remove binutils-gold build conflict (closes: #749957).
4 * Build-depend openjdk-7 >= 7u71-2.5.3-1 (closes: #761269).
35
46 -- Michael Gilbert <mgilbert@debian.org> Mon, 13 Oct 2014 06:05:00 +0000
57
+1
-1
debian/compat less more
0 7
0 9
+6
-6
debian/control less more
55 Gabriele Giacone <1o5g4r8o@gmail.com>,
66 Michael Gilbert <mgilbert@debian.org>,
77 Build-Depends:
8 debhelper (>= 8),
8 debhelper (>= 9),
99 javahelper,
1010 ant,
1111 ant-optional,
12 default-jdk,
12 openjdk-7-jdk (>= 7u71-2.5.3),
1313 libjinput-java,
1414 libxrandr-dev,
1515 libxxf86vm-dev,
1717 libxt-dev,
1818 Build-Depends-Indep:
1919 default-jdk-doc,
20 Standards-Version: 3.9.3
21 Vcs-Git: git://git.debian.org/git/pkg-java/lwjgl.git
22 Vcs-Browser: http://git.debian.org/?p=pkg-java/lwjgl.git
23 Homepage: http://lwjgl.org/
20 Standards-Version: 3.9.6
21 Vcs-Git: git://anonscm.debian.org/pkg-java/lwjgl.git
22 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/lwjgl.git
23 Homepage: http://lwjgl.org
2424
2525 Package: liblwjgl-java
2626 Architecture: all
+7
-6
debian/copyright less more
0 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
0 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
11 Upstream-Name: lwjgl - Lightweight Java Game Library
22 Upstream-Contact: LWJGL developers <info@lwjgl.org>
3 Source: http://java-game-lib.svn.sourceforge.net/viewvc/java-game-lib/
43
54 Files: *
65 Copyright: 2002-2010, Lightweight Java Game Library Project
7 License: BSD
6 License: BSD-3-clause
87 Redistribution and use in source and binary forms, with or without
98 modification, are permitted provided that the following conditions are
109 met:
3029
3130 Files: ./src/native/common/extgl.c ./src/native/windows/extgl_wgl.c
3231 Copyright: 2001-2002, Lev Povalahev <levp@gmx.net>
33 License: BSD
32 License: BSD-3-clause
3433 Redistribution and use in source and binary forms, with or without
3534 modification, are permitted provided that the following conditions are
3635 met:
5554 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5655
5756 Files: debian/*
58 Copyright: 2010, Gabriele Giacone <1o5g4r8o@gmail.com>
59 License: BSD
57 Copyright:
58 2010 Gabriele Giacone <1o5g4r8o@gmail.com>
59 2011-2014 Michael Gilbert <mgilbert@debian.org>
60 License: BSD-3-clause
6061 Redistribution and use in source and binary forms, with or without
6162 modification, are permitted provided that the following conditions are
6263 met:
+73
-0
debian/patches/allarchs.patch less more
0 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Description: support for building on all architectures
2
3 --- a/platform_build/linux_ant/build.xml
4 +++ b/platform_build/linux_ant/build.xml
5 @@ -6,12 +6,14 @@
6 <property name="libname64" value="liblwjgl64.so"/>
7 <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
8 <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
9 + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXcursor -lXrandr -lXxf86vm -L${java.home}/lib/${os.arch}" />
10 <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
11
12 <target name="clean">
13 <delete>
14 <fileset dir="x32"/>
15 <fileset dir="x64"/>
16 + <fileset dir="deb"/>
17 <fileset dir="." includes="*.o"/>
18 <fileset dir="." includes="*.so"/>
19 </delete>
20 @@ -41,6 +43,7 @@
21
22 <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
23 <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
24 + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
25
26 <condition property="build.32bit.only">
27 <not>
28 @@ -59,8 +62,11 @@
29 </and>
30 </condition>
31
32 - <antcall target="compile32"/>
33 - <antcall target="compile64"/>
34 + <condition property="build.debian">
35 + <os name="Linux" />
36 + </condition>
37 +
38 + <antcall target="compiledeb" />
39 </target>
40
41 <target name="compile32" unless="build.64bit.only">
42 @@ -114,4 +120,30 @@
43 <fileset file="${libname64}"/>
44 </apply>
45 </target>
46 +
47 + <target name="compiledeb">
48 + <mkdir dir="deb"/>
49 + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
50 + <arg line="${cflags32} ${cflags_pthread}"/>
51 + <arg value="-I${java.home}/include"/>
52 + <arg value="-I${java.home}/include/linux"/>
53 + <arg value="-I${java.home}/../include"/>
54 + <arg value="-I${java.home}/../include/linux"/>
55 + <arg value="-I${java.home}/../include/solaris"/>
56 + <arg value="-I${native}/common"/>
57 + <arg value="-I${native}/linux"/>
58 + <mapper type="glob" from="*.c" to="*.o"/>
59 + <fileset dir="${native}/linux" includes="*.c"/>
60 + <fileset dir="${native}/generated" includes="*.c"/>
61 + <fileset dir="${native}/common" includes="*.c"/>
62 + </apply>
63 + <apply dir="." parallel="true" executable="gcc" failonerror="true">
64 + <srcfile/>
65 + <arg line="${linker_flagsdeb}"/>
66 + <fileset dir="deb" includes="*.o"/>
67 + </apply>
68 + <apply dir="." parallel="true" executable="strip" failonerror="true">
69 + <fileset file="${libname32}"/>
70 + </apply>
71 + </target>
72 </project>
+13
-0
debian/patches/javadoc.patch less more
0 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Description: link against system javadoc
2
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -513,6 +513,7 @@
6 <!-- Creates the Javadoc -->
7 <target name="javadoc" description="Creates javadoc from java source code">
8 <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
9 + <link href="/usr/share/doc/default-jdk-doc/api/" />
10 <fileset refid="lwjgl.javadoc.fileset" />
11 <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
12 <bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+115
-0
debian/patches/nomacosx.patch less more
0 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Description: remove references to macosx-related classes
2
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -246,7 +246,7 @@
6 <class name="org.lwjgl.opengl.WindowsContextImplementation" />
7 </javah>
8
9 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
10 + <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
11 <class name="org.lwjgl.MacOSXSysImplementation" />
12 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
13 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
14 @@ -254,7 +254,7 @@
15 <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
16 <class name="org.lwjgl.opengl.MacOSXDisplay" />
17 <class name="org.lwjgl.opengl.MacOSXContextImplementation" />
18 - </javah>
19 + </javah> -->
20
21 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
22 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
23 @@ -293,13 +293,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 @@ -314,13 +314,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 --- a/src/java/org/lwjgl/MacOSXSysImplementation.java
67 +++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
68 @@ -33,7 +33,7 @@ package org.lwjgl;
69
70 import java.awt.Toolkit;
71
72 -import com.apple.eio.FileManager;
73 +//import com.apple.eio.FileManager;
74
75 /**
76 *
77 @@ -55,7 +55,7 @@ final class MacOSXSysImplementation exte
78
79 public boolean openURL(String url) {
80 try {
81 - FileManager.openURL(url);
82 +// FileManager.openURL(url);
83 return true;
84 } catch (Exception e) {
85 LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
86 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
87 +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
88 @@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
89 import org.lwjgl.LWJGLException;
90 import org.lwjgl.LWJGLUtil;
91
92 -import com.apple.eawt.Application;
93 -import com.apple.eawt.ApplicationAdapter;
94 -import com.apple.eawt.ApplicationEvent;
95 +//import com.apple.eawt.Application;
96 +//import com.apple.eawt.ApplicationAdapter;
97 +//import com.apple.eawt.ApplicationEvent;
98
99 import static org.lwjgl.opengl.GL11.*;
100
101 @@ -79,11 +79,11 @@ final class MacOSXDisplay implements Dis
102 try {
103 AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
104 public Object run() throws Exception {
105 - Application.getApplication().addApplicationListener(new ApplicationAdapter() {
106 +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
107 public void handleQuit(ApplicationEvent event) {
108 doHandleQuit();
109 }
110 - });
111 + }); */
112 return null;
113 }
114 });
+0
-83
debian/patches/p/allarchs.diff less more
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/allarchs
2
3 This patch to build on all archs.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 platform_build/linux_ant/build.xml | 36 ++++++++++++++++++++++++++++++++++--
9 1 files changed, 34 insertions(+), 2 deletions(-)
10
11 Index: lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml
12 ===================================================================
13 --- lwjgl-2.7.1+dfsg.orig/platform_build/linux_ant/build.xml 2011-03-26 14:15:36.000000000 -0400
14 +++ lwjgl-2.7.1+dfsg/platform_build/linux_ant/build.xml 2011-03-26 14:20:54.000000000 -0400
15 @@ -6,12 +6,14 @@
16 <property name="libname64" value="liblwjgl64.so"/>
17 <property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
18 <property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
19 + <property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" />
20 <property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
21
22 <target name="clean">
23 <delete>
24 <fileset dir="x32"/>
25 <fileset dir="x64"/>
26 + <fileset dir="deb"/>
27 <fileset dir="." includes="*.o"/>
28 <fileset dir="." includes="*.so"/>
29 </delete>
30 @@ -41,6 +43,7 @@
31
32 <property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
33 <property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
34 + <property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
35
36 <condition property="build.32bit.only">
37 <not>
38 @@ -59,8 +62,11 @@
39 </and>
40 </condition>
41
42 - <antcall target="compile32"/>
43 - <antcall target="compile64"/>
44 + <condition property="build.debian">
45 + <os name="Linux" />
46 + </condition>
47 +
48 + <antcall target="compiledeb" />
49 </target>
50
51 <target name="compile32" unless="build.64bit.only">
52 @@ -114,4 +120,30 @@
53 <fileset file="${libname64}"/>
54 </apply>
55 </target>
56 +
57 + <target name="compiledeb">
58 + <mkdir dir="deb"/>
59 + <apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
60 + <arg line="${cflags32} ${cflags_pthread}"/>
61 + <arg value="-I${java.home}/include"/>
62 + <arg value="-I${java.home}/include/linux"/>
63 + <arg value="-I${java.home}/../include"/>
64 + <arg value="-I${java.home}/../include/linux"/>
65 + <arg value="-I${java.home}/../include/solaris"/>
66 + <arg value="-I${native}/common"/>
67 + <arg value="-I${native}/linux"/>
68 + <mapper type="glob" from="*.c" to="*.o"/>
69 + <fileset dir="${native}/linux" includes="*.c"/>
70 + <fileset dir="${native}/generated" includes="*.c"/>
71 + <fileset dir="${native}/common" includes="*.c"/>
72 + </apply>
73 + <apply dir="." parallel="true" executable="gcc" failonerror="true">
74 + <srcfile/>
75 + <arg line="${linker_flagsdeb}"/>
76 + <fileset dir="deb" includes="*.o"/>
77 + </apply>
78 + <apply dir="." parallel="true" executable="strip" failonerror="true">
79 + <fileset file="${libname32}"/>
80 + </apply>
81 + </target>
82 </project>
+0
-23
debian/patches/p/javadoc.diff less more
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/javadoc
2
3 This patch links javadoc to system javadoc.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 1 +
9 1 files changed, 1 insertions(+), 0 deletions(-)
10
11 Index: lwjgl-2.7.1+dfsg/build.xml
12 ===================================================================
13 --- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:21:11.000000000 -0400
14 +++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:23:33.000000000 -0400
15 @@ -511,6 +511,7 @@
16 <!-- Creates the Javadoc -->
17 <target name="javadoc" description="Creates javadoc from java source code">
18 <javadoc destdir="${lwjgl.docs}/javadoc" classpath="${lwjgl.lib}/jinput.jar" author="true" version="true" use="true" source="1.5" windowtitle="LWJGL API" useexternalfile="true">
19 + <link href="/usr/share/doc/default-jdk-doc/api/" />
20 <fileset refid="lwjgl.javadoc.fileset" />
21 <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle>
22 <bottom><![CDATA[<i>Copyright &#169; 2002-2009 lwjgl.org. All Rights Reserved.</i>]]></bottom>
+0
-134
debian/patches/p/nomacosx.diff less more
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/nomacosx
2
3 This patch removes references to macosx-related classes.
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 8 ++++----
9 platform_build/build-applet.xml | 2 +-
10 src/java/org/lwjgl/MacOSXSysImplementation.java | 4 ++--
11 src/java/org/lwjgl/opengl/MacOSXDisplay.java | 10 +++++-----
12 4 files changed, 12 insertions(+), 12 deletions(-)
13
14 Index: lwjgl-2.7.1+dfsg/build.xml
15 ===================================================================
16 --- lwjgl-2.7.1+dfsg.orig/build.xml 2011-03-26 14:25:06.000000000 -0400
17 +++ lwjgl-2.7.1+dfsg/build.xml 2011-03-26 14:25:37.000000000 -0400
18 @@ -246,7 +246,7 @@
19 <class name="org.lwjgl.opengl.WindowsContextImplementation" />
20 </javah>
21
22 - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
23 + <!-- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
24 <class name="org.lwjgl.MacOSXSysImplementation" />
25 <class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
26 <class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
27 @@ -254,7 +254,7 @@
28 <class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
29 <class name="org.lwjgl.opengl.MacOSXDisplay" />
30 <class name="org.lwjgl.opengl.MacOSXContextImplementation" />
31 - </javah>
32 + </javah> -->
33
34 <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
35 <class name="org.lwjgl.opengl.AWTSurfaceLock" />
36 @@ -293,13 +293,13 @@
37 </tokenfilter>
38 </filterchain>
39 </loadfile>
40 - <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
41 + <!-- <loadfile srcfile="${lwjgl.src}/java/org/lwjgl/MacOSXSysImplementation.java" property="lwjgl.java.macosx.version">
42 <filterchain>
43 <tokenfilter>
44 <containsstring contains="JNI_VERSION ="/>
45 </tokenfilter>
46 </filterchain>
47 - </loadfile>
48 + </loadfile> -->
49 <loadfile srcfile="${lwjgl.src.native}/windows/org_lwjgl_WindowsSysImplementation.h" property="lwjgl.native.windows.version">
50 <filterchain>
51 <tokenfilter>
52 @@ -314,13 +314,13 @@
53 </tokenfilter>
54 </filterchain>
55 </loadfile>
56 - <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
57 + <!-- <loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
58 <filterchain>
59 <tokenfilter>
60 <containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
61 </tokenfilter>
62 </filterchain>
63 - </loadfile>
64 + </loadfile> -->
65 <echo>
66 lwjgl.java.windows.version = ${lwjgl.java.windows.version}
67 lwjgl.native.windows.version = ${lwjgl.native.windows.version}
68 Index: lwjgl-2.7.1+dfsg/platform_build/build-applet.xml
69 ===================================================================
70 --- lwjgl-2.7.1+dfsg.orig/platform_build/build-applet.xml 2011-03-26 14:25:06.000000000 -0400
71 +++ lwjgl-2.7.1+dfsg/platform_build/build-applet.xml 2011-03-26 14:25:09.000000000 -0400
72 @@ -1,7 +1,7 @@
73 <project name="applet">
74
75 <!-- Create our packer task -->
76 - <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
77 +<!-- <taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/> -->
78
79 <target name="applet">
80 <antcall target="-applet">
81 Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java
82 ===================================================================
83 --- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:06.000000000 -0400
84 +++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/MacOSXSysImplementation.java 2011-03-26 14:25:09.000000000 -0400
85 @@ -33,7 +33,7 @@
86
87 import java.awt.Toolkit;
88
89 -import com.apple.eio.FileManager;
90 +//import com.apple.eio.FileManager;
91
92 /**
93 *
94 @@ -55,7 +55,7 @@
95
96 public boolean openURL(String url) {
97 try {
98 - FileManager.openURL(url);
99 +// FileManager.openURL(url);
100 return true;
101 } catch (Exception e) {
102 LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
103 Index: lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java
104 ===================================================================
105 --- lwjgl-2.7.1+dfsg.orig/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:06.000000000 -0400
106 +++ lwjgl-2.7.1+dfsg/src/java/org/lwjgl/opengl/MacOSXDisplay.java 2011-03-26 14:25:09.000000000 -0400
107 @@ -54,9 +54,9 @@
108 import org.lwjgl.LWJGLException;
109 import org.lwjgl.LWJGLUtil;
110
111 -import com.apple.eawt.Application;
112 -import com.apple.eawt.ApplicationAdapter;
113 -import com.apple.eawt.ApplicationEvent;
114 +//import com.apple.eawt.Application;
115 +//import com.apple.eawt.ApplicationAdapter;
116 +//import com.apple.eawt.ApplicationEvent;
117
118 import static org.lwjgl.opengl.GL11.*;
119
120 @@ -79,11 +79,11 @@
121 try {
122 AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
123 public Object run() throws Exception {
124 - Application.getApplication().addApplicationListener(new ApplicationAdapter() {
125 +/* Application.getApplication().addApplicationListener(new ApplicationAdapter() {
126 public void handleQuit(ApplicationEvent event) {
127 doHandleQuit();
128 }
129 - });
130 + }); */
131 return null;
132 }
133 });
+0
-40
debian/patches/p/systemjinput.diff less more
0 From: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Subject: [PATCH] p/systemjinput
2
3 This patch to build against system jinput libraries
4
5 Signed-off-by: Gabriele Giacone <1o5g4r8o@gmail.com>
6
7 ---
8 build.xml | 4 ++--
9 1 files changed, 2 insertions(+), 2 deletions(-)
10
11 Index: lwjgl/build.xml
12 ===================================================================
13 --- lwjgl.orig/build.xml 2011-05-06 17:45:23.000000000 -0400
14 +++ lwjgl/build.xml 2011-05-06 17:48:12.000000000 -0400
15 @@ -137,6 +137,7 @@
16 <fileset refid="lwjgl.fileset" />
17 <manifest>
18 <attribute name="Sealed" value="true"/>
19 + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
20 </manifest>
21 </jar>
22
23 @@ -146,6 +147,7 @@
24 <fileset refid="lwjgl_util_applet.fileset" />
25 <manifest>
26 <attribute name="Sealed" value="true"/>
27 + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
28 </manifest>
29 </jar>
30
31 @@ -501,7 +503,7 @@
32 <os name="Mac OS X" />
33 </condition>
34 <property name="native_path_expanded" location="${native_path}"/>
35 - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
36 + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true">
37 <sysproperty key="org.lwjgl.util.Debug" value="true"/>
38 <sysproperty key="java.library.path" value="${native_path_expanded}"/>
39 <arg line="${args}"/>
+4
-4
debian/patches/series less more
0 p/nomacosx.diff
1 p/allarchs.diff
2 p/systemjinput.diff
3 p/javadoc.diff
0 nomacosx.patch
1 allarchs.patch
2 systemjinput.patch
3 javadoc.patch
+30
-0
debian/patches/systemjinput.patch less more
0 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
1 Description: build against system jinput libraries
2
3 --- a/build.xml
4 +++ b/build.xml
5 @@ -137,6 +137,7 @@
6 <fileset refid="lwjgl.fileset" />
7 <manifest>
8 <attribute name="Sealed" value="true"/>
9 + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
10 </manifest>
11 </jar>
12
13 @@ -146,6 +147,7 @@
14 <fileset refid="lwjgl_util_applet.fileset" />
15 <manifest>
16 <attribute name="Sealed" value="true"/>
17 + <attribute name="Class-Path" value="/usr/share/java/jinput.jar"/>
18 </manifest>
19 </jar>
20
21 @@ -501,7 +503,7 @@
22 <os name="Mac OS X" />
23 </condition>
24 <property name="native_path_expanded" location="${native_path}"/>
25 - <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
26 + <java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar" fork="true">
27 <sysproperty key="org.lwjgl.util.Debug" value="true"/>
28 <sysproperty key="java.library.path" value="${native_path_expanded}"/>
29 <arg line="${args}"/>
+2
-2
debian/rules less more
55 TAR := ../$(NAME)_$(VERSION).orig.tar.gz
66 TARDFSG := ../$(NAME)_$(VERSION)+dfsg.orig.tar.gz
77
8 export JAVA_HOME=/usr/lib/jvm/default-java
9 export PATH:=${PATH}:${JAVA_HOME}/bin
8 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
9 export PATH:=$(JAVA_HOME)/bin:$(PATH)
1010
1111 # NOTE: jutils is explicitly included here (without a depends in our control
1212 # file) because jinput.jar lacks jutils in its own "Class-Path" (bug #626002)
+0
-1
debian/source/local-options less more
0 unapply-patches