Tony Mancill pushed to branch master at Debian Java Maintainers / java3d
Commits: 9608b2f7 by tony mancill at 2026-06-10T21:06:43-07:00 Add patch to address FTBFS with openjdk-25 (Closes: #1139301) - - - - - 403732a5 by tony mancill at 2026-06-10T21:08:51-07:00 Bump Standards-Version to 4.7.4 - - - - - e9bc1825 by tony mancill at 2026-06-10T21:15:51-07:00 Update Uploaders (Closes: #1139091) - - - - - 44c545c9 by tony mancill at 2026-06-10T21:15:51-07:00 Prepare changelog for upload - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/0012-jdk25-build.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +java3d (1.5.2+dfsg-19) unstable; urgency=medium + + * Team upload. + * Add patch to address FTBFS with openjdk-25 (Closes: #1139301) + Thank you to Aurelien Jarno for the patch. + * Bump Standards-Version to 4.7.4 + * Update Uploaders (Closes: #1139091) + Thank you to Torsten Werner for your work on this package. + + -- tony mancill <[email protected]> Wed, 10 Jun 2026 21:08:57 -0700 + java3d (1.5.2+dfsg-18) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -1,10 +1,8 @@ Source: java3d Section: java -Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: - Emmanuel Bourg <[email protected]>, - Torsten Werner <[email protected]> + Emmanuel Bourg <[email protected]> Build-Depends: ant-optional, debhelper-compat (= 13), @@ -16,11 +14,10 @@ Build-Depends: libxext-dev, libxt-dev, mesa-common-dev -Standards-Version: 4.6.2 +Standards-Version: 4.7.4 Vcs-Git: https://salsa.debian.org/java-team/java3d.git Vcs-Browser: https://salsa.debian.org/java-team/java3d Homepage: https://www.oracle.com/java/technologies/javase/java-3d.html -Rules-Requires-Root: no Package: libjava3d-java Architecture: all ===================================== debian/patches/0012-jdk25-build.patch ===================================== @@ -0,0 +1,26 @@ +Description: Fix FTBFS with openjdk-25 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1139301 +Author: Aurelien Jarno <[email protected]> + +--- a/j3d-core/src/native/ogl/build-linux-generic.xml ++++ b/j3d-core/src/native/ogl/build-linux-generic.xml +@@ -29,7 +29,7 @@ + + <!-- Create the library file--> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> +- <arg line="-shared DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt -L${java.home}/lib/${os.arch}/server -L${java.home}/lib/${os.arch}/client -L${java.home}/lib/server -L${java.home}/lib/client -ljvm -o libj3dcore-ogl.so"/> ++ <arg line="-shared DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -Wl,-z,defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -L${java.home}/lib/${os.arch} -L${java.home}/lib -ljawt -L${java.home}/lib/${os.arch}/server -L${java.home}/lib/${os.arch}/client -L${java.home}/lib/${os.arch}/zero -L${java.home}/lib/server -L${java.home}/lib/client -L${java.home}/lib/zero -ljvm -o libj3dcore-ogl.so"/> + </exec> + + </target> +--- a/j3d-core/src/native/ogl/build-linux-i586.xml ++++ b/j3d-core/src/native/ogl/build-linux-i586.xml +@@ -30,7 +30,7 @@ + + <!-- Create the library file--> + <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld"> +- <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -L${java.home}/lib -ljawt -L${java.home}/lib/i386/server -L${java.home}/lib/server -ljvm -o libj3dcore-ogl.so"/> ++ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L/usr/X11R6/lib -ldl -lGL -lX11 -lXext -lm -lnsl -lc -L${java.home}/lib/i386 -L${java.home}/lib -ljawt -L${java.home}/lib/i386/server -L${java.home}/lib/i386/zero -L${java.home}/lib/server -L${java.home}/lib/zero -ljvm -o libj3dcore-ogl.so"/> + </exec> + + </target> ===================================== debian/patches/series ===================================== @@ -8,3 +8,4 @@ 07_java9_compatibility.patch 08_java10_compatibility.patch 0011-Fix-definition-of-GLsizeiptr.patch +0012-jdk25-build.patch View it on GitLab: https://salsa.debian.org/java-team/java3d/-/compare/560457eac7ce57a24b2503b7152e92d0902f0132...44c545c9648b367168223ad3bb83de9b58c18f6c -- View it on GitLab: https://salsa.debian.org/java-team/java3d/-/compare/560457eac7ce57a24b2503b7152e92d0902f0132...44c545c9648b367168223ad3bb83de9b58c18f6c You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
