1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
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
@@ -425,7 +425,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" />
@@ -444,7 +443,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}" />
@@ -539,24 +537,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" />
</path>
<!-- JOGL Compilation .. -->
<path id="nativewindow_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" />
<path refid="nativewindow_all_atoms.classpath" />
</path>
<path id="nativewindow_gluegen_joal.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="${joal.jar}" />
<path refid="nativewindow_all_atoms.classpath" />
</path>
@@ -565,8 +557,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" />
<path refid="nativewindow_all_atoms.classpath" />
</path>
@@ -575,8 +565,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" />
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
</path>
@@ -586,8 +574,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" />
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
</path>
@@ -625,8 +611,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" />
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
<path refid="newt_all_atoms.classpath" />
@@ -671,8 +655,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" />
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
<path refid="newt_all_atoms.classpath" />
@@ -707,8 +689,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" />
<path refid="nativewindow_all_atoms.classpath" />
<path refid="jogl_all_atoms.classpath" />
<path refid="newt_all_atoms.classpath" />
@@ -721,8 +701,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="${jogl-all.jar}" />
<pathelement location="${oculusvr.jar}" />
<pathelement location="${graphui.jar}" />
--- a/make/build.xml
+++ b/make/build.xml
@@ -295,8 +295,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"/>
</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/*"/>
|
