Skip to content

Commit f59d680

Browse files
jonathonfjonathonf
committed
Upstream 16+36. Switch to .desktop templates.
1 parent acac1d2 commit f59d680

File tree

5 files changed

+69
-62
lines changed

5 files changed

+69
-62
lines changed

‎.SRCINFO

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = liberica-jdk-full-bin
22
pkgdesc = BellSoft builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads. Full version includes OpenJFX.
3-
pkgver = 15.0.2+10
3+
pkgver = 16.0.0+36
44
pkgrel = 1
55
url = https://bell-sw.com/
66
install = liberica-jdk-full.install
@@ -17,17 +17,17 @@ pkgbase = liberica-jdk-full-bin
1717
optdepends = gtk2
1818
optdepends = gtk3
1919
optdepends = libnet
20-
provides = java-environment=15
21-
provides = java-environment-openjdk=15
22-
provides = java-openjfx=15
23-
provides = java-runtime-headless=15
24-
provides = java-runtime-headless-openjdk=15
25-
provides = java-runtime=15
26-
provides = java-runtime-openjdk=15
27-
provides = liberica-jdk-bin=15.0.2+10
28-
provides = liberica-jdk-lite-bin=15.0.2+10
29-
provides = liberica-jre-bin=15.0.2+10
30-
provides = liberica-jre-full-bin=15.0.2+10
20+
provides = java-environment=16
21+
provides = java-environment-openjdk=16
22+
provides = java-openjfx=16
23+
provides = java-runtime-headless=16
24+
provides = java-runtime-headless-openjdk=16
25+
provides = java-runtime=16
26+
provides = java-runtime-openjdk=16
27+
provides = liberica-jdk-bin=16.0.0+36
28+
provides = liberica-jdk-lite-bin=16.0.0+36
29+
provides = liberica-jre-bin=16.0.0+36
30+
provides = liberica-jre-full-bin=16.0.0+36
3131
backup = etc/liberica-jdk-full/logging.properties
3232
backup = etc/liberica-jdk-full/management/jmxremote.access
3333
backup = etc/liberica-jdk-full/management/jmxremote.password.template
@@ -42,28 +42,28 @@ pkgbase = liberica-jdk-full-bin
4242
backup = etc/liberica-jdk-full/security/policy/unlimited/default_US_export.policy
4343
backup = etc/liberica-jdk-full/security/policy/unlimited/default_local.policy
4444
backup = etc/liberica-jdk-full/sound.properties
45-
source = freedesktop-java.desktop
46-
source = freedesktop-jconsole.desktop
47-
source = freedesktop-jshell.desktop
48-
source = liberica-jdk-full16.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
49-
source = liberica-jdk-full24.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
50-
source = liberica-jdk-full32.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
51-
source = liberica-jdk-full48.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png
52-
sha1sums = 73b9ab762976cb9c2bfcecdbd6334b4c727b0876
53-
sha1sums = 96890ae2efed2f4244036bc59d018c2707fa9749
54-
sha1sums = dbcbe1243717288176b17e203982f41d32c4a419
45+
source = freedesktop-java.desktop.in
46+
source = freedesktop-jconsole.desktop.in
47+
source = freedesktop-jshell.desktop.in
48+
source = liberica-jdk-full16.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
49+
source = liberica-jdk-full24.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
50+
source = liberica-jdk-full32.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
51+
source = liberica-jdk-full48.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png
52+
sha1sums = 59dce69f1e9b5440394dbc67a9384af617a48785
53+
sha1sums = 96ced62ddefc481ae2636bc59bf701763bbbbf5c
54+
sha1sums = 512c5fcfa72e8a43523f84183b8779851d3d1341
5555
sha1sums = 36096a57cebd346e08efc68326fe77960d43726f
5656
sha1sums = b8233f9ff931ce97a265827fac18ed90f4e248c6
5757
sha1sums = a0da2952bc87a425182c3ac88e88649fbaa7cb65
5858
sha1sums = eb36aa73a9be98164447774217865b91e79d503c
59-
source_aarch64 = https://download.bell-sw.com/java/15.0.2+10/bellsoft-jdk15.0.2+10-linux-aarch64-full.tar.gz
60-
sha1sums_aarch64 = 801f4008f3bd09d4d2a0ebd5000cf66d8dbfc1ad
61-
source_armv7h = https://download.bell-sw.com/java/15.0.2+10/bellsoft-jdk15.0.2+10-linux-arm32-vfp-hflt-full.tar.gz
62-
sha1sums_armv7h = f1b47f3a058b6bad00cfc4307778f3e8eff4c9d0
63-
source_armv8h = https://download.bell-sw.com/java/15.0.2+10/bellsoft-jdk15.0.2+10-linux-arm32-vfp-hflt-full.tar.gz
64-
sha1sums_armv8h = f1b47f3a058b6bad00cfc4307778f3e8eff4c9d0
65-
source_x86_64 = https://download.bell-sw.com/java/15.0.2+10/bellsoft-jdk15.0.2+10-linux-amd64-full.tar.gz
66-
sha1sums_x86_64 = ede6c0d3a1ee630e162099475be5102c9fee5555
59+
source_aarch64 = https://download.bell-sw.com/java/16+36/bellsoft-jdk16+36-linux-aarch64-full.tar.gz
60+
sha1sums_aarch64 = d0d567f6f25775ae222ebb71e198d6ea36fbd99c
61+
source_armv7h = https://download.bell-sw.com/java/16+36/bellsoft-jdk16+36-linux-arm32-vfp-hflt-full.tar.gz
62+
sha1sums_armv7h = b8104ab8e96f414472e32c50666989d0b1f9cb70
63+
source_armv8h = https://download.bell-sw.com/java/16+36/bellsoft-jdk16+36-linux-arm32-vfp-hflt-full.tar.gz
64+
sha1sums_armv8h = b8104ab8e96f414472e32c50666989d0b1f9cb70
65+
source_x86_64 = https://download.bell-sw.com/java/16+36/bellsoft-jdk16+36-linux-amd64-full.tar.gz
66+
sha1sums_x86_64 = 758ba613d60fab9c62d267b9df11b4ab28457e86
6767

