[gluegen2] 04/10: freshen patches for 2.3.1 upstream release
Tony Mancill
tmancill at moszumanska.debian.org
Fri Oct 9 03:22:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository gluegen2.
commit 5fcdb5abedeca473f5d946a032923a2a70ff9e0f
Author: tony mancill <tmancill at debian.org>
Date: Tue Jul 14 22:01:21 2015 -0700
freshen patches for 2.3.1 upstream release
---
debian/patches/armhf.diff | 50 +++++++-----------------
debian/patches/disable-test-zip-archive.diff | 8 ++--
debian/patches/disableArchive7z.diff | 10 ++---
debian/patches/disable_git_call.diff | 8 ++--
debian/patches/fix-alpha-build-config.patch | 8 ++--
debian/patches/fix-ppc64-build-config.patch | 58 ++++++++++------------------
debian/patches/hideException.diff | 8 ++--
debian/patches/jarPath.diff | 6 +--
debian/patches/linker.diff | 8 ++--
debian/patches/missing-arch-symbol.diff | 6 +--
debian/patches/renamedLibrary.diff | 26 ++++++-------
debian/patches/series | 2 +-
12 files changed, 70 insertions(+), 128 deletions(-)
diff --git a/debian/patches/armhf.diff b/debian/patches/armhf.diff
index 169b168..459dcdb 100644
--- a/debian/patches/armhf.diff
+++ b/debian/patches/armhf.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:35.009555506 +0200
-+++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:35.009555506 +0200
-@@ -258,10 +258,16 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -263,10 +263,16 @@
<property name="linker.cfg.id" value="linker.cfg.linux" />
</target>
@@ -12,18 +10,18 @@ Index: gluegen-v2.2.0/make/build.xml
- <property name="linker.cfg.id" value="linker.cfg.linux.armv6" />
+ <target name="declare.linux.armv6.armel" if="isLinuxARMv6Armel">
+ <echo message="Linux.armv6.armel" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux.armv6.armel" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armel" />
+ </target>
+
+ <target name="declare.linux.armv6.armhf" if="isLinuxARMv6Armhf">
+ <echo message="Linux.armv6.armhf" />
-+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <property name="linker.cfg.id" value="linker.cfg.linux.armv6.armhf" />
</target>
<target name="declare.linux.alpha" if="isLinuxAlpha">
-@@ -312,7 +318,7 @@
+@@ -317,7 +323,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
@@ -32,30 +30,9 @@ Index: gluegen-v2.2.0/make/build.xml
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
-Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:35.009555506 +0200
-+++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:35.009555506 +0200
-@@ -124,7 +124,7 @@
- - compiler.cfg.linux
- - compiler.cfg.linux.x86
- - compiler.cfg.linux.amd64
-- - compiler.cfg.linux.armv6
-+ - compiler.cfg.linux.armv6.armel
- - compiler.cfg.linux.alpha
- - compiler.cfg.linux.hppa
- - compiler.cfg.linux.mips
-@@ -145,7 +145,8 @@
- - linker.cfg.linux
- - linker.cfg.linux.x86
- - linker.cfg.linux.amd64
-- - linker.cfg.linux.armv6
-+ - linker.cfg.linux.armv6.armel
-+ - linker.cfg.linux.armv6.armhf
- - linker.cfg.linux.alpha
- - linker.cfg.linux.hppa
- - linker.cfg.linux.mips
-@@ -964,7 +965,7 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1004,7 +1004,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
@@ -64,7 +41,7 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
<defineset>
<define name="__unix__"/>
<define name="__X11__" if="isX11"/>
-@@ -1181,13 +1182,16 @@
+@@ -1239,7 +1239,7 @@
- lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
- lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
for official JogAmp builds! -->
@@ -73,10 +50,11 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
<linkerarg value="-fpic" />
<linkerarg value="-nostdlib" />
<linkerarg value="-Bdynamic" />
+@@ -1253,6 +1253,9 @@
<linkerarg value="-static-libgcc" if="isGCC"/>
</linker>
-+ <linker id="linker.cfg.linux.armv6.armhf" name="gcc">
++ <linker id="linker.cfg.linux.armv6.armhf" name="${gcc.compat.compiler}">
+ </linker>
+
<linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
diff --git a/debian/patches/disable-test-zip-archive.diff b/debian/patches/disable-test-zip-archive.diff
index 3810aac..2d932d5 100644
--- a/debian/patches/disable-test-zip-archive.diff
+++ b/debian/patches/disable-test-zip-archive.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build-test.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build-test.xml 2014-08-10 15:37:47.768023311 +0200
-+++ gluegen-v2.2.0/make/build-test.xml 2014-08-10 15:37:47.768023311 +0200
-@@ -499,7 +499,7 @@
+--- a/make/build-test.xml
++++ b/make/build-test.xml
+@@ -505,7 +505,7 @@
</target>
<target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled">
diff --git a/debian/patches/disableArchive7z.diff b/debian/patches/disableArchive7z.diff
index 6259fc5..ed39731 100644
--- a/debian/patches/disableArchive7z.diff
+++ b/debian/patches/disableArchive7z.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:37:44.463916132 +0200
-+++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:37:44.459916002 +0200
-@@ -1037,9 +1037,9 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -1055,9 +1055,9 @@
<copy todir="${javadoc.gluegen.path}/resources" overwrite="true">
<fileset dir="doc/javadoc/resources" includes="*" />
</copy>
@@ -14,7 +12,7 @@ Index: gluegen-v2.2.0/make/build.xml
</target>
<!-- ================================================================== -->
-@@ -1077,9 +1077,9 @@
+@@ -1096,9 +1096,9 @@
<fileset dir="${project.root}/jnlp-files" includes="*" />
</copy>
<copy todir="${archive}" file="${build}/gluegen-java-src.zip"/>
diff --git a/debian/patches/disable_git_call.diff b/debian/patches/disable_git_call.diff
index a0a7d6a..7ba4b0e 100644
--- a/debian/patches/disable_git_call.diff
+++ b/debian/patches/disable_git_call.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:37:49.640084036 +0200
-+++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:37:49.640084036 +0200
-@@ -67,14 +67,6 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -70,14 +70,6 @@
<property name="gluegen.build.number" value="manual"/>
<property name="gluegen.build.id" value="${version.timestamp}"/>
<mkdir dir="${build}" />
diff --git a/debian/patches/fix-alpha-build-config.patch b/debian/patches/fix-alpha-build-config.patch
index 818d75b..de66104 100644
--- a/debian/patches/fix-alpha-build-config.patch
+++ b/debian/patches/fix-alpha-build-config.patch
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:39.449699491 +0200
-+++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:39.449699491 +0200
-@@ -318,7 +318,7 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -323,7 +323,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
diff --git a/debian/patches/fix-ppc64-build-config.patch b/debian/patches/fix-ppc64-build-config.patch
index 3b5fa53..33e8cdb 100644
--- a/debian/patches/fix-ppc64-build-config.patch
+++ b/debian/patches/fix-ppc64-build-config.patch
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/build.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/build.xml 2014-08-10 15:38:41.125753841 +0200
-+++ gluegen-v2.2.0/make/build.xml 2014-08-10 15:38:41.121753711 +0200
-@@ -300,6 +300,24 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -305,6 +305,24 @@
<property name="linker.cfg.id" value="linker.cfg.linux.ppc" />
</target>
@@ -27,7 +25,7 @@ Index: gluegen-v2.2.0/make/build.xml
<target name="declare.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id" value="compiler.cfg.linux" />
-@@ -318,7 +336,7 @@
+@@ -323,7 +341,7 @@
<property name="linker.cfg.id" value="linker.cfg.linux.sparc" />
</target>
@@ -36,11 +34,9 @@ Index: gluegen-v2.2.0/make/build.xml
<property name="c.src.dir.os" value="unix" />
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
-Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:41.125753841 +0200
-+++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:38:41.121753711 +0200
-@@ -46,6 +46,9 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -48,6 +48,9 @@
- isLinuxMips
- isLinuxMipsel
- isLinuxPpc
@@ -50,7 +46,7 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
- isLinuxs390
- isLinuxs390x
- isLinuxSparc
-@@ -130,6 +133,9 @@
+@@ -133,6 +136,9 @@
- compiler.cfg.linux.mips
- compiler.cfg.linux.mipsel
- compiler.cfg.linux.ppc
@@ -60,7 +56,7 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
- compiler.cfg.linux.s390
- compiler.cfg.linux.s390x
- compiler.cfg.linux.sparc
-@@ -392,6 +398,33 @@
+@@ -417,6 +423,33 @@
<condition property="ppc">
<os arch="ppc" />
</condition>
@@ -94,7 +90,7 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
<condition property="isLinuxs390">
<and>
<istrue value="${isLinux}" />
-@@ -574,6 +607,9 @@
+@@ -601,6 +634,9 @@
<echo message="LinuxMips=${isLinuxMips}" />
<echo message="LinuxMipsel=${isLinuxMipsel}" />
<echo message="LinuxPpc=${isLinuxPpc}" />
@@ -104,7 +100,7 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
<echo message="Linuxs390=${isLinuxs390}" />
<echo message="Linuxs390x=${isLinuxs390x}" />
<echo message="LinuxSparc=${isLinuxSparc}" />
-@@ -650,6 +686,18 @@
+@@ -683,6 +719,14 @@
<property name="os.and.arch" value="linux-ppc" />
</target>
@@ -116,23 +112,19 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
+ <property name="os.and.arch" value="linux-ppc64le" />
+ </target>
+
-+ <target name="gluegen.cpptasks.detect.os.linux.aarch64" unless="gluegen.cpptasks.detected.os.2" if="isLinuxAarch64">
-+ <property name="os.and.arch" value="linux-aarch64" />
-+ </target>
-+
<target name="gluegen.cpptasks.detect.os.linux.s390" unless="gluegen.cpptasks.detected.os.2" if="isLinuxs390">
<property name="os.and.arch" value="linux-s390" />
</target>
-@@ -670,7 +718,7 @@
- <property name="os.and.arch" value="android-armv6hf" />
+@@ -707,7 +755,7 @@
+ <property name="os.and.arch" value="android-aarch64" />
</target>
-- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.de [...]
-+ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpptasks.detect.os.linux.hppa,gluegen.cpptasks.detect.os.linux.mips,gluegen.cpptasks.de [...]
+- <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpp [...]
++ <target name="gluegen.cpptasks.detect.os.linux" depends="gluegen.cpptasks.detect.os.linux.amd64,gluegen.cpptasks.detect.os.linux.ia64,gluegen.cpptasks.detect.os.linux.x86,gluegen.cpptasks.detect.os.linux.armv6.armel,gluegen.cpptasks.detect.os.linux.armv6.armhf,gluegen.cpptasks.detect.os.android.armv6.armel,gluegen.cpptasks.detect.os.linux.aarch64,gluegen.cpptasks.detect.os.android.armv6.armhf,gluegen.cpptasks.detect.os.android.aarch64,gluegen.cpptasks.detect.os.linux.alpha,gluegen.cpp [...]
<target name="gluegen.cpptasks.detect.os.osx" unless="gluegen.cpptasks.detected.os.2" if="isOSX">
<property name="native.library.suffix" value="*lib" />
-@@ -1207,6 +1255,15 @@
+@@ -1271,6 +1319,12 @@
<linker id="linker.cfg.linux.ppc" name="${gcc.compat.compiler}">
</linker>
@@ -142,13 +134,10 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
+ <linker id="linker.cfg.linux.ppc64le" name="${gcc.compat.compiler}">
+ </linker>
+
-+ <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
-+ </linker>
-+
<linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}">
</linker>
-@@ -1431,6 +1488,27 @@
+@@ -1502,6 +1559,20 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" />
</target>
@@ -166,22 +155,15 @@ Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc64le" />
+ </target>
+
-+ <target name="gluegen.cpptasks.declare.compiler.linux.aarch64" if="isLinuxAarch64">
-+ <echo message="Linux.Aarch64" />
-+ <property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
-+ <property name="linker.cfg.id.base" value="linker.cfg.linux" />
-+ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/aarch64" />
-+ </target>
-+
<target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390">
<echo message="Linux.s390" />
<property name="compiler.cfg.id.base" value="compiler.cfg.linux" />
-@@ -1452,7 +1530,7 @@
+@@ -1523,7 +1601,7 @@
<property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" />
</target>
-- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptask [...]
-+ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptask [...]
+- <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpp [...]
++ <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpp [...]
<property name="java.includes.dir.platform" value="${java.includes.dir}/linux" />
</target>
diff --git a/debian/patches/hideException.diff b/debian/patches/hideException.diff
index 0894ef3..34fa9fd 100644
--- a/debian/patches/hideException.diff
+++ b/debian/patches/hideException.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
-===================================================================
---- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:37:54.776250637 +0200
-+++ gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:38:26.473278678 +0200
-@@ -197,15 +197,6 @@
+--- a/src/java/com/jogamp/common/os/Platform.java
++++ b/src/java/com/jogamp/common/os/Platform.java
+@@ -305,15 +305,6 @@
_USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
diff --git a/debian/patches/jarPath.diff b/debian/patches/jarPath.diff
index 076a6b8..d6eb24a 100644
--- a/debian/patches/jarPath.diff
+++ b/debian/patches/jarPath.diff
@@ -1,7 +1,5 @@
-Index: gluegen-v2.2.0/make/gluegen-properties.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/gluegen-properties.xml 2014-08-10 15:35:46.244079918 +0200
-+++ gluegen-v2.2.0/make/gluegen-properties.xml 2014-08-10 15:36:44.665976040 +0200
+--- a/make/gluegen-properties.xml
++++ b/make/gluegen-properties.xml
@@ -50,11 +50,11 @@
<property file="${gluegen.user.properties.file.set}" />
<echo message="Loaded ${gluegen.user.properties.file.set}." />
diff --git a/debian/patches/linker.diff b/debian/patches/linker.diff
index 56b56df..5fef3b3 100644
--- a/debian/patches/linker.diff
+++ b/debian/patches/linker.diff
@@ -1,8 +1,6 @@
-Index: gluegen-v2.2.0/make/gluegen-cpptasks-base.xml
-===================================================================
---- gluegen-v2.2.0.orig/make/gluegen-cpptasks-base.xml 2014-08-10 15:37:51.316138402 +0200
-+++ gluegen-v2.2.0/make/gluegen-cpptasks-base.xml 2014-08-10 15:37:51.316138402 +0200
-@@ -1212,6 +1212,8 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1277,6 +1277,8 @@
<linker id="linker.cfg.linux.sparc" name="${gcc.compat.compiler}">
</linker>
diff --git a/debian/patches/missing-arch-symbol.diff b/debian/patches/missing-arch-symbol.diff
index 0aff238..2f4af36 100644
--- a/debian/patches/missing-arch-symbol.diff
+++ b/debian/patches/missing-arch-symbol.diff
@@ -1,6 +1,6 @@
--- a/make/stub_includes/platform/glibc-compat-symbols.h
+++ b/make/stub_includes/platform/glibc-compat-symbols.h
-@@ -22,7 +22,8 @@
+@@ -24,7 +24,8 @@
#elif defined(__amd64__)
#define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
#else
@@ -9,8 +9,8 @@
+ #define GLIBC_COMPAT_SYMBOL(FFF)
#endif /*__amd64__*/
#elif defined(__clang__)
- #if defined(__arm__)
-@@ -30,7 +31,8 @@
+ #if defined(__aarch64__)
+@@ -34,7 +35,8 @@
#elif defined(__amd64__)
#define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
#else
diff --git a/debian/patches/renamedLibrary.diff b/debian/patches/renamedLibrary.diff
index a5f7943..58ce448 100644
--- a/debian/patches/renamedLibrary.diff
+++ b/debian/patches/renamedLibrary.diff
@@ -1,23 +1,19 @@
-Index: gluegen-v2.2.0/src/junit/com/jogamp/common/util/TestTempJarCache.java
-===================================================================
---- gluegen-v2.2.0.orig/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-08-10 15:36:51.194187876 +0200
-+++ gluegen-v2.2.0/src/junit/com/jogamp/common/util/TestTempJarCache.java 2014-08-10 15:36:51.194187876 +0200
-@@ -197,8 +197,8 @@
+--- a/src/junit/com/jogamp/common/util/TestTempJarCache.java
++++ b/src/junit/com/jogamp/common/util/TestTempJarCache.java
+@@ -196,8 +196,8 @@
@Test
public void testTempJarCache02AddNativeLibs() throws IOException, IllegalArgumentException, URISyntaxException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
-- final String nativeJarName = "gluegen-rt-natives-"+Platform.getOSAndArch()+".jar";
+- final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen-rt-natives-"+Platform.getOSAndArch()+".jar");
- final String libBaseName = "gluegen-rt";
-+ final String nativeJarName = "gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar";
++ final Uri.Encoded nativeJarName = Uri.Encoded.cast("gluegen2-rt-natives-"+Platform.getOSAndArch()+".jar");
+ final String libBaseName = "gluegen2-rt";
final ClassLoader cl = getClass().getClassLoader();
- URI jarUriRoot = JarUtil.getJarSubURI(TempJarCache.class.getName(), cl);
-Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
-===================================================================
---- gluegen-v2.2.0.orig/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:36:51.194187876 +0200
-+++ gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java 2014-08-10 15:36:51.194187876 +0200
-@@ -146,7 +146,7 @@
+ final Uri jarUri = JarUtil.getJarUri(TempJarCache.class.getName(), cl);
+--- a/src/java/com/jogamp/common/os/Platform.java
++++ b/src/java/com/jogamp/common/os/Platform.java
+@@ -256,7 +256,7 @@
private static final String useTempJarCachePropName = "jogamp.gluegen.UseTempJarCache";
/** fixed basename of JAR file and native library */
@@ -26,7 +22,7 @@ Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
//
// static initialization order:
-@@ -209,7 +209,7 @@
+@@ -317,7 +317,7 @@
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
// JVM bug workaround
@@ -35,7 +31,7 @@ Index: gluegen-v2.2.0/src/java/com/jogamp/common/os/Platform.java
// AWT Headless determination
if( !PropertyAccess.getBooleanProperty("java.awt.headless", true) &&
-@@ -252,7 +252,7 @@
+@@ -350,7 +350,7 @@
}
/**
diff --git a/debian/patches/series b/debian/patches/series
index d769619..7e16109 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,4 +18,4 @@ armhf.diff
fix-alpha-build-config.patch
fix-ppc64-build-config.patch
missing-arch-symbol.diff
-add-mips-support.patch
+#add-mips-support.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git
More information about the pkg-java-commits
mailing list