summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2019-03-26 20:34:37 +0000
committerDaniel Bermond2019-03-26 20:40:15 +0000
commit7615923f484d1627692cb9f64f46dd1a9468c69a (patch)
tree7ea827c7ebfe0a688243d120722238e149f5d969
parent505d7c6f0af398eae7276b86613cb67281cd58ae (diff)
downloadaur-7615923f484d1627692cb9f64f46dd1a9468c69a.tar.gz
Updated to version 12
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD23
-rw-r--r--java.desktop8
-rw-r--r--jconsole.desktop8
-rw-r--r--jdk.install4
-rw-r--r--jshell.desktop8
6 files changed, 40 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9133cf51fac..e7466326d70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,28 @@
pkgbase = jdk
pkgdesc = Oracle Java Development Kit
- pkgver = 11.0.2
+ pkgver = 12
pkgrel = 1
url = https://www.oracle.com/java/
install = jdk.install
arch = x86_64
license = custom
depends = java-environment-common
- depends = jre>=11
- depends = jre<12
+ depends = jre>=12
+ depends = jre<13
depends = zlib
depends = hicolor-icon-theme
- provides = java-environment=11
- provides = java-environment-jdk=11
- source = https://download.oracle.com/otn-pub/java/jdk/11.0.2+9/f51449fcd52f4d52b93a989c5c56ed3c/jdk-11.0.2_linux-x64_bin.tar.gz
+ provides = java-environment=12
+ provides = java-environment-jdk=12
+ source = https://download.oracle.com/otn-pub/java/jdk/12+33/312335d836a34c7c8bba9d963e26dc23/jdk-12_linux-x64_bin.tar.gz
source = java.desktop
source = jconsole.desktop
source = jshell.desktop
source = java_16.png
source = java_48.png
- sha256sums = 7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8
- sha256sums = 1052634cdcbf50ca14b864b58f3afa53de1706bdc9c593667c29974146212c54
- sha256sums = 9a84d1b4dd969e867b2dbb6df0d0c44814729e0f1d0c61ab6c54d676eae83b3b
- sha256sums = 73d686fd6e478a887a51451d7ada7c045f31ce299f65f45e50a793820ee99d85
+ sha256sums = 183d4d897bbf47bdae43b2bb4fc0465a9178209b5250555ac7fdb8fab6cc43a6
+ sha256sums = 7b348c5f6b6ce7df7f849a90f0bdbbdb5a2d6236ec05e96e0b160755cf87fd69
+ sha256sums = 74d52ebc46e1d6b104130c04209a9cf318163de022034239042a1981a6ffd60f
+ sha256sums = d207bb3f4a55e329546d084d8b82b6c217177ff11ebcc85e6420b14b011b3cd1
sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed
sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176
diff --git a/PKGBUILD b/PKGBUILD
index a27ed232997..0959fdd5614 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
# Contributor: Det <nimetonmaili g-mail>
pkgname=jdk
-pkgver=11.0.2
-_build=9
-_hash=f51449fcd52f4d52b93a989c5c56ed3c
+pkgver=12
+_build=33
+_hash=312335d836a34c7c8bba9d963e26dc23
_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=('7b4fd8ffcf53e9ff699d964a80e4abf9706b5bdb5644a765c2b96f99e3a2cdc8'
- '1052634cdcbf50ca14b864b58f3afa53de1706bdc9c593667c29974146212c54'
- '9a84d1b4dd969e867b2dbb6df0d0c44814729e0f1d0c61ab6c54d676eae83b3b'
- '73d686fd6e478a887a51451d7ada7c045f31ce299f65f45e50a793820ee99d85'
+sha256sums=('183d4d897bbf47bdae43b2bb4fc0465a9178209b5250555ac7fdb8fab6cc43a6'
+ '7b348c5f6b6ce7df7f849a90f0bdbbdb5a2d6236ec05e96e0b160755cf87fd69'
+ '74d52ebc46e1d6b104130c04209a9cf318163de022034239042a1981a6ffd60f'
+ 'd207bb3f4a55e329546d084d8b82b6c217177ff11ebcc85e6420b14b011b3cd1'
'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
'7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176')
@@ -61,6 +61,15 @@ package() {
install -D -m644 "${srcdir}/java_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/java${_majver}-jdk.png"
install -D -m644 "${srcdir}/java_48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/java${_majver}-jdk.png"
+ # man pages
+ local _file
+ for _file in man/man1/*
+ do
+ install -D -m644 "$_file" "${pkgdir}/usr/share/${_file%.1}-jdk${_majver}.1"
+ done
+ 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
+
# legal/licenses
cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java${_majver}-${pkgname}"
diff --git a/java.desktop b/java.desktop
index 1c3cf4e50ab..bf14d3517c4 100644
--- a/java.desktop
+++ b/java.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
-Name=Oracle Java 11 Runtime
-Comment=Oracle Java 11 Runtime
+Name=Oracle Java 12 Runtime
+Comment=Oracle Java 12 Runtime
Keywords=java;runtime
-Exec=/usr/lib/jvm/java-11-jdk/bin/java -jar
+Exec=/usr/lib/jvm/java-12-jdk/bin/java -jar
Terminal=false
Type=Application
-Icon=java11-jdk
+Icon=java12-jdk
MimeType=application/x-java-archive;application/java-archive;application/x-jar;
NoDisplay=true
diff --git a/jconsole.desktop b/jconsole.desktop
index f2b689b9b2f..4b73c8ddcf8 100644
--- a/jconsole.desktop
+++ b/jconsole.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=Oracle Java 11 Console
-Comment=Oracle Java 11 Monitoring and Management Console
+Name=Oracle Java 12 Console
+Comment=Oracle Java 12 Monitoring and Management Console
Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-11-jdk/bin/jconsole
+Exec=/usr/lib/jvm/java-12-jdk/bin/jconsole
Terminal=false
Type=Application
-Icon=java11-jdk
+Icon=java12-jdk
Categories=Application;System;
diff --git a/jdk.install b/jdk.install
index e8adb3282b5..df31ceffe43 100644
--- a/jdk.install
+++ b/jdk.install
@@ -1,4 +1,4 @@
-THIS_JDK='java-11-jdk'
+THIS_JDK='java-12-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 JRE11 is still available
+ # Check JRE12 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 83fb1edf95e..e166068579b 100644
--- a/jshell.desktop
+++ b/jshell.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=Oracle Java 11 Shell
-Comment=Oracle Java 11 Shell
+Name=Oracle Java 12 Shell
+Comment=Oracle Java 12 Shell
Keywords=java;shell
-Exec=/usr/lib/jvm/java-11-jdk/bin/jshell
+Exec=/usr/lib/jvm/java-12-jdk/bin/jshell
Terminal=true
Type=Application
-Icon=java11-jdk
+Icon=java12-jdk
Categories=Application;System;