summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD18
-rw-r--r--java.desktop8
-rw-r--r--jconsole.desktop8
-rw-r--r--jdk.install4
-rw-r--r--jshell.desktop8
6 files changed, 33 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 624e071f52bd..73f931c12b53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
pkgbase = jdk
pkgdesc = Oracle Java Development Kit
- pkgver = 12.0.2
+ pkgver = 13
pkgrel = 1
url = https://www.oracle.com/java/
install = jdk.install
arch = x86_64
license = custom
depends = java-environment-common
- depends = jre>=12
- depends = jre<13
+ depends = jre>=13
+ depends = jre<14
depends = zlib
depends = hicolor-icon-theme
- provides = java-environment=12
- provides = java-environment-jdk=12
- source = https://download.oracle.com/otn-pub/java/jdk/12.0.2+10/e482c34c86bd4bf8b56c0b35558996b9/jdk-12.0.2_linux-x64_bin.tar.gz
+ provides = java-environment=13
+ provides = java-environment-jdk=13
+ source = https://download.oracle.com/otn-pub/java/jdk/13+33/5b8a42f3905b406298b72d750b6919f6/jdk-13_linux-x64_bin.tar.gz
source = java.desktop
source = jconsole.desktop
source = jshell.desktop
source = java_16.png
source = java_48.png
- sha256sums = 2dde6fda89a4ec6e6560ed464e917861c9e40bf576e7a64856dafc55abaaff51
- sha256sums = 7b348c5f6b6ce7df7f849a90f0bdbbdb5a2d6236ec05e96e0b160755cf87fd69
- sha256sums = 74d52ebc46e1d6b104130c04209a9cf318163de022034239042a1981a6ffd60f
- sha256sums = d207bb3f4a55e329546d084d8b82b6c217177ff11ebcc85e6420b14b011b3cd1
+ sha256sums = 68515c29d52b7c854316fa6b25c332e91320d4c0ccd1fc8888aa312159aefef9
+ sha256sums = 91c70275116cdfea1a0459fe76dd0d916bfecd12faafb8fd1bcf9b7306e85cb6
+ sha256sums = b9ad3acc8ba7ead6e8374f590588bb136d3a0e6d80e80a048d75ff63ca2325d0
+ sha256sums = 34f05e1ce1a33ec65d94388428ccbad2a441460f9cc7b42a69dbc75255ec92bf
sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed
sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176
diff --git a/PKGBUILD b/PKGBUILD
index f5d7ec101f6c..12ee0409e8b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
# Contributor: Det <nimetonmaili g-mail>
pkgname=jdk
-pkgver=12.0.2
-_build=10
-_hash=e482c34c86bd4bf8b56c0b35558996b9
+pkgver=13
+_build=33
+_hash=5b8a42f3905b406298b72d750b6919f6
_majver="${pkgver%%.*}"
_next="$((_majver + 1))"
pkgrel=1
@@ -21,10 +21,10 @@ source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_has
'jshell.desktop'
'java_16.png'
'java_48.png')
-sha256sums=('2dde6fda89a4ec6e6560ed464e917861c9e40bf576e7a64856dafc55abaaff51'
- '7b348c5f6b6ce7df7f849a90f0bdbbdb5a2d6236ec05e96e0b160755cf87fd69'
- '74d52ebc46e1d6b104130c04209a9cf318163de022034239042a1981a6ffd60f'
- 'd207bb3f4a55e329546d084d8b82b6c217177ff11ebcc85e6420b14b011b3cd1'
+sha256sums=('68515c29d52b7c854316fa6b25c332e91320d4c0ccd1fc8888aa312159aefef9'
+ '91c70275116cdfea1a0459fe76dd0d916bfecd12faafb8fd1bcf9b7306e85cb6'
+ 'b9ad3acc8ba7ead6e8374f590588bb136d3a0e6d80e80a048d75ff63ca2325d0'
+ '34f05e1ce1a33ec65d94388428ccbad2a441460f9cc7b42a69dbc75255ec92bf'
'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
'7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176')
@@ -63,10 +63,10 @@ package() {
# man pages
local _file
- for _file in man/man1/*
+ while read -r -d '' _file
do
install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
- done
+ done < <(find man/man1 -type f -print0)
rm "${pkgdir}/usr/share/man/man1/"{java,jjs,jrunscript,keytool,pack200}-jdk"${_majver}".1
rm "${pkgdir}/usr/share/man/man1/"{rmid,rmiregistry,unpack200}-jdk"${_majver}".1
diff --git a/java.desktop b/java.desktop
index bf14d3517c40..2416be9293b1 100644
--- a/java.desktop
+++ b/java.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Oracle Java 12 Runtime
-Comment=Oracle Java 12 Runtime
+Name=Oracle Java 13 Runtime
+Comment=Oracle Java 13 Runtime
Keywords=java;runtime
-Exec=/usr/lib/jvm/java-12-jdk/bin/java -jar
+Exec=/usr/lib/jvm/java-13-jdk/bin/java -jar
Terminal=false
Type=Application
-Icon=java12-jdk
+Icon=java13-jdk
MimeType=application/x-java-archive;application/java-archive;application/x-jar;
NoDisplay=true
diff --git a/jconsole.desktop b/jconsole.desktop
index 4b73c8ddcf85..b0b85d728b46 100644
--- a/jconsole.desktop
+++ b/jconsole.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=Oracle Java 12 Console
-Comment=Oracle Java 12 Monitoring and Management Console
+Name=Oracle Java 13 Console
+Comment=Oracle Java 13 Monitoring and Management Console
Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-12-jdk/bin/jconsole
+Exec=/usr/lib/jvm/java-13-jdk/bin/jconsole
Terminal=false
Type=Application
-Icon=java12-jdk
+Icon=java13-jdk
Categories=Application;System;
diff --git a/jdk.install b/jdk.install
index df31ceffe439..a3b72260fd8e 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,4 +1,4 @@
-THIS_JDK='java-12-jdk'
+THIS_JDK='java-13-jdk'
fix_default() {
if [ ! -x /usr/bin/java ]; then
@@ -42,7 +42,7 @@ post_upgrade() {
pre_remove() {
if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
- # Check JRE12 is still available
+ # Check JRE13 is still available
if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
/usr/bin/archlinux-java unset
fi
diff --git a/jshell.desktop b/jshell.desktop
index e166068579ba..0f35b827506f 100644
--- a/jshell.desktop
+++ b/jshell.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=Oracle Java 12 Shell
-Comment=Oracle Java 12 Shell
+Name=Oracle Java 13 Shell
+Comment=Oracle Java 13 Shell
Keywords=java;shell
-Exec=/usr/lib/jvm/java-12-jdk/bin/jshell
+Exec=/usr/lib/jvm/java-13-jdk/bin/jshell
Terminal=true
Type=Application
-Icon=java12-jdk
+Icon=java13-jdk
Categories=Application;System;