[Git][java-team/openjfx][master] Import Debian changes 11.0.11+1-3.2
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Mon Apr 15 01:53:47 BST 2024
Tony Mancill pushed to branch master at Debian Java Maintainers / openjfx
Commits:
9bb156be by Sebastian Ramacher at 2024-04-14T17:53:34-07:00
Import Debian changes 11.0.11+1-3.2
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)
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/64-bit-time-t.patch
- + debian/patches/jdk-21-compilation.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -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 <sramacher at debian.org> Sat, 13 Apr 2024 13:01:57 +0200
+
openjfx (11.0.11+1-3.1) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/64-bit-time-t.patch
=====================================
@@ -0,0 +1,27 @@
+Description: don't unset _FILE_OFFSET_BITS
+ This is a prerequisite for 64-bit time_t.
+Author: Steve Langasek <steve.langasek at 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
=====================================
debian/patches/jdk-21-compilation.patch
=====================================
@@ -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.kulkarni at 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
=====================================
debian/patches/series
=====================================
@@ -21,3 +21,5 @@ no-error_deprecated-declarations.patch
disable-ffmpeg.patch
38-javadoc.patch
webkit-217079-only-use-jumpislands-with-JIT.patch
+jdk-21-compilation.patch
+64-bit-time-t.patch
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/9bb156be6fb5877c20a196ec706ff3d8bb1af4ea
--
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/commit/9bb156be6fb5877c20a196ec706ff3d8bb1af4ea
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20240415/b82c4e42/attachment.htm>
More information about the pkg-java-commits
mailing list