diff -Nru libjogl2-java-2.5.0+dfsg/debian/ant.properties libjogl2-java-2.5.0+dfsg/debian/ant.properties
--- libjogl2-java-2.5.0+dfsg/debian/ant.properties	2023-06-14 07:22:44.000000000 +0200
+++ libjogl2-java-2.5.0+dfsg/debian/ant.properties	2024-09-27 08:31:10.000000000 +0200
@@ -52,6 +52,7 @@


 user.properties.file=true
+setup.noJFX=true
 # Ensure that source and target are 1.8
 target.sourcelevel=1.8
 target.targetlevel=1.8
diff -Nru libjogl2-java-2.5.0+dfsg/debian/changelog libjogl2-java-2.5.0+dfsg/debian/changelog
--- libjogl2-java-2.5.0+dfsg/debian/changelog	2024-07-08 09:47:21.000000000 +0200
+++ libjogl2-java-2.5.0+dfsg/debian/changelog	2024-09-27 08:31:10.000000000 +0200
@@ -1,3 +1,10 @@
+libjogl2-java (2.5.0+dfsg-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Build without JFX support (Closes: #1082873)
+
+ -- Bastian Germann <bage@debian.org>  Fri, 27 Sep 2024 08:31:10 +0200
+
 libjogl2-java (2.5.0+dfsg-3) unstable; urgency=medium

   * Really building on mips64el
diff -Nru libjogl2-java-2.5.0+dfsg/debian/control libjogl2-java-2.5.0+dfsg/debian/control
--- libjogl2-java-2.5.0+dfsg/debian/control	2024-07-06 23:48:50.000000000 +0200
+++ libjogl2-java-2.5.0+dfsg/debian/control	2024-09-27 08:31:10.000000000 +0200
@@ -17,7 +17,6 @@
                libglu1-mesa-dev,
                libgluegen2-build-java (>= 2.5.0+dfsg),
                libgluegen2-rt-java (>= 2.5.0+dfsg),
-               libopenjfx-java,
                libswt-gtk-4-java,
                libxcursor-dev,
                libxi-dev,
diff -Nru libjogl2-java-2.5.0+dfsg/debian/patches/openjfx_jars.patch libjogl2-java-2.5.0+dfsg/debian/patches/openjfx_jars.patch
--- libjogl2-java-2.5.0+dfsg/debian/patches/openjfx_jars.patch	2023-09-10 18:09:18.000000000 +0200
+++ libjogl2-java-2.5.0+dfsg/debian/patches/openjfx_jars.patch	2024-09-27 08:31:10.000000000 +0200
@@ -1,18 +1,32 @@
-Description: passing the paths to the jars of openjfx, as none is embedded
+Description: Remove the paths to the jars of openjfx
 Author: Pierre Gruet <pgt@debian.org>
 Forwarded: not-needed
 Last-Update: 2023-04-15

 --- a/make/build-common.xml
 +++ b/make/build-common.xml
-@@ -528,24 +528,24 @@
+@@ -439,7 +439,6 @@
+         <property name="newt-ogl.jar"             value="${build.newt}/newt-ogl.jar" />
+         <property name="newt-awt.jar"             value="${build.newt}/newt-awt.jar" />
+         <property name="newt-swt.jar"             value="${build.newt}/newt-swt.jar" />
+-        <property name="newt-javafx.jar"          value="${build.newt}/newt-javafx.jar" />
+         <property name="newt-event.jar"           value="${build.newt}/newt-event.jar" />              <!-- using NEWT events w/o NEWT -->
+         <property name="newt-driver-linux.jar"    value="${build.newt}/newt-driver-linux.jar" />
+         <property name="newt-driver-x11.jar"      value="${build.newt}/newt-driver-x11.jar" />
+@@ -458,7 +457,6 @@
+             <pathelement location="${newt-ogl.jar}" />
+             <pathelement location="${newt-awt.jar}" />
+             <pathelement location="${newt-swt.jar}" />
+-            <pathelement location="${newt-javafx.jar}" />
+             <pathelement location="${newt-driver-linux.jar}" />
+             <pathelement location="${newt-driver-x11.jar}" />
+             <pathelement location="${newt-driver-win.jar}" />
+@@ -528,24 +528,18 @@
          <path id="swt_gluegen.classpath">
              <pathelement location="${gluegen-rt.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
          </path>

          <!-- JOGL Compilation .. -->
@@ -21,8 +35,6 @@
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
          </path>

@@ -31,111 +43,102 @@
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <pathelement location="${joal.jar}" />
              <path refid="nativewindow_all_atoms.classpath" />
          </path>
-@@ -554,8 +554,8 @@
+@@ -554,8 +554,6 @@
              <pathelement location="${android.jar}" />
              <pathelement location="${gluegen-rt-android.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
          </path>

-@@ -564,8 +564,8 @@
+@@ -564,8 +564,6 @@
              <pathelement location="${gluegen-rt.jar}" />
              <pathelement location="${plugin3.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
              <path refid="jogl_all_atoms.classpath" />
          </path>
-@@ -575,8 +575,8 @@
+@@ -575,8 +575,6 @@
              <pathelement location="${gluegen-rt-android.jar}" />
              <pathelement location="${plugin3.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
              <path refid="jogl_all_atoms.classpath" />
          </path>
-@@ -614,8 +614,8 @@
+@@ -614,8 +614,6 @@
              <pathelement location="${gluegen-rt.jar}" />
              <pathelement location="${gluegen-test-util.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
              <path refid="jogl_all_atoms.classpath" />
              <path refid="newt_all_atoms.classpath" />
-@@ -660,8 +660,8 @@
+@@ -660,8 +660,6 @@
              <pathelement location="${gluegen-rt.jar}" />
              <pathelement location="${gluegen-test-util.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
              <path refid="jogl_all_atoms.classpath" />
              <path refid="newt_all_atoms.classpath" />
-@@ -696,8 +696,8 @@
+@@ -696,8 +696,6 @@
              <pathelement location="${gluegen-rt-android.jar}" />
              <pathelement location="${gluegen-test-util.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <path refid="nativewindow_all_atoms.classpath" />
              <path refid="jogl_all_atoms.classpath" />
              <path refid="newt_all_atoms.classpath" />
-@@ -710,8 +710,8 @@
+@@ -710,8 +710,6 @@
              <pathelement location="${android.jar}" />
              <pathelement location="${gluegen-rt.jar}" />
              <pathelement location="${swt.jar}" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-base-11.jar" />
 -            <pathelement location="${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar" />
-+            <pathelement location="/usr/share/java/javafx-base.jar" />
-+            <pathelement location="/usr/share/java/javafx-graphics.jar" />
              <pathelement location="${jogl-all.jar}" />
              <pathelement location="${oculusvr.jar}" />
              <pathelement location="${graphui.jar}" />
 --- a/make/build-test.xml
 +++ b/make/build-test.xml
-@@ -227,8 +227,8 @@
+@@ -227,8 +227,6 @@
                <arg line="--classpath ${ant-junit.jar}"/>
                <arg line="--classpath ${ant-junit4.jar}"/>
                <arg line="--classpath ${semver.jar}"/>
 -              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
 -              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
-+              <arg line="--classpath /usr/share/java/javafx-base.jar"/>
-+              <arg line="--classpath /usr/share/java/javafx-graphics.jar"/>
            </d8-classpaths>
          </aapt.signed>
      </target>
 --- a/make/build.xml
 +++ b/make/build.xml
-@@ -228,8 +228,8 @@
+@@ -228,8 +228,6 @@
                <arg line="--classpath ${gluegen-rt-android.jar}"/>
                <arg line="--classpath ${joal.jar}"/>
                <arg line="--classpath ${jogl-all-android.jar}"/>
 -              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
 -              <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
-+              <arg line="--classpath /usr/share/java/javafx-base.jar"/>
-+              <arg line="--classpath /usr/share/java/javafx-graphics.jar"/>
            </d8-classpaths>
          </aapt.signed>
      </target>
+--- a/make/build-nativewindow.xml
++++ b/make/build-nativewindow.xml
+@@ -67,7 +67,7 @@
+         <!-- partitioning -->
+
+         <property name="java.part.core"
+-                  value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** com/jogamp/nativewindow/javafx/** jogamp/nativewindow/*"/>
++                  value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/>
+
+         <property name="java.part.swt"
+                   value="com/jogamp/nativewindow/swt/*"/>
diff -Nru libjogl2-java-2.5.0+dfsg/debian/rules libjogl2-java-2.5.0+dfsg/debian/rules
--- libjogl2-java-2.5.0+dfsg/debian/rules	2024-07-07 23:21:40.000000000 +0200
+++ libjogl2-java-2.5.0+dfsg/debian/rules	2024-09-27 08:31:10.000000000 +0200
@@ -34,6 +34,7 @@
 override_dh_auto_configure:
 	# Customizing headers provided by the JDK, to make them fit Gluegen
 	debian/customizeJdkHeaders
+	mv src/nativewindow/classes/com/jogamp/nativewindow/javafx debian/
 	dh_auto_configure
 	# Providing the hardening CPPFLAGS and LDFLAGS to the ant cc tasks.
 	for sub in jogl nativewindow newt; do\
@@ -64,6 +65,7 @@
 	        mv make/build-$$sub.xml.old make/build-$$sub.xml; \
 	    fi; \
 	done
+	-mv debian/javafx src/nativewindow/classes/com/jogamp/nativewindow/
 	dh_clean

 get-orig-pom: