tags 769301 patch severity 765933 important thanks On Wed, 12 Nov 2014 16:57:45 +0100 Markus Koschany <apo@gambaru.de> wrote: [...] > apparently bug #765933 in mesa causes a FTBFS in java3d. I think this is > a regression and easier to fix in mesa itself during the freeze instead > of patching affected packages. At a second glance fixing Java3d was easier than expected. We just define the typedefs in Java3d. However I still think this is a bug in mesa-common-dev but not necessarily a release-critical one. I am downgrading #765933 to important again. Please find the proposed patch attached to this bug report. Markus
diff -Nru java3d-1.5.2+dfsg/debian/changelog java3d-1.5.2+dfsg/debian/changelog --- java3d-1.5.2+dfsg/debian/changelog 2013-05-27 14:47:41.000000000 +0200 +++ java3d-1.5.2+dfsg/debian/changelog 2014-11-23 00:22:20.000000000 +0100 @@ -1,3 +1,11 @@ +java3d (1.5.2+dfsg-10) unstable; urgency=medium + + * Team upload. + * Add typedef.patch. Define GLsizeiptr and GLintptr explicitly to + prevent a FTBFS. (Closes: #769301) + + -- Markus Koschany <apo@gambaru.de> Sun, 23 Nov 2014 00:10:37 +0100 + java3d (1.5.2+dfsg-9) unstable; urgency=low * Team upload. diff -Nru java3d-1.5.2+dfsg/debian/patches/series java3d-1.5.2+dfsg/debian/patches/series --- java3d-1.5.2+dfsg/debian/patches/series 2013-05-27 14:47:41.000000000 +0200 +++ java3d-1.5.2+dfsg/debian/patches/series 2014-11-23 00:22:20.000000000 +0100 @@ -5,3 +5,4 @@ 05_pic_amd64.patch 05_pic_i586.patch 06_java-compat.patch +typedef.patch diff -Nru java3d-1.5.2+dfsg/debian/patches/typedef.patch java3d-1.5.2+dfsg/debian/patches/typedef.patch --- java3d-1.5.2+dfsg/debian/patches/typedef.patch 1970-01-01 01:00:00.000000000 +0100 +++ java3d-1.5.2+dfsg/debian/patches/typedef.patch 2014-11-23 00:22:20.000000000 +0100 @@ -0,0 +1,27 @@ +From: Markus Koschany <apo@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_
Attachment:
signature.asc
Description: OpenPGP digital signature