[Git][java-team/openjfx][master] 4 commits: Patching code to build against gcc-14
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Mon Nov 11 14:37:42 GMT 2024
Pierre Gruet pushed to branch master at Debian Java Maintainers / openjfx
Commits:
515a7d04 by Pierre Gruet at 2024-11-11T15:01:44+01:00
Patching code to build against gcc-14
- - - - -
bf9bcb45 by Pierre Gruet at 2024-11-11T15:02:13+01:00
Using default g++, not forcing g++11
- - - - -
a9b1f0e9 by Pierre Gruet at 2024-11-11T15:02:39+01:00
Raising Standards version to 4.7.0, no change
- - - - -
7b3ddfe4 by Pierre Gruet at 2024-11-11T15:03:43+01:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/gcc-14.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+openjfx (11.0.11+1-4) unstable; urgency=medium
+
+ * Team upload
+ * Raising Standards version to 4.7.0, no change
+ * Using default g++, not forcing g++11 (Closes: #1023702)
+ * Patching code to build against g++-14 (Closes: #1075342)
+
+ -- Pierre Gruet <pgt at debian.org> Mon, 11 Nov 2024 15:02:46 +0100
+
openjfx (11.0.11+1-3.2) unstable; urgency=medium
* Non-maintainer upload
=====================================
debian/control
=====================================
@@ -10,7 +10,6 @@ Build-Depends: antlr4,
default-jdk,
default-jdk-doc,
flex,
- g++-11,
gperf,
gradle (>= 4.4),
gradle-debian-helper (>= 2.0),
@@ -43,7 +42,7 @@ Build-Depends: antlr4,
x11proto-xf86vidmode-dev,
zip
Build-Conflicts: libstdc++-10-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/openjfx.git
Vcs-Browser: https://salsa.debian.org/java-team/openjfx
Homepage: https://openjfx.io
=====================================
debian/patches/gcc-14.patch
=====================================
@@ -0,0 +1,98 @@
+Description: patching code to build using g++-14
+ I don't forward the patch upstream since the version of Debian is old.
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/1075342
+Forwarded: not-needed
+Last-Update: 2024-11-11
+
+--- a/modules/javafx.graphics/src/main/native-font/pango.c
++++ b/modules/javafx.graphics/src/main/native-font/pango.c
+@@ -243,7 +243,7 @@
+ if (text) {
+ // rc = (jboolean)FcConfigAppFontAddFile(arg0, text);
+ if (fp) {
+- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text);
++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)(&arg0, text);
+ }
+ (*env)->ReleaseStringUTFChars(env, arg1, text);
+ }
+@@ -402,7 +402,7 @@
+ (JNIEnv *env, jclass that, jlong str, jlong pos)
+ {
+ if (!str) return 0;
+- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos);
++ return (jlong)g_utf8_strlen((const gchar *)str, pos);
+ }
+
+ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8)
+--- a/modules/javafx.graphics/src/main/native-prism-es2/GL/glx.h
++++ b/modules/javafx.graphics/src/main/native-prism-es2/GL/glx.h
+@@ -322,7 +322,7 @@
+
+
+ /* GLX 1.4 and later */
+-extern void (*glXGetProcAddress(const GLubyte *procname))( void );
++extern int (*glXGetProcAddress(const GLubyte *procname))( int );
+
+ /* GLX 1.4 function pointer typedefs */
+ typedef __GLXextFuncPtr (* PFNGLXGETPROCADDRESSPROC) (const GLubyte *procName);
+--- a/modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoHeapImplInlines.h
++++ b/modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoHeapImplInlines.h
+@@ -25,6 +25,7 @@
+
+ #pragma once
+
++#include <stdio.h>
+ #include "IsoHeapImpl.h"
+ #include "IsoTLSDeallocatorEntry.h"
+ #include "IsoSharedHeapInlines.h"
+--- a/modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
++++ b/modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
+@@ -25,6 +25,7 @@
+
+ #pragma once
+
++#include <stdio.h>
+ #include "IsoPage.h"
+ #include "StdLibExtras.h"
+ #include "VMAllocate.h"
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/text/IntegerToStringConversion.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/text/IntegerToStringConversion.h
+@@ -21,6 +21,7 @@
+
+ #pragma once
+
++#include <iostream>
+ #include <wtf/text/LChar.h>
+
+ namespace WTF {
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/Vector.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/Vector.h
+@@ -29,6 +29,7 @@
+ #include <wtf/FailureAction.h>
+ #include <wtf/FastMalloc.h>
+ #include <wtf/Forward.h>
++#include <wtf/HashMap.h>
+ #include <wtf/MallocPtr.h>
+ #include <wtf/MathExtras.h>
+ #include <wtf/Noncopyable.h>
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/MallocPtr.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/MallocPtr.h
+@@ -25,6 +25,7 @@
+
+ #pragma once
+
++#include <utility>
+ #include <wtf/FastMalloc.h>
+ #include <wtf/Noncopyable.h>
+
+--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/API/JSRetainPtr.h
++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/API/JSRetainPtr.h
+@@ -31,6 +31,7 @@
+ #include <JavaScriptCore/JSContextRef.h>
+ #include <JavaScriptCore/JSStringRef.h>
+ #include <algorithm>
++#include <utility>
+
+ inline void JSRetain(JSStringRef string) { JSStringRetain(string); }
+ inline void JSRelease(JSStringRef string) { JSStringRelease(string); }
=====================================
debian/patches/series
=====================================
@@ -23,3 +23,4 @@ disable-ffmpeg.patch
webkit-217079-only-use-jumpislands-with-JIT.patch
jdk-21-compilation.patch
64-bit-time-t.patch
+gcc-14.patch
=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export CXX=g++-11
+export CXX=g++
# FIXME: looks like s390x is recognized as a 32bit arch ...
# more heap on s390x needed
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/9bb156be6fb5877c20a196ec706ff3d8bb1af4ea...7b3ddfe4a6b93277f5c473594180d789baf2565a
--
View it on GitLab: https://salsa.debian.org/java-team/openjfx/-/compare/9bb156be6fb5877c20a196ec706ff3d8bb1af4ea...7b3ddfe4a6b93277f5c473594180d789baf2565a
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/20241111/bbd1c115/attachment.htm>
More information about the pkg-java-commits
mailing list