aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2015-04-03 13:48:25 -0400
committerGuillaume Horel <guillaume.horel@gmail.com>2015-04-03 13:48:25 -0400
commit7f71886f63907a0eb15091699cc2793c5b516f72 (patch)
tree1b05d60a3c0e3f64cb70f43f7a957082538db6a2 /dev-java/jogl/files
parentdev-java/gluegen: version bump (diff)
downloadsci-7f71886f63907a0eb15091699cc2793c5b516f72.tar.gz
sci-7f71886f63907a0eb15091699cc2793c5b516f72.tar.bz2
sci-7f71886f63907a0eb15091699cc2793c5b516f72.zip
dev-java/jogl: version bump
Package-Manager: portage-2.2.18
Diffstat (limited to 'dev-java/jogl/files')
-rw-r--r--dev-java/jogl/files/disable-applet.diff22
-rw-r--r--dev-java/jogl/files/jogl-2.2.4-notests.patch12
2 files changed, 34 insertions, 0 deletions
diff --git a/dev-java/jogl/files/disable-applet.diff b/dev-java/jogl/files/disable-applet.diff
new file mode 100644
index 000000000..ecbd82a7a
--- /dev/null
+++ b/dev-java/jogl/files/disable-applet.diff
@@ -0,0 +1,22 @@
+Index: libjogl2-java-2.1.4/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.1.4.orig/make/build-newt.xml 2014-02-27 23:21:42.000000000 +0100
++++ libjogl2-java-2.1.4/make/build-newt.xml 2014-02-27 23:32:11.638399263 +0100
+@@ -100,7 +100,7 @@
+ <!-- partitioning -->
+
+ <property name="java.part.core"
+- value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* com/jogamp/newt/util/applet/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
++ value="com/jogamp/newt/* com/jogamp/newt/event/* com/jogamp/newt/util/* jogamp/newt/* jogamp/newt/event/* jogamp/newt/driver/*"/>
+
+ <property name="java.part.opengl"
+ value="com/jogamp/newt/opengl/** jogamp/newt/driver/opengl/**"/>
+@@ -236,7 +236,7 @@
+ -->
+ <target name="java.compile.javase">
+ <javac destdir="${classes}"
+- excludes="${java.excludes.all} ${java.part.driver.android}"
++ excludes="${java.excludes.all} ${java.part.driver.android} com/jogamp/newt/util/applet/*"
+ fork="yes"
+ includeAntRuntime="false"
+ memoryMaximumSize="${javac.memorymax}"
diff --git a/dev-java/jogl/files/jogl-2.2.4-notests.patch b/dev-java/jogl/files/jogl-2.2.4-notests.patch
new file mode 100644
index 000000000..8d24e57c9
--- /dev/null
+++ b/dev-java/jogl/files/jogl-2.2.4-notests.patch
@@ -0,0 +1,12 @@
+diff -urN jogl-v2.2.4.orig/make/build.xml jogl-v2.2.4/make/build.xml
+--- jogl-v2.2.4.orig/make/build.xml 2015-04-03 10:09:28.730409643 -0400
++++ jogl-v2.2.4/make/build.xml 2015-04-03 10:10:57.040418430 -0400
+@@ -8,7 +8,7 @@
+ - Main build target.
+ -->
+
+- <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
++ <target name="all" description="Build nativewindow, jogl and newt projects" depends="init,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build" />
+
+ <target name="all.debug" description="Debug build nativewindow, jogl and newt projects, incl. all junit tests " depends="init.debug,build.nativewindow,build.jogl,build.newt,build.oculusvr,one.dir,tag.build,test.compile,developer-zip-archive" />
+