Control: tags 1057531 + patch Dear maintainer,
I've prepared an NMU for openjfx (versioned as 11.0.11+1-3.2). The diff is attached to this message. Cheers -- Sebastian Ramacher
diff -Nru openjfx-11.0.11+1/debian/changelog openjfx-11.0.11+1/debian/changelog --- openjfx-11.0.11+1/debian/changelog 2023-07-16 05:30:26.000000000 +0200 +++ openjfx-11.0.11+1/debian/changelog 2024-04-13 13:01:57.000000000 +0200 @@ -1,3 +1,17 @@ +openjfx (11.0.11+1-3.2) unstable; urgency=medium + + * Non-maintainer upload + + [ Steve Langasek ] + * debian/patches/64-bit-time-t.patch: don't unset _FILE_OFFSET_BITS. + Closes: #1068159. + + [ Pushkar Kulkarni ] + * d/patches: Patch to fix compiler errors with openjdk-21 (LP: #2053246) + (Closes: #1057531) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 13 Apr 2024 13:01:57 +0200 + openjfx (11.0.11+1-3.1) unstable; urgency=medium * Team upload. diff -Nru openjfx-11.0.11+1/debian/patches/64-bit-time-t.patch openjfx-11.0.11+1/debian/patches/64-bit-time-t.patch --- openjfx-11.0.11+1/debian/patches/64-bit-time-t.patch 1970-01-01 01:00:00.000000000 +0100 +++ openjfx-11.0.11+1/debian/patches/64-bit-time-t.patch 2024-04-13 07:04:41.000000000 +0200 @@ -0,0 +1,27 @@ +Description: don't unset _FILE_OFFSET_BITS + This is a prerequisite for 64-bit time_t. +Author: Steve Langasek <steve.langa...@canonical.com> +Bug-Debian: https://bugs.debian.org/1068159 +Last-Update: 2024-04-12 +Forwarded: no + +Index: openjfx-11.0.11+1/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h +=================================================================== +--- openjfx-11.0.11+1.orig/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h ++++ openjfx-11.0.11+1/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/projects/build/linux/common/config.h +@@ -544,7 +544,7 @@ + #endif + + /* Number of bits in a file offset, on hosts where this is settable. */ +-#undef _FILE_OFFSET_BITS ++//#undef _FILE_OFFSET_BITS + + /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ + #undef _LARGEFILE_SOURCE +@@ -570,4 +570,4 @@ + + #ifdef GSTREAMER_LITE + #define DISABLE_ORC +-#endif // GSTREAMER_LITE +\ No newline at end of file ++#endif // GSTREAMER_LITE diff -Nru openjfx-11.0.11+1/debian/patches/jdk-21-compilation.patch openjfx-11.0.11+1/debian/patches/jdk-21-compilation.patch --- openjfx-11.0.11+1/debian/patches/jdk-21-compilation.patch 1970-01-01 01:00:00.000000000 +0100 +++ openjfx-11.0.11+1/debian/patches/jdk-21-compilation.patch 2024-02-18 20:23:28.000000000 +0100 @@ -0,0 +1,83 @@ +Description: Patch to enable compilation with openjdk-21 + With openjdk-21, the code being patched make the compiler throw ambiguity errors. + We need not forward this patch upstream because the latter's latest repos are + updated to build with the latest versions of the JDK. +Author: Pushkar Kulkarni <pushkar.kulka...@canonical.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057531 +Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java ++++ b/modules/javafx.graphics/src/main/java/javafx/concurrent/Task.java +@@ -690,14 +690,14 @@ + */ + protected abstract V call() throws Exception; + +- private ObjectProperty<State> state = new SimpleObjectProperty<>(this, "state", State.READY); +- final void setState(State value) { // package access for the Service ++ private ObjectProperty<Worker.State> state = new SimpleObjectProperty<>(this, "state", Worker.State.READY); ++ final void setState(Worker.State value) { // package access for the Service + checkThread(); +- final State s = getState(); +- if (s != State.CANCELLED) { ++ final Worker.State s = getState(); ++ if (s != Worker.State.CANCELLED) { + this.state.set(value); + // Make sure the running flag is set +- setRunning(value == State.SCHEDULED || value == State.RUNNING); ++ setRunning(value == Worker.State.SCHEDULED || value == Worker.State.RUNNING); + + // Invoke the event handlers, and then call the protected methods. + switch (state.get()) { +@@ -729,8 +729,8 @@ + } + } + } +- @Override public final State getState() { checkThread(); return state.get(); } +- @Override public final ReadOnlyObjectProperty<State> stateProperty() { checkThread(); return state; } ++ @Override public final Worker.State getState() { checkThread(); return state.get(); } ++ @Override public final ReadOnlyObjectProperty<Worker.State> stateProperty() { checkThread(); return state; } + + /** + * The onSchedule event handler is called whenever the Task state +@@ -1024,9 +1024,9 @@ + // state flag will not be readable immediately after this call. However, + // that would be the case anyway since these properties are not thread-safe. + if (isFxApplicationThread()) { +- setState(State.CANCELLED); ++ setState(Worker.State.CANCELLED); + } else { +- runLater(() -> setState(State.CANCELLED)); ++ runLater(() -> setState(Worker.State.CANCELLED)); + } + } + // return the flag +@@ -1417,8 +1417,8 @@ + // in all cases so that developer code can be consistent. + task.started = true; + task.runLater(() -> { +- task.setState(State.SCHEDULED); +- task.setState(State.RUNNING); ++ task.setState(Worker.State.SCHEDULED); ++ task.setState(Worker.State.RUNNING); + }); + // Go ahead and delegate to the wrapped callable + try { +@@ -1433,7 +1433,7 @@ + // can assume if the result is set, it has + // succeeded. + task.updateValue(result); +- task.setState(State.SUCCEEDED); ++ task.setState(Worker.State.SUCCEEDED); + }); + return result; + } else { +@@ -1452,7 +1452,7 @@ + // in that circumstance. + task.runLater(() -> { + task._setException(th); +- task.setState(State.FAILED); ++ task.setState(Worker.State.FAILED); + }); + // Some error occurred during the call (it might be + // an exception (either runtime or checked), or it might diff -Nru openjfx-11.0.11+1/debian/patches/series openjfx-11.0.11+1/debian/patches/series --- openjfx-11.0.11+1/debian/patches/series 2023-07-16 05:30:26.000000000 +0200 +++ openjfx-11.0.11+1/debian/patches/series 2024-04-13 07:02:53.000000000 +0200 @@ -21,3 +21,5 @@ disable-ffmpeg.patch 38-javadoc.patch webkit-217079-only-use-jumpislands-with-JIT.patch +jdk-21-compilation.patch +64-bit-time-t.patch