6868
pkgname = liberica-jdk-full-bin
6969

‎PKGBUILD

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
_jdkname=liberica-jdk-full
99
pkgname="${_jdkname}-bin"
10-
_java_ver=15.0.2
11-
pkgver=${_java_ver}+10
10+
_java_ver=16
11+
_java_rel=36
12+
pkgver=${_java_ver}.0.0+${_java_rel}
1213
pkgrel=1
1314
pkgdesc='BellSoft builds of OpenJDK are fully certified and 100% open source Java Development Kits (JDKs) for all Java development and production workloads. Full version includes OpenJFX.'
1415
arch=(aarch64 armv7h armv8h x86_64)
@@ -17,13 +18,13 @@ license=('custom')
1718
depends=('java-environment-common=3' 'java-runtime-common>=3' 'ca-certificates-utils')
1819
optdepends=(ffmpeg freetype2 gtk2 gtk3 libnet)
1920
provides=(
20-
"java-environment=${_java_ver/.*}"
21-
"java-environment-openjdk=${_java_ver/.*}"
22-
"java-openjfx=${_java_ver/.*}"
23-
"java-runtime-headless=${_java_ver/.*}"
24-
"java-runtime-headless-openjdk=${_java_ver/.*}"
25-
"java-runtime=${_java_ver/.*}"
26-
"java-runtime-openjdk=${_java_ver/.*}"
21+
"java-environment=${pkgver/.*}"
22+
"java-environment-openjdk=${pkgver/.*}"
23+
"java-openjfx=${pkgver/.*}"
24+
"java-runtime-headless=${pkgver/.*}"
25+
"java-runtime-headless-openjdk=${pkgver/.*}"
26+
"java-runtime=${pkgver/.*}"
27+
"java-runtime-openjdk=${pkgver/.*}"
2728
"liberica-jdk-bin=$pkgver"
2829
"liberica-jdk-lite-bin=$pkgver"
2930
"liberica-jre-bin=$pkgver"
@@ -46,36 +47,42 @@ backup=(etc/${_jdkname}/logging.properties
4647
etc/${_jdkname}/security/policy/unlimited/default_local.policy
4748
etc/${_jdkname}/sound.properties)
4849

49-
source=(freedesktop-java.desktop
50-
freedesktop-jconsole.desktop
51-
freedesktop-jshell.desktop
52-
${_jdkname}16.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
53-
${_jdkname}24.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
54-
${_jdkname}32.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
55-
${_jdkname}48.png::https://hg.openjdk.java.net/jdk-updates/jdk15u/raw-file/c346ef23c8a6/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png)
56-
sha1sums=(73b9ab762976cb9c2bfcecdbd6334b4c727b0876
57-
96890ae2efed2f4244036bc59d018c2707fa9749
58-
dbcbe1243717288176b17e203982f41d32c4a419
50+
source=(freedesktop-java.desktop.in
51+
freedesktop-jconsole.desktop.in
52+
freedesktop-jshell.desktop.in
53+
${_jdkname}16.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon16.png
54+
${_jdkname}24.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon24.png
55+
${_jdkname}32.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon32.png
56+
${_jdkname}48.png::https://hg.openjdk.java.net/jdk/jdk/raw-file/ee1d592a9f53/src/java.desktop/unix/classes/sun/awt/X11/java-icon48.png)
57+
sha1sums=(59dce69f1e9b5440394dbc67a9384af617a48785
58+
96ced62ddefc481ae2636bc59bf701763bbbbf5c
59+
512c5fcfa72e8a43523f84183b8779851d3d1341
5960
36096a57cebd346e08efc68326fe77960d43726f
6061
b8233f9ff931ce97a265827fac18ed90f4e248c6
6162
a0da2952bc87a425182c3ac88e88649fbaa7cb65
6263
eb36aa73a9be98164447774217865b91e79d503c)
6364

64-
source_aarch64=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-aarch64-full.tar.gz)
65-
source_armv7h=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-arm32-vfp-hflt-full.tar.gz)
65+
source_aarch64=(https://download.bell-sw.com/java/$_java_ver+$_java_rel/bellsoft-jdk$_java_ver+$_java_rel-linux-aarch64-full.tar.gz)
66+
source_armv7h=(https://download.bell-sw.com/java/$_java_ver+$_java_rel/bellsoft-jdk$_java_ver+$_java_rel-linux-arm32-vfp-hflt-full.tar.gz)
6667
source_armv8h=(${source_armv7h[@]})
67-
source_x86_64=(https://download.bell-sw.com/java/$pkgver/bellsoft-jdk$pkgver-linux-amd64-full.tar.gz)
68+
source_x86_64=(https://download.bell-sw.com/java/$_java_ver+$_java_rel/bellsoft-jdk$_java_ver+$_java_rel-linux-amd64-full.tar.gz)
6869

6970
# Upstream-provided
70-
sha1sums_aarch64=('801f4008f3bd09d4d2a0ebd5000cf66d8dbfc1ad')
71-
sha1sums_armv7h=('f1b47f3a058b6bad00cfc4307778f3e8eff4c9d0')
71+
sha1sums_aarch64=('d0d567f6f25775ae222ebb71e198d6ea36fbd99c')
72+
sha1sums_armv7h=('b8104ab8e96f414472e32c50666989d0b1f9cb70')
7273
sha1sums_armv8h=(${sha1sums_armv7h[@]})
73-
sha1sums_x86_64=('ede6c0d3a1ee630e162099475be5102c9fee5555')
74+
sha1sums_x86_64=('758ba613d60fab9c62d267b9df11b4ab28457e86')
7475

7576
_jvmdir="/usr/lib/jvm/${_jdkname}"
7677

78+
prepare() {
79+
for f in *.desktop.in; do
80+
sed "s|@@VER@@|${pkgver/.*}|g" $f >> ${f/.in}
81+
done
82+
}
83+
7784
package() {
78-
cd jdk-$_java_ver-full
85+
cd jdk-${pkgver/.*}-full
7986

8087
install -dm 755 "${pkgdir}/${_jvmdir}"
8188
cp -a . "${pkgdir}/${_jvmdir}/"

‎freedesktop-java.desktop renamed to ‎freedesktop-java.desktop.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
2-
Name=OpenJDK Java 15 Runtime
3-
Comment=OpenJDK Java 15 Runtime
2+
Name=OpenJDK Java @@VER@@ Runtime
3+
Comment=OpenJDK Java @@VER@@ Runtime
44
Keywords=java;runtime
55
Exec=/usr/lib/jvm/liberica-jdk-full/bin/java -jar
66
Terminal=false

‎freedesktop-jconsole.desktop renamed to ‎freedesktop-jconsole.desktop.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
2-
Name=OpenJDK Java 15 Console
3-
Comment=OpenJDK Java 15 Monitoring & Management Console
2+
Name=OpenJDK Java @@VER@@ Console
3+
Comment=OpenJDK Java @@VER@@ Monitoring & Management Console
44
Keywords=java;console;monitoring
55
Exec=/usr/lib/jvm/liberica-jdk-full/bin/jconsole
66
Terminal=false

‎freedesktop-jshell.desktop renamed to ‎freedesktop-jshell.desktop.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
2-
Name=OpenJDK Java 15 Shell
3-
Comment=OpenJDK Java 15 Shell
2+
Name=OpenJDK Java @@VER@@ Shell
3+
Comment=OpenJDK Java @@VER@@ Shell
44
Keywords=java;shell
55
Exec=/usr/lib/jvm/liberica-jdk-full/bin/jshell
66
Terminal=true

0 commit comments

Comments
 (0)