summaryrefslogtreecommitdiff
path: root/dev-java/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/openjdk')
-rw-r--r--dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch41
-rw-r--r--dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch48
2 files changed, 0 insertions, 89 deletions
diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch
deleted file mode 100644
index 317f1aa226b3..000000000000
--- a/dev-java/openjdk/files/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From cc568d4d246ffc9bf08a96db0889d3b89c852718 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 6 Mar 2024 11:22:11 +0000
-Subject: [PATCH 1/4] Fix -Wint-conversion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport of upstream commit https://github.com/openjdk/jdk21u-dev/commit/7b1455163ed893639059b3d62b71b2ff347c2e3f.
-
-Fixes the following warning/error:
-```
-jdk8u-jdk8u402-ga/jdk/src/share/bin/splashscreen_stubs.c:64:5: error: returning ‘void *’ from a function with return type ‘int’ makes integer from pointer without a cast [-Wint-conversion]
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- jdk/src/share/bin/splashscreen_stubs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/jdk/src/share/bin/splashscreen_stubs.c b/jdk/src/share/bin/splashscreen_stubs.c
-index 9c1f514..666634f 100644
---- a/jdk/src/share/bin/splashscreen_stubs.c
-+++ b/jdk/src/share/bin/splashscreen_stubs.c
-@@ -61,11 +61,11 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
- #define INVOKEV(name) _INVOKE(name, ,;)
-
- int DoSplashLoadMemory(void* pdata, int size) {
-- INVOKE(SplashLoadMemory, NULL)(pdata, size);
-+ INVOKE(SplashLoadMemory, 0)(pdata, size);
- }
-
- int DoSplashLoadFile(const char* filename) {
-- INVOKE(SplashLoadFile, NULL)(filename);
-+ INVOKE(SplashLoadFile, 0)(filename);
- }
-
- void DoSplashInit(void) {
---
-2.44.0
-
diff --git a/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch b/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch
deleted file mode 100644
index 3e8a5d17113c..000000000000
--- a/dev-java/openjdk/files/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 57b8fef20b090ffdf99bcf2c3f5fc8d0d4472788 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 6 Mar 2024 11:54:24 +0000
-Subject: [PATCH 2/4] Fix -Wincompatible-pointer-types
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Backport https://github.com/openjdk/jdk17u/commit/6632e6c6ca74101b45b052fb7962376fbe97605e.
-
-```
-jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c: In function ‘Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage’:
-jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2853:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types]
- 2853 | freeArray(scale, numBands);
- | ^~~~~
- | |
- | UINT8 ** {aka unsigned char **}
-jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2689:30: note: expected ‘void **’ but argument is of type ‘UINT8 **’ {aka ‘unsigned char **’}
- 2689 | static void freeArray(void** arr, jint size) {
- | ~~~~~~~^~~
-jdk8u-jdk8u402-ga/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c:2860:19: error: passing argument 1 of ‘freeArray’ from incompatible pointer type [-Wincompatible-pointer-types]
- 2860 | freeArray(scale, numBands);
- | ^~~~~
- | |
- | UINT8 ** {aka unsigned char **}
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-index 7e1d8c9..163003c 100644
---- a/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-+++ b/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
-@@ -2686,7 +2686,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables
- RELEASE_ARRAYS(env, data, NULL);
- }
-
--static void freeArray(void** arr, jint size) {
-+static void freeArray(UINT8** arr, jint size) {
- int i;
- if (arr != NULL) {
- for (i = 0; i < size; i++) {
---
-2.44.0
-