[libjogl2-java] 13/58: Imported Debian patch 2.0-rc3-5
Tony Mancill
tmancill at moszumanska.debian.org
Thu Sep 4 03:59:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository libjogl2-java.
commit 19a61bf3ae3d0f739af37bafd1aa1a57926104e6
Author: Sylvestre Ledru <sylvestre at debian.org>
Date: Sun Nov 20 19:01:18 2011 +0100
Imported Debian patch 2.0-rc3-5
---
debian/changelog | 7 +++
debian/patches/otherArchsoswin_2.diff | 113 ++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 121 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0e51e40..8cffcdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.0-rc3-5) unstable; urgency=low
+
+ * Example is now working (Closes: #634996)
+ * Fix the various FTBFS (Closes: #638431) (LP: #809743)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sun, 20 Nov 2011 19:01:18 +0100
+
libjogl2-java (2.0-rc3-4) unstable; urgency=low
* Ant to build C code = a lot of uploads ... pfff
diff --git a/debian/patches/otherArchsoswin_2.diff b/debian/patches/otherArchsoswin_2.diff
new file mode 100644
index 0000000..aba58a8
--- /dev/null
+++ b/debian/patches/otherArchsoswin_2.diff
@@ -0,0 +1,113 @@
+Index: libjogl2-java-2.0-rc3/make/build-nativewindow.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-nativewindow.xml 2011-11-20 17:10:07.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-nativewindow.xml 2011-11-20 19:14:38.704878344 +0100
+@@ -627,6 +627,7 @@
+ </patternset>
+
+ <echo message="Compiling @{output.lib.name}" />
++ <echo message="java.lib.dir.platform: ${java.lib.dir.platform}" />
+
+ <!-- have to wrap cc task with outofdate, because otherwise cc links a new library
+ even when no files have been compiled -->
+@@ -666,7 +667,7 @@
+ <!-- This must come last to not override real include paths -->
+ <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
+ </compiler>
+-
++
+ <linker extends="@{linker.cfg.id}">
+ <syslibset dir="${java.lib.dir.platform}" libs="jawt" if="@{output.lib.name}.useLibJAWT"/>
+ <syslibset dir="${java.lib.dir.platform}/server" libs="jvm" if="@{output.lib.name}.useLibJVM"/>
+Index: libjogl2-java-2.0-rc3/make/build-newt.xml
+===================================================================
+--- libjogl2-java-2.0-rc3.orig/make/build-newt.xml 2011-11-20 17:10:07.000000000 +0100
++++ libjogl2-java-2.0-rc3/make/build-newt.xml 2011-11-20 18:44:37.728372518 +0100
+@@ -274,9 +274,9 @@
+ </linker>
+
+ <linker id="linker.cfg.linux.armv7.newt.x11" extends="linker.cfg.linux.armv7">
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrandr" />
+- <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
++ <syslibset libs="X11" />
++ <syslibset libs="Xrandr" />
++ <syslibset libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
+@@ -367,13 +367,73 @@
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
++ <target name="c.configure.linux.hppa" if="isLinuxHppa">
++ <echo message="Linux.hppa" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
++ <target name="c.configure.linux.mips" if="isLinuxMips">
++ <echo message="Linux.mips" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
++ <target name="c.configure.linux.mipsel" if="isLinuxMipsel">
++ <echo message="Linux.mips" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
++ <target name="c.configure.linux.ppc" if="isLinuxPpc">
++ <echo message="Linux.ppc" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
++ <target name="c.configure.linux.s390" if="isLinuxs390">
++ <echo message="Linux.S390" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
++ <target name="c.configure.linux.sparc" if="isLinuxSparc">
++ <echo message="Linux.sparc" />
++ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
++ <condition property="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11"
++ else="linker.cfg.linux">
++ <isset property="isX11" />
++ </condition>
++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
++ </target>
++
+ <target name="c.configure.linux.ia64" if="isLinuxIA64">
+ <echo message="Linux.IA64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.linux" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ </target>
+
+- <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
++ <target name="c.configure.linux" depends="c.configure.linux.x86,c.configure.linux.amd64,c.configure.linux.armv7,c.configure.linux.hppa,c.configure.linux.mips,c.configure.linux.mipsel,c.configure.linux.ppc,c.configure.linux.s390,c.configure.linux.sparc,c.configure.linux.ia64,c.configure.x11" if="isLinux"/>
+
+ <target name="c.configure.android" if="isAndroid">
+ <echo message="Android" />
diff --git a/debian/patches/series b/debian/patches/series
index 2df588d..73312fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@ disable_git_call.diff
disable_android_2.diff
arch_naming.diff
linker.cfg.id.os.diff
-
+otherArchsoswin_2.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git
More information about the pkg-java-commits
mailing list