pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/openjdk8
Module Name: pkgsrc
Committed By: ryoon
Date: Tue Oct 7 15:19:26 UTC 2025
Modified Files:
pkgsrc/lang/openjdk8: Makefile distinfo
pkgsrc/lang/openjdk8/patches:
patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
Added Files:
pkgsrc/lang/openjdk8/patches:
patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c
Removed Files:
pkgsrc/lang/openjdk8/patches:
patch-jdk_src_solaris_native_java_net_net__util__md.c
Log Message:
lang/openjdk8: Fix build with GCC 14
* Remove incorrect patches/patch-jdk_src_solaris_native_java_net_net__util__md.c.
* Bump PKGREVISION.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 pkgsrc/lang/openjdk8/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/lang/openjdk8/distinfo
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
cvs rdiff -u -r1.2 -r0 \
pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c
cvs rdiff -u -r0 -r1.1 \
pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/openjdk8/Makefile
diff -u pkgsrc/lang/openjdk8/Makefile:1.141 pkgsrc/lang/openjdk8/Makefile:1.142
--- pkgsrc/lang/openjdk8/Makefile:1.141 Sat Aug 30 22:45:47 2025
+++ pkgsrc/lang/openjdk8/Makefile Tue Oct 7 15:19:26 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2025/08/30 22:45:47 wiz Exp $
+# $NetBSD: Makefile,v 1.142 2025/10/07 15:19:26 ryoon Exp $
DISTNAME= jdk8u-${GITHUB_TAG}
PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/}
MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits
Index: pkgsrc/lang/openjdk8/distinfo
diff -u pkgsrc/lang/openjdk8/distinfo:1.108 pkgsrc/lang/openjdk8/distinfo:1.109
--- pkgsrc/lang/openjdk8/distinfo:1.108 Sun Jun 15 13:40:16 2025
+++ pkgsrc/lang/openjdk8/distinfo Tue Oct 7 15:19:26 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.108 2025/06/15 13:40:16 ryoon Exp $
+$NetBSD: distinfo,v 1.109 2025/10/07 15:19:26 ryoon Exp $
BLAKE2s (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 8745b980e290e509c0dd09706398b89afce85fee1405b9367b6684c83d56b96a
SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) =
6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
@@ -100,7 +100,7 @@ SHA1 (patch-jdk_make_lib_ServiceabilityL
SHA1 (patch-jdk_make_lib_SoundLibraries.gmk) = b63cf0ebe204acf7264704916df875a31de84393
SHA1 (patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java) = b7d53d0c3554eebde8f7180e75259eb25123ce8b
SHA1 (patch-jdk_src_share_lib_security_java.security-bsd) = 5a64fc1205a5bd2f6586ad65ca21f93dfffb1606
-SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 9d8900a6f9cc6af99b08e281b0d6d4c337916317
+SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = feceab600355c7ac1a3fd4ff73a714f25cbf838c
SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = 5986de69be2eb36546274a8242b8d13ed7599b50
SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = bd2ef7ea0b2cd9ec8cb637e0c0d4dc3a25021773
SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 18e79e74dc8ec2b24ab91ad8af2195bfd508d1b4
@@ -113,8 +113,8 @@ SHA1 (patch-jdk_src_solaris_native_com_s
SHA1 (patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c) = 2596d03c4a2e0d978aabfd4b170b0dd1d6260c6d
SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 672c9a044936cb11cc91e9a3e550dc69ef665209
SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 6d58169565503ef8e50224fce8380e42cb87baba
-SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = c51d6b0687011a54c27e6253cad33d8f8cc27124
SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = cf0f8218e0088b677cd66fd5bc0d575ab08b710f
+SHA1 (patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c) = d63778b583413fde8ae553ff1c270e2c40552fb5
SHA1 (patch-jdk_test_Makefile) = 36430647c444dea491ae0c916c6ad7b1a3607ec6
SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = 5fb2dd92820afcca5a04956d81e5244840b513f7
SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = e5d6121d2af74238347baa2d63670f0d520847f8
Index: pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c
diff -u pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c:1.2 pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c:1.3
--- pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c:1.2 Thu Sep 24 22:54:28 2015
+++ pkgsrc/lang/openjdk8/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c Tue Oct 7 15:19:26 2025
@@ -1,8 +1,10 @@
-$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.2 2015/09/24 22:54:28 tnn Exp $
+$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.3 2025/10/07 15:19:26 ryoon Exp $
Ensure we use the bundled jpeg.
---- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig 2015-02-02 15:37:11.000000000 +0000
+Fix build with GCC 14. freeArray() requires the explicit cast.
+
+--- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig 2025-04-19 16:48:54.000000000 +0000
+++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
@@ -50,7 +50,7 @@
#include "com_sun_imageio_plugins_jpeg_JPEGImageWriter.h"
@@ -13,3 +15,65 @@ Ensure we use the bundled jpeg.
#include "jerror.h"
#undef MAX
+@@ -2854,14 +2854,14 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ pb = &data->pixelBuf;
+
+ if (setPixelBuffer(env, pb, buffer) == NOT_OK) {
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ return data->abortFlag; // We already threw an out of memory exception
+ }
+
+ // Allocate a 1-scanline buffer
+ scanLinePtr = (JSAMPROW)malloc(scanLineSize);
+ if (scanLinePtr == NULL) {
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ JNU_ThrowByName( env,
+ "java/lang/OutOfMemoryError",
+ "Writing JPEG Stream");
+@@ -2883,7 +2883,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ JNU_ThrowByName(env, "javax/imageio/IIOException", buffer);
+ }
+
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ free(scanLinePtr);
+ return data->abortFlag;
+ }
+@@ -2932,7 +2932,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ (*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT);
+ }
+ if (!success) {
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ free(scanLinePtr);
+ return data->abortFlag;
+ }
+@@ -2953,7 +2953,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ if (GET_ARRAYS(env, data,
+ (const JOCTET **)(&dest->next_output_byte)) == NOT_OK) {
+ (*env)->ExceptionClear(env);
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ free(scanLinePtr);
+ JNU_ThrowByName(env,
+ "javax/imageio/IIOException",
+@@ -2991,7 +2991,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ scanData = (*env)->GetIntArrayElements(env, scanInfo, NULL);
+ if (scanData == NULL) {
+ RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ free(scanLinePtr);
+ return data->abortFlag;
+ }
+@@ -3090,7 +3090,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGIm
+ jpeg_abort((j_common_ptr)cinfo);
+ }
+
+- freeArray(scale, numBands);
++ freeArray((void **)scale, numBands);
+ free(scanLinePtr);
+ RELEASE_ARRAYS(env, data, NULL);
+ return data->abortFlag;
Added files:
Index: pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c
diff -u /dev/null pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c:1.1
--- /dev/null Tue Oct 7 15:19:26 2025
+++ pkgsrc/lang/openjdk8/patches/patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c Tue Oct 7 15:19:26 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-jdk_src_solaris_native_sun_nio_fs_GnomeFileTypeDetector.c,v 1.1 2025/10/07 15:19:26 ryoon Exp $
+
+* Fix build with GCC 14 under NetBSD. strlen() requires string.h like Solaris and Linux.
+
+--- jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c.orig 2025-10-07 13:59:04.460058804 +0000
++++ jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
+@@ -35,7 +35,7 @@
+ #include <strings.h>
+ #endif
+
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__NetBSD__)
+ #include <string.h>
+ #endif
+
Home |
Main Index |
Thread Index |
Old Index