[java3d] 65/77: merge patch for #769301 into existing -10 packaging

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java3d.

commit aa2fd5551811c1deb40fc949c0fe7c9db4c9eb8a
Author: Tony Mancill <tmancill at debian.org>
Date:   Sun Nov 23 03:02:30 2014 +0000

    merge patch for #769301 into existing -10 packaging
---
 debian/changelog             | 10 ++++++++--
 debian/control               |  2 +-
 debian/patches/series        |  1 +
 debian/patches/typedef.patch | 27 +++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 58aa5eb..a02b5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 java3d (1.5.2+dfsg-10) unstable; urgency=medium
 
   * Team upload.
-  * Updated Standards-Version to 3.9.5 (no changes)
+
+  [ tony mancill ]
+  * Updated Standards-Version to 3.9.6 (no changes)
   * Update Upstream URL in d/control and d/copyright. (Closes: #758413)
   * Use canonical Vcs URLs for packaging repo.
   * Use debhelper 9.
 
- -- tony mancill <tmancill at debian.org>  Mon, 18 Aug 2014 22:38:20 -0700
+  [ Markus Koschany ]
+  * Add typedef.patch. Define GLsizeiptr and GLintptr explicitly to
+    prevent a FTBFS. (Closes: #769301)
+
+ -- Markus Koschany <apo at gambaru.de>  Sun, 23 Nov 2014 00:10:37 +0100
 
 java3d (1.5.2+dfsg-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aaa2542..c15efcc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
  libgl1-mesa-dev,
  libxext-dev,
  libxt-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://java3d.java.net
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/java3d/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/java3d/
diff --git a/debian/patches/series b/debian/patches/series
index 29b59f4..aedaeb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 05_pic_amd64.patch
 05_pic_i586.patch
 06_java-compat.patch
+typedef.patch
diff --git a/debian/patches/typedef.patch b/debian/patches/typedef.patch
new file mode 100644
index 0000000..942057e
--- /dev/null
+++ b/debian/patches/typedef.patch
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sat, 22 Nov 2014 23:54:59 +0100
+Subject: typedef
+
+Define GLsizeiptr and GLintptr explicitly to prevent a FTBFS.
+This patch may be removed in the future when
+https://bugs.debian.org/765933 gets fixed.
+
+Bug: https://bugs.debian.org/769301
+Forwarded: no
+---
+ j3d-core/src/native/ogl/gldefs.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/j3d-core/src/native/ogl/gldefs.h b/j3d-core/src/native/ogl/gldefs.h
+index bf4434f..d20de17 100644
+--- a/j3d-core/src/native/ogl/gldefs.h
++++ b/j3d-core/src/native/ogl/gldefs.h
+@@ -65,6 +65,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ 
++typedef ptrdiff_t GLsizeiptr;
++typedef ptrdiff_t GLintptr;
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #ifdef Java3D_undef__glext_h_

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java3d.git