aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Frankenberger <simon@fraho.eu>2020-07-25 01:43:52 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-07-25 04:32:15 +0000
commit2cbdb3ae5943fb04c33e43b4dff45b44a6cab60e (patch)
treeab1949a6105304679440ad9a0f9a6027aaec8de9
parent44a59bd2f50ef15193c44a081c6974bb2b4b851d (diff)
downloadaports-2cbdb3ae5943fb04c33e43b4dff45b44a6cab60e.tar.gz
aports-2cbdb3ae5943fb04c33e43b4dff45b44a6cab60e.tar.bz2
aports-2cbdb3ae5943fb04c33e43b4dff45b44a6cab60e.tar.xz
testing/openjdk14: upgrade to 14.0.2
-rw-r--r--testing/openjdk14/APKBUILD8
-rw-r--r--testing/openjdk14/build.patch11
-rw-r--r--testing/openjdk14/make-4.3.patch17
3 files changed, 3 insertions, 33 deletions
diff --git a/testing/openjdk14/APKBUILD b/testing/openjdk14/APKBUILD
index 1d0d44a1f9..00098ba34d 100644
--- a/testing/openjdk14/APKBUILD
+++ b/testing/openjdk14/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
# Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
pkgname=openjdk14
-pkgver=14.0.1_p7
+pkgver=14.0.2_p12
_pkgver=${pkgver%_p*}-ga
pkgrel=0
pkgdesc="Oracle OpenJDK 14"
@@ -46,7 +46,6 @@ source="jdk-$_pkgver.tar.gz::https://github.com/openjdk/jdk14u/archive/jdk-$_pkg
build.patch
aarch64.patch
ppc64le.patch
- make-4.3.patch
fix-bootjdk-check.patch
HelloWorld.java
@@ -282,11 +281,10 @@ _jdk() {
mv "$_fromroot/include" "$_toroot"
}
-sha512sums="5370166fbd661c2250e2420758aebfa49790e4402cf4e28a5940d3b500b489400bef99f54c6aea4c78791e7501d5bfe6f4c00a7a162278d1238311dcd2dbced5 jdk-14.0.1-ga.tar.gz
-fc96bc53569fba6b3877b2959fddaee651c60a9506a615539afa542606e2b1b97fb22ca5a3b6b78e621983f63e9083a3749f4ded32ca3cae54a4257fd72fb9f2 build.patch
+sha512sums="e76b7908e7b1375029564d39386c86b640fcb61c7152bdda7249a6455516792830f17e987c98790ae5983087b928be6f5d572b8b10f3e2318d2d993f5f22ed62 jdk-14.0.2-ga.tar.gz
+f6935b7ec3a9245329dff11b26aa8e7367b3fbece11803e9aef17ed7ff4ab7c8a4aa31efda624ff9f80947240f2842ba50ccefa38593c38b8ba739fc2c00db62 build.patch
79f0c799ceb75e2d797942de895cb3e6d853def39f5145886796864f38d240ceab3bc09f04c6703fc73ced4827d07a316049976c9ec660986372097d4eed79f4 aarch64.patch
5950cce461bc4c6b0fe45ee3d1bca8d1cb6f227800aa694c3b9a9c094d3fc17e27ae6c15d15d14f7964237ef027a886ab25d6338a871e3472744a99ebde16017 ppc64le.patch
-b8b420b9e73da54decbec04fab9ac1c79f3c01ef2f9af132cf98a008f9ff6544e67d98c109f8c48f224df9581a8b40399db25099766d9f3f9b11dafe5114c545 make-4.3.patch
e54c69db6e97c9d7057275f6749565a748f42dadb397b2f3975d99608c4037ad93c84cf828c7e2955b1b4f1899dcc25069c8c6d675f1e963adf3f1223a47d56c fix-bootjdk-check.patch
d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java
27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java
diff --git a/testing/openjdk14/build.patch b/testing/openjdk14/build.patch
index b016f0176e..df4a9143f1 100644
--- a/testing/openjdk14/build.patch
+++ b/testing/openjdk14/build.patch
@@ -277,17 +277,6 @@ Adopted, enhanced and fixed so that it actually compiles with alpine.
Window get_xawt_root_shell(JNIEnv *env) {
static jclass classXRootWindow = NULL;
---- old/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
-+++ new/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp
-@@ -33,7 +33,7 @@
- #include <stdbool.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <sys/sysctl.h>
-+#include <linux/sysctl.h>
- #include <sys/file.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
--- old/src/jdk.jdwp.agent/share/native/libjdwp/util.h
+++ new/src/jdk.jdwp.agent/share/native/libjdwp/util.h
@@ -35,15 +35,15 @@
diff --git a/testing/openjdk14/make-4.3.patch b/testing/openjdk14/make-4.3.patch
deleted file mode 100644
index 356c6a988a..0000000000
--- a/testing/openjdk14/make-4.3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-upstream report: https://bugs.openjdk.java.net/browse/JDK-8237879.
-
-diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
-index 170c3ed..697f9d2 100644
---- a/make/common/MakeBase.gmk
-+++ b/make/common/MakeBase.gmk
-@@ -532,7 +532,9 @@ DependOnVariableHelper = \
- $(info NewVariable $1: >$(strip $($1))<) \
- $(info OldVariable $1: >$(strip $($1_old))<)) \
- $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
-- $(call DependOnVariableFileName, $1, $2))) \
-+ $(call DependOnVariableFileName, $1, $2)) \
-+ $(eval $(call DependOnVariableFileName, $1, $2): ) \
-+ ) \
- $(call DependOnVariableFileName, $1, $2) \
- )
-