Commit 62b12c5d authored by Simon F's avatar Simon F

community/openjdk8: add a font to the JRE package

parent e2eab9a1
Pipeline #54227 failed with stages
in 125 minutes and 47 seconds
......@@ -6,7 +6,7 @@ _icedteaver=3.16.0
# pkgver is <JDK version>.<JDK update>.<JDK build>
# Check https://icedtea.classpath.org/wiki/Main_Page when updating!
pkgver=8.252.09
pkgrel=1
pkgrel=2
pkgdesc="OpenJDK 8 provided by IcedTea"
url="https://icedtea.classpath.org/"
# no bootstrap JDK on mips
......@@ -95,6 +95,7 @@ source="https://icedtea.classpath.org/download/source/icedtea-$_icedteaver.tar.x
icedtea-jdk-includes.patch
icedtea-jdk-close-fds.patch
icedtea-autoconf-config.patch
icedtea-gcc10-fix-compile.patch
"
builddir="$srcdir/icedtea-$_icedteaver"
......@@ -298,6 +299,7 @@ jrelib() {
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
depends="ttf-dejavu"
local file dir
mkdir -p "$subpkgdir"
......@@ -369,4 +371,5 @@ b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec8
3b01de971f64f082d3e289cf337e635ef001381e8ca427a77baa9c52c7ba423889f57665779ca5b3c8bcefb8feacbea31dfaac580c969a4f061439069ee34aae icedtea-jdk-musl.patch
974fb54532b7e7d738f4278187fc6bd9f9b2d99866b94f68a617ee4911c89a3b8cc41ecfdcaefecf9157492d006b1844b6b0b41ac4209d84f9e8d13c9e485dd3 icedtea-jdk-includes.patch
26d33ea5c55f89beebb0c05cc520e839439285f80d8ffca66ee9ef833ba65332dd7848de0b1a7e040d2eed494410d446729db72b09d8a23b6eea55749b8f6f54 icedtea-jdk-close-fds.patch
662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch"
662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167 icedtea-autoconf-config.patch
051c08e51036c2525afb07e1ffb3d785482b4dc0cec3a518d65d5fcb1118d36e460cf59585b635d42c195b9a1901ffe6778efc0f160b37088ba27ea35584965d icedtea-gcc10-fix-compile.patch"
This patch fixes compilation with GCC10. Slightly modified so it can be applied.
Upstream: yes
Upstream-Patch: https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/d5c69bd5f7ad
Upstream-Patch: https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/41be6128f4c1
Upstream-Patch: https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/a844d7f2ac12
Upstream-Issue: https://bugs.openjdk.java.net/browse/JDK-8235903
--- openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
+++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
@@ -28,6 +28,9 @@
#include <dlfcn.h>
#include "NativeFunc.h"
+/* global GSS function table */
+GSS_FUNCTION_TABLE_PTR ftab;
+
/* standard GSS method names (ordering is from mapfile) */
static const char RELEASE_NAME[] = "gss_release_name";
static const char IMPORT_NAME[] = "gss_import_name";
--- openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
+++ openjdk/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h
@@ -265,6 +265,6 @@
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
/* global GSS function table */
-GSS_FUNCTION_TABLE_PTR ftab;
+extern GSS_FUNCTION_TABLE_PTR ftab;
#endif
--- openjdk/jdk/src/solaris/native/java/lang/childproc.c
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.c
@@ -33,6 +33,7 @@
#include "childproc.h"
+const char * const *parentPathv;
ssize_t
restartableWrite(int fd, const void *buf, size_t count)
--- openjdk/jdk/src/solaris/native/java/lang/childproc.h
+++ openjdk/jdk/src/solaris/native/java/lang/childproc.h
@@ -119,7 +119,7 @@
* The cached and split version of the JDK's effective PATH.
* (We don't support putenv("PATH=...") in native code)
*/
-const char * const *parentPathv;
+extern const char * const *parentPathv;
ssize_t restartableWrite(int fd, const void *buf, size_t count);
int restartableDup2(int fd_from, int fd_to);
--- openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/Sctp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,20 +74,19 @@
#include <netinet/in.h>
#include "jni.h"
+//Causes compiler error if not found, should make warning and uncomment
+/*#include <netinet/sctp.h>*/
+
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+
/* The current version of lksctp does
* not define the following option that the Java API (optionally) supports */
#ifndef SCTP_EXPLICIT_EOR
#define SCTP_EXPLICIT_EOR -1
#endif
-#ifdef USE_SYSTEM_SCTP
-#include <netinet/sctp.h>
-#else
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-
/* Definitions taken from lksctp-tools-1.0.8/src/include/netinet/sctp.h */
#ifndef SCTP_INITMSG
@@ -320,25 +319,15 @@
typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags);
typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
-#endif
#endif /* __linux__ */
-#ifdef USE_SYSTEM_SCTP
-#define nio_sctp_getladdrs sctp_getladdrs
-#define nio_sctp_freeladdrs sctp_freeladdrs
-#define nio_sctp_getpaddrs sctp_getpaddrs
-#define nio_sctp_freepaddrs sctp_freepaddrs
-#define nio_sctp_bindx sctp_bindx
-#define nio_sctp_peeloff sctp_peeloff
-#else
-sctp_getladdrs_func* nio_sctp_getladdrs;
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
-sctp_bindx_func* nio_sctp_bindx;
-sctp_peeloff_func* nio_sctp_peeloff;
-#endif
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
+extern sctp_bindx_func* nio_sctp_bindx;
+extern sctp_peeloff_func* nio_sctp_peeloff;
jboolean loadSocketExtensionFuncs(JNIEnv* env);
--- openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
+++ openjdk/jdk/src/solaris/native/sun/nio/ch/sctp/SctpNet.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,7 @@
#include <stdlib.h>
#include <string.h>
-
-#ifndef USE_SYSTEM_SCTP
#include <dlfcn.h>
-#endif
#include "Sctp.h"
#include "jni.h"
@@ -46,6 +43,13 @@
static const char* nativeSctpLib = "libsctp.so.1";
static jboolean funcsLoaded = JNI_FALSE;
+sctp_getladdrs_func* nio_sctp_getladdrs;
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
+sctp_bindx_func* nio_sctp_bindx;
+sctp_peeloff_func* nio_sctp_peeloff;
+
JNIEXPORT jint JNICALL JNI_OnLoad
(JavaVM *vm, void *reserved) {
return JNI_VERSION_1_2;
@@ -61,7 +65,6 @@
*/
jboolean loadSocketExtensionFuncs
(JNIEnv* env) {
-#ifndef USE_SYSTEM_SCTP
if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) {
JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
dlerror());
@@ -109,7 +112,7 @@
dlerror());
return JNI_FALSE;
}
-#endif
+
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment