diff options
author | Daniel Bermond | 2022-03-24 10:41:55 -0300 |
---|---|---|
committer | Daniel Bermond | 2022-03-24 10:41:55 -0300 |
commit | 3ec7f6c2fb629cd71c59c8885867893c905db678 (patch) | |
tree | 3712d2672f20178440261e9d4fefa631c2b6283a | |
parent | b102761263565cae221ac2e6898dfe0521addfb7 (diff) | |
download | aur-3ec7f6c2fb629cd71c59c8885867893c905db678.tar.gz |
Update to version 18
-rw-r--r-- | .SRCINFO | 42 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | java.desktop | 6 | ||||
-rw-r--r-- | jconsole.desktop | 6 | ||||
-rw-r--r-- | jdk.install | 4 | ||||
-rw-r--r-- | jre.install | 2 | ||||
-rw-r--r-- | jshell.desktop | 6 |
7 files changed, 44 insertions, 44 deletions
@@ -1,27 +1,27 @@ pkgbase = jdk pkgdesc = Oracle Java - pkgver = 17.0.2 + pkgver = 18 pkgrel = 1 url = https://www.oracle.com/java/ arch = x86_64 license = custom makedepends = python-html2text - noextract = jdk-17.0.2_doc-all.zip - source = https://download.oracle.com/java/17/archive/jdk-17.0.2_linux-x64_bin.tar.gz - source = https://download.oracle.com/otn_software/java/jdk/17.0.2+8/dfd4a8d0985749f896bed50d7138ee7f/jdk-17.0.2_doc-all.zip - source = java-17-jdk-license.html::https://download.oracle.com/otndocs/jcp/java_se-17-final-spec/license.html + noextract = jdk-18_doc-all.zip + source = https://download.oracle.com/java/18/archive/jdk-18_linux-x64_bin.tar.gz + source = https://download.oracle.com/otn_software/java/jdk/18+36/43f95e8614114aeaa8e8a5fcf20a682d/jdk-18_doc-all.zip + source = jdk-18_doc-license.html::https://download.oracle.com/otndocs/jcp/java_se-18-final-spec/license.html source = java.desktop source = jconsole.desktop source = jshell.desktop source = java_16.png source = java_48.png source = LICENSE - sha256sums = 342e76bb9ded80aa1edd566efbae42f8f1c2366e19b9189e5941b45893b9861f - sha256sums = d25b34eb17053bf23a7a4a82ac2ab7a85b5d53a1109d6561e302761e23f33895 - sha256sums = ab50940bda40a9e8935d1a8f002debda0fdd0b3e2bcc0319827ec19acd8b34f3 - sha256sums = f17fe6e3d1b7ffbe854364e127509144057878a344d74673393782b90b6f054a - sha256sums = 321dc88a1a0289c1f0a3113e75bd2f488829a0b82c11ac047272e464fb3f3ab3 - sha256sums = e7638e42cbe38f32cb7a1ec800c27408e8559f576d8dd7698fdd5856c4c9b842 + sha256sums = d52c868db194c8b474982c83480ab49a4e6f1025ebf4332042b0b5efc334abfe + sha256sums = f832e9233b07a10f5878094142dfab8501e43fafb920e4e6ef772ad3787fb249 + sha256sums = 08deffce836955e426ea1ebc8ea85862fba39bb7a954af9df1752f8f5fac730f + sha256sums = 0275bc0d4620f391d6fafb64ed7d89740b834b8fc810ed82a30a5b0fe7386496 + sha256sums = 95596dcb0f48677def0d60277ae6577748e6e9eb8d4567ba11ae8579c6cf57b7 + sha256sums = b47f1675e8a706ade4e3a1e36d782132b70883dccebe55422489f911a18880e9 sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176 sha256sums = 20becfcac0bdeaa29a76e6966d727f8cc79381354cbd5d530cdec823954df19f @@ -40,12 +40,12 @@ pkgname = jre optdepends = alsa-lib: for basic sound support optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage - provides = java-runtime=17 - provides = java-runtime-jdk17 - provides = jre17-jdk=17.0.2-1 - provides = java-runtime-headless=17 - provides = java-runtime-headless-jdk=17 - provides = jre17-jdk-headless=17.0.2-1 + provides = java-runtime=18 + provides = java-runtime-jdk18 + provides = jre18-jdk=18-1 + provides = java-runtime-headless=18 + provides = java-runtime-headless-jdk=18 + provides = jre18-jdk-headless=18-1 backup = etc/java-jdk/management/jmxremote.access backup = etc/java-jdk/management/jmxremote.password.template backup = etc/java-jdk/management/management.properties @@ -65,12 +65,12 @@ pkgname = jdk pkgdesc = Oracle Java Development Kit install = jdk.install depends = java-environment-common - depends = jre=17.0.2-1 + depends = jre=18-1 depends = zlib depends = hicolor-icon-theme - provides = java-environment=17 - provides = java-environment-jdk=17 - provides = jdk17-jdk=17.0.2-1 + provides = java-environment=18 + provides = java-environment-jdk=18 + provides = jdk18-jdk=18-1 pkgname = jdk-doc pkgdesc = Oracle Java documentation @@ -3,9 +3,9 @@ pkgbase=jdk pkgname=('jre' 'jdk' 'jdk-doc') -pkgver=17.0.2 -_build=8 -_hash=dfd4a8d0985749f896bed50d7138ee7f +pkgver=18 +_build=36 +_hash=43f95e8614114aeaa8e8a5fcf20a682d _majver="${pkgver%%.*}" pkgrel=1 pkgdesc='Oracle Java' @@ -15,7 +15,7 @@ license=('custom') makedepends=('python-html2text') source=("https://download.oracle.com/java/${_majver}/archive/jdk-${pkgver}_linux-x64_bin.tar.gz" "https://download.oracle.com/otn_software/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_doc-all.zip" - "java-${_majver}-jdk-license.html"::"https://download.oracle.com/otndocs/jcp/java_se-${_majver}-final-spec/license.html" + "jdk-${_majver}_doc-license.html"::"https://download.oracle.com/otndocs/jcp/java_se-${_majver}-final-spec/license.html" 'java.desktop' 'jconsole.desktop' 'jshell.desktop' @@ -23,12 +23,12 @@ source=("https://download.oracle.com/java/${_majver}/archive/jdk-${pkgver}_linux 'java_48.png' 'LICENSE') noextract=("jdk-${pkgver}_doc-all.zip") -sha256sums=('342e76bb9ded80aa1edd566efbae42f8f1c2366e19b9189e5941b45893b9861f' - 'd25b34eb17053bf23a7a4a82ac2ab7a85b5d53a1109d6561e302761e23f33895' - 'ab50940bda40a9e8935d1a8f002debda0fdd0b3e2bcc0319827ec19acd8b34f3' - 'f17fe6e3d1b7ffbe854364e127509144057878a344d74673393782b90b6f054a' - '321dc88a1a0289c1f0a3113e75bd2f488829a0b82c11ac047272e464fb3f3ab3' - 'e7638e42cbe38f32cb7a1ec800c27408e8559f576d8dd7698fdd5856c4c9b842' +sha256sums=('d52c868db194c8b474982c83480ab49a4e6f1025ebf4332042b0b5efc334abfe' + 'f832e9233b07a10f5878094142dfab8501e43fafb920e4e6ef772ad3787fb249' + '08deffce836955e426ea1ebc8ea85862fba39bb7a954af9df1752f8f5fac730f' + '0275bc0d4620f391d6fafb64ed7d89740b834b8fc810ed82a30a5b0fe7386496' + '95596dcb0f48677def0d60277ae6577748e6e9eb8d4567ba11ae8579c6cf57b7' + 'b47f1675e8a706ade4e3a1e36d782132b70883dccebe55422489f911a18880e9' 'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed' '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176' '20becfcac0bdeaa29a76e6966d727f8cc79381354cbd5d530cdec823954df19f') @@ -38,7 +38,7 @@ DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicens prepare() { mkdir -p "jdk-doc-${pkgver}" bsdtar -x -f "jdk-${pkgver}_doc-all.zip" -C "jdk-doc-${pkgver}" --strip-components='1' - html2text "java-${_majver}-jdk-license.html" > LICENSE-doc + html2text "jdk-${_majver}_doc-license.html" > LICENSE-doc } package_jre() { diff --git a/java.desktop b/java.desktop index da271be2da78..9362d8181996 100644 --- a/java.desktop +++ b/java.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 17 Runtime -Comment=Oracle Java 17 Runtime +Name=Oracle Java 18 Runtime +Comment=Oracle Java 18 Runtime Keywords=java;runtime -Exec=/usr/lib/jvm/java-17-jdk/bin/java -jar +Exec=/usr/lib/jvm/java-18-jdk/bin/java -jar Terminal=false Type=Application Icon=java-jdk diff --git a/jconsole.desktop b/jconsole.desktop index f73df6a198d4..76f5091f1d8f 100644 --- a/jconsole.desktop +++ b/jconsole.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 17 Console -Comment=Oracle Java 17 Monitoring and Management Console +Name=Oracle Java 18 Console +Comment=Oracle Java 18 Monitoring and Management Console Keywords=java;console;monitoring -Exec=/usr/lib/jvm/java-17-jdk/bin/jconsole +Exec=/usr/lib/jvm/java-18-jdk/bin/jconsole Terminal=false Type=Application Icon=java-jdk diff --git a/jdk.install b/jdk.install index c6e4e47ef7d3..3e4ed76da9f3 100644 --- a/jdk.install +++ b/jdk.install @@ -1,4 +1,4 @@ -THIS_JDK='java-17-jdk' +THIS_JDK='java-18-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 JRE17 is still available + # Check JRE18 is still available if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then /usr/bin/archlinux-java unset fi diff --git a/jre.install b/jre.install index b26706c05018..0f2592c9ef0e 100644 --- a/jre.install +++ b/jre.install @@ -1,4 +1,4 @@ -THIS_JRE='java-17-jdk' +THIS_JRE='java-18-jdk' fix_default() { if [ ! -x /usr/bin/java ]; then diff --git a/jshell.desktop b/jshell.desktop index 818ed8d66d6a..8060e498f74e 100644 --- a/jshell.desktop +++ b/jshell.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Oracle Java 17 Shell -Comment=Oracle Java 17 Shell +Name=Oracle Java 18 Shell +Comment=Oracle Java 18 Shell Keywords=java;shell -Exec=/usr/lib/jvm/java-17-jdk/bin/jshell +Exec=/usr/lib/jvm/java-18-jdk/bin/jshell Terminal=true Type=Application Icon=java-jdk |