From 90dd0bb83407d1a5bcc1e629275f46c39f8e5438 Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 3 Feb 2026 17:25:35 +0300 Subject: [PATCH] java8 ver. bump --- .../language/java/java8-openjdk/actions.py | 24 ++++++-- .../openjdk-8-insantiate-arrayallocator.patch | 16 +++++ ...k-8.402_p06-0001-Fix-Wint-conversion.patch | 41 +++++++++++++ ...0002-Fix-Wincompatible-pointer-types.patch | 48 +++++++++++++++ ...dk-8.402_p06-0004-Fix-misc.-warnings.patch | 61 +++++++++++++++++++ .../language/java/java8-openjdk/pspec.xml | 27 ++++---- 6 files changed, 199 insertions(+), 18 deletions(-) create mode 100644 programming/language/java/java8-openjdk/files/gentoo/openjdk-8-insantiate-arrayallocator.patch create mode 100644 programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch create mode 100644 programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch create mode 100644 programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch diff --git a/programming/language/java/java8-openjdk/actions.py b/programming/language/java/java8-openjdk/actions.py index d1746a6300..a8323bc0fa 100755 --- a/programming/language/java/java8-openjdk/actions.py +++ b/programming/language/java/java8-openjdk/actions.py @@ -22,17 +22,28 @@ shelltools.export("HOTSPOT_BUILD_JOBS", jobs) shelltools.export("LC_ALL", "C") def setup(): - shelltools.export("CFLAGS", "%s -fPIC -O3" % get.CFLAGS()) - shelltools.export("CXXFLAGS", "%s -fPIC -O3" % get.CXXFLAGS()) + # 3.8.0 yama vurmak için openjdk yerine openjdk- dosyasına alındı geçici + shelltools.system("sed -i 's|OPENJDK_CHANGESET) openjdk|OPENJDK_CHANGESET) openjdk-|g' Makefile.in") + + shelltools.export("CFLAGS", "%s -std=gnu17 -fPIC -O3" % get.CFLAGS()) + shelltools.export("CXXFLAGS", "%s -std=gnu++14 -fPIC -O3" % get.CXXFLAGS()) shelltools.export("CC", "gcc") shelltools.export("CXX", "g++") + #shelltools.system('export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ #patches/openjdk7_nonreparenting-wm.diff"') #patches/giflib_5.1.diff + + shelltools.move("icedtea8-4f0a262e7d6", "openjdk") + shelltools.system("patch -p0 < openjdk-8-insantiate-arrayallocator.patch") + shelltools.system("patch -p1 < openjdk-8.402_p06-0001-Fix-Wint-conversion.patch") + shelltools.system("patch -p1 < openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch") + # shelltools.system("patch -p1 < openjdk-8.402_p06-0004-Fix-misc.-warnings.patch") + autotools.rawConfigure("\ - --disable-tests \ + ----disable-tests \ --disable-Werror \ - --with-parallel-jobs=%s \ + --with-parallel-jobs='%s' \ --enable-nss \ --disable-system-kerberos \ --disable-system-pcsc \ @@ -41,7 +52,7 @@ def setup(): --with-jdk-home=/usr/lib/jvm/java-8-openjdk \ --with-ecj-jar=/usr/share/java/ecj.jar \ --with-vendor-name='PisiLinux' \ - --with-pkgversion='PisiLinux build 8u.452_3.35.0' \ + --with-pkgversion='PisiLinux build 8u.482_3.38.0' \ " % jobs.replace("-j", "")) def build(): @@ -89,7 +100,8 @@ def install(): pisitools.insinto("%s/jre/bin" % jvmdir , "images/j2sdk-image/jre/bin/*") #pisitools.insinto("%s/jre/lib/amd64" % jvmdir , "j2sdk-image/jre/lib/amd64/xawt") - for binfile in shelltools.ls("images/j2sdk-image/jre/bin"): + # for binfile in shelltools.ls("images/j2sdk-image/jre/bin"): + for binfile in shelltools.ls("%s/usr/lib/jvm/java-8-openjdk/jre/bin" % get.installDIR()): pisitools.dosym("%s/jre/bin/%s" % (jvmdir, binfile), "/usr/bin/%s" % binfile) pisitools.insinto("/usr/share/applications", "../policytool.desktop", "policytool-jdk8.desktop") diff --git a/programming/language/java/java8-openjdk/files/gentoo/openjdk-8-insantiate-arrayallocator.patch b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8-insantiate-arrayallocator.patch new file mode 100644 index 0000000000..ba5283f157 --- /dev/null +++ b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8-insantiate-arrayallocator.patch @@ -0,0 +1,16 @@ +Workarounds build error: +Error: dl failure on line 895 +Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found + +Possibly due to g++ 10.x error on not properly instantiating the template. + +--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200 ++++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200 +@@ -42,6 +42,7 @@ + # include "os_bsd.inline.hpp" + #endif + ++template class ArrayAllocator; + + BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) : + _map(map), _size(size_in_bits), _map_allocator(false) diff --git a/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch new file mode 100644 index 0000000000..16e1b5cb0c --- /dev/null +++ b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch @@ -0,0 +1,41 @@ +From cc568d4d246ffc9bf08a96db0889d3b89c852718 Mon Sep 17 00:00:00 2001 +From: Sam James +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/openjdk/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 +--- + jdk/src/share/bin/splashscreen_stubs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/openjdk/jdk/src/share/bin/splashscreen_stubs.c b/openjdk/jdk/src/share/bin/splashscreen_stubs.c +index 9c1f514..666634f 100644 +--- a/openjdk/jdk/src/share/bin/splashscreen_stubs.c ++++ b/openjdk/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/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch new file mode 100644 index 0000000000..850f7d5a41 --- /dev/null +++ b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch @@ -0,0 +1,48 @@ +From 57b8fef20b090ffdf99bcf2c3f5fc8d0d4472788 Mon Sep 17 00:00:00 2001 +From: Sam James +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/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c: In function ‘Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage’: +jdk8u-jdk8u402-ga/openjdk/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/openjdk/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/openjdk/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 +--- + jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c b/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c +index 7e1d8c9..163003c 100644 +--- a/openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c ++++ b/openjdk/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 + diff --git a/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch new file mode 100644 index 0000000000..69892b9216 --- /dev/null +++ b/programming/language/java/java8-openjdk/files/gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch @@ -0,0 +1,61 @@ +From 24f51a75b79aec29bd1631d320e051a646b9fae4 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 6 Mar 2024 12:23:41 +0000 +Subject: [PATCH 4/4] Fix misc. warnings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Backport of https://github.com/openjdk/jdk11u/commit/49dec121161c162f4aa94caf8c09413253d89377. + +``` +jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp: In function ‘_jobject* Java_com_sun_java_util_jar_Unpack_getUnusedInput(JNIEnv*, jobject)’: +jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:295:12: error: cannot convert ‘bool’ to ‘jobject’ {aka ‘_jobject*’} in return + 295 | return false; + | ^~~~~ +jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp: In function ‘jlong Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv*, jobject)’: +jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null] + 315 | CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +jdk8u-jdk8u402-ga/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp:315:3: warning: converting to non-pointer type ‘long int’ from NULL [-Wconversion-null] +[...] +``` + +Signed-off-by: Sam James +--- + jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp b/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp +index 5fbc726..4c002e7 100644 +--- a/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp ++++ b/openjdk/jdk/src/share/native/com/sun/java/openjdk/util/jar/pack/jni.cpp +@@ -292,7 +292,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject + + if (uPtr->aborting()) { + THROW_IOE(uPtr->get_abort_message()); +- return false; ++ return null; + } + + // We have fetched all the files. +@@ -312,7 +312,7 @@ Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) { + // There's no need to create a new unpacker here if we don't already have one + // just to immediatly free it afterwards. + unpacker* uPtr = get_unpacker(env, pObj, /* noCreate= */ true); +- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0); + size_t consumed = uPtr->input_consumed(); + // free_unpacker() will set the unpacker field on 'pObj' to null + free_unpacker(env, pObj, uPtr); +@@ -323,6 +323,7 @@ JNIEXPORT jboolean JNICALL + Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj, + jstring pProp, jstring pValue) { + unpacker* uPtr = get_unpacker(env, pObj); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE); + CHECK_EXCEPTION_RETURN_VALUE(prop, false); + const char* value = env->GetStringUTFChars(pValue, JNI_FALSE); +-- +2.44.0 + diff --git a/programming/language/java/java8-openjdk/pspec.xml b/programming/language/java/java8-openjdk/pspec.xml index dedace239e..7260b3e9af 100755 --- a/programming/language/java/java8-openjdk/pspec.xml +++ b/programming/language/java/java8-openjdk/pspec.xml @@ -13,15 +13,10 @@ java8 Open Java Development Kit OpenJDK (Open Java Development Kit) is a free and open source implementation of the Java Platform, Standard Edition (Java SE). - https://icedtea.classpath.org/download/source/icedtea-3.35.0.tar.xz - + https://icedtea.classpath.org/download/source/icedtea-3.38.0.tar.xz + https://icedtea.classpath.org/download/drops/icedtea8/3.38.0/openjdk-git.tar.xz --> + + https://icedtea.classpath.org/download/drops/icedtea8/3.38.0/openjdk-git.tar.xz wget @@ -58,9 +53,10 @@ libXp-devel - - - + gentoo/openjdk-8-insantiate-arrayallocator.patch + gentoo/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch + gentoo/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch + gentoo/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch @@ -328,6 +324,13 @@ + + 2026-02-03 + 8u_482.3.38.0 + Version bump. + Pisi Linux Community + admin@pisilinux.org + 2025-05-06 8u_452.3.35.0