Skip to content

Commit 8074373

Browse files
noahvogtnoahvogt
committed
uppkg -> 21.u35-2
1 parent 4112be4 commit 8074373

File tree

2 files changed

+141
-65
lines changed

2 files changed

+141
-65
lines changed

‎.SRCINFO‎

Lines changed: 72 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = java-openjdk-xdg
2-
pkgver = 20.0.2.u9
3-
pkgrel = 1
2+
pkgver = 21.u35
3+
pkgrel = 2
44
url = https://openjdk.java.net/
55
arch = x86_64
66
license = custom
@@ -40,21 +40,21 @@ pkgbase = java-openjdk-xdg
4040
conflicts = openjdk-src
4141
conflicts = openjdk-doc
4242
options = !lto
43-
source = https://github.com/openjdk/jdk20u/archive/jdk-20.0.2+9.tar.gz
43+
source = https://github.com/openjdk/jdk21u/archive/jdk-21+35.tar.gz
4444
source = freedesktop-java.desktop
4545
source = freedesktop-jconsole.desktop
4646
source = freedesktop-jshell.desktop
4747
source = xdg-basedir-compliant-fontconfig.patch
4848
source = xdg-basedir-compliant-userPrefs.patch
49-
sha256sums = 4d6f176075d5f2ce62fd16ebd5cc4c27a3e551ce4d3d3bc0e9946454e52fc88d
50-
sha256sums = 761d4f1274c7dfb4ff61f6d6cb01504f2f886240229e371647ce227fcf81278e
51-
sha256sums = 2b17178ac414e1d0768c8f482779efa88bfeab17b8b0517df4e66b3c2874131c
52-
sha256sums = 82329d23887df14bce3f8d8f356fe8f4b643831d40ade5fed31a070516f86fd7
49+
sha256sums = b798ebc2e899a98edf2be99e786bb0fbad144e2270925dffe624fbe052f07ade
50+
sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93
51+
sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07
52+
sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e
5353
sha256sums = 25860396475759236e0edf66711b842143b0ddee47eed61e080da158bbc58ce9
5454
sha256sums = 48f9e40c4ae8eb79d17fb676893a89b95ac43616827725a9d10de2b1f357642c
5555

5656
pkgname = jre-openjdk-headless-xdg
57-
pkgdesc = OpenJDK Java 20 headless runtime environment - with improved Support for the XDG Base Directory Specification
57+
pkgdesc = OpenJDK Java 21 headless runtime environment - with improved Support for the XDG Base Directory Specification
5858
install = install_jre-openjdk-headless.sh
5959
depends = java-runtime-common>=3
6060
depends = ca-certificates-utils
@@ -71,9 +71,9 @@ pkgname = jre-openjdk-headless-xdg
7171
depends = glibc
7272
depends = gcc-libs
7373
optdepends = java-rhino: for some JavaScript support
74-
provides = java-runtime-headless=20
75-
provides = java-runtime-headless-openjdk=20
76-
provides = jre20-openjdk-headless=20.0.2.u9-1
74+
provides = java-runtime-headless=21
75+
provides = java-runtime-headless-openjdk=21
76+
provides = jre21-openjdk-headless=21.u35-2
7777
backup = etc/java-openjdk-xdg/logging.properties
7878
backup = etc/java-openjdk-xdg/management/jmxremote.access
7979
backup = etc/java-openjdk-xdg/management/jmxremote.password.template
@@ -90,9 +90,9 @@ pkgname = jre-openjdk-headless-xdg
9090
backup = etc/java-openjdk-xdg/sound.properties
9191

9292
pkgname = jre-openjdk-xdg
93-
pkgdesc = OpenJDK Java 20 full runtime environment - with improved Support for the XDG Base Directory Specification
93+
pkgdesc = OpenJDK Java 21 full runtime environment - with improved Support for the XDG Base Directory Specification
9494
install = install_jre-openjdk.sh
95-
depends = jre20-openjdk-headless=20.0.2.u9-1
95+
depends = jre21-openjdk-headless=21.u35-2
9696
depends = giflib
9797
depends = libgif.so
9898
depends = glibc
@@ -101,29 +101,74 @@ pkgname = jre-openjdk-xdg
101101
optdepends = alsa-lib: for basic sound support
102102
optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
103103
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
104-
provides = java-runtime=20
105-
provides = java-runtime-openjdk=20
106-
provides = jre20-openjdk=20.0.2.u9-1
104+
provides = java-runtime=21
105+
provides = java-runtime-openjdk=21
106+
provides = jre21-openjdk=21.u35-2
107107

108108
pkgname = jdk-openjdk-xdg
109-
pkgdesc = OpenJDK Java 20 development kit - with improved Support for the XDG Base Directory Specification
109+
pkgdesc = OpenJDK Java 21 development kit - with improved Support for the XDG Base Directory Specification
110110
install = install_jdk-openjdk.sh
111-
depends = jre20-openjdk=20.0.2.u9-1
111+
depends = jre21-openjdk=21.u35-2
112112
depends = java-environment-common=3
113113
depends = hicolor-icon-theme
114114
depends = libelf
115115
depends = glibc
116116
depends = gcc-libs
117-
provides = java-environment=20
118-
provides = java-environment-openjdk=20
119-
provides = jdk20-openjdk=20.0.2.u9-1
117+
depends = libgif.so
118+
depends = libpng
119+
depends = ca-certificates-utils
120+
depends = nss
121+
depends = libjpeg-turbo
122+
depends = libjpeg.so
123+
depends = lcms2
124+
depends = liblcms2.so
125+
depends = libnet
126+
depends = freetype2
127+
depends = libfreetype.so
128+
depends = harfbuzz
129+
depends = libharfbuzz.so
130+
optdepends = java-rhino: for some JavaScript support
131+
optdepends = alsa-lib: for basic sound support
132+
optdepends = gtk2: for the Gtk+ 2 look and feel - desktop usage
133+
optdepends = gtk3: for the Gtk+ 3 look and feel - desktop usage
134+
provides = java-environment=21
135+
provides = java-environment-openjdk=21
136+
provides = jdk21-openjdk=21.u35-2
137+
provides = java-runtime=21
138+
provides = java-runtime-openjdk=21
139+
provides = jre21-openjdk=21.u35-2
140+
provides = java-runtime-headless=21
141+
provides = java-runtime-headless-openjdk=21
142+
provides = jre21-openjdk-headless=21.u35-2
143+
conflicts = jre-openjdk
144+
conflicts = jre-openjdk-headless
145+
conflicts = java-runtime=21
146+
conflicts = java-runtime-openjdk=21
147+
conflicts = jre21-openjdk=21.u35-2
148+
conflicts = java-runtime-headless=21
149+
conflicts = java-runtime-headless-openjdk=21
150+
conflicts = jre21-openjdk-headless=21.u35-2
151+
backup = etc/java-openjdk-xdg/logging.properties
152+
backup = etc/java-openjdk-xdg/management/jmxremote.access
153+
backup = etc/java-openjdk-xdg/management/jmxremote.password.template
154+
backup = etc/java-openjdk-xdg/management/management.properties
155+
backup = etc/java-openjdk-xdg/net.properties
156+
backup = etc/java-openjdk-xdg/security/java.policy
157+
backup = etc/java-openjdk-xdg/security/java.security
158+
backup = etc/java-openjdk-xdg/security/policy/README.txt
159+
backup = etc/java-openjdk-xdg/security/policy/limited/default_US_export.policy
160+
backup = etc/java-openjdk-xdg/security/policy/limited/default_local.policy
161+
backup = etc/java-openjdk-xdg/security/policy/limited/exempt_local.policy
162+
backup = etc/java-openjdk-xdg/security/policy/unlimited/default_US_export.policy
163+
backup = etc/java-openjdk-xdg/security/policy/unlimited/default_local.policy
164+
backup = etc/java-openjdk-xdg/sound.properties
120165

121166
pkgname = openjdk-src-xdg
122-
pkgdesc = OpenJDK Java 20 sources - with improved Support for the XDG Base Directory Specification
123-
depends = jdk20-openjdk=20.0.2.u9-1
124-
provides = openjdk20-src=20.0.2.u9-1
167+
pkgdesc = OpenJDK Java 21 sources - with improved Support for the XDG Base Directory Specification
168+
depends = jdk21-openjdk=21.u35-2
169+
provides = openjdk21-src=21.u35-2
125170

126171
pkgname = openjdk-doc-xdg
127-
pkgdesc = OpenJDK Java 20 documentation - with improved Support for the XDG Base Directory Specification
128-
depends = jdk20-openjdk=20.0.2.u9-1
129-
provides = openjdk20-doc=20.0.2.u9-1
172+
pkgdesc = OpenJDK Java 21 documentation - with improved Support for the XDG Base Directory Specification
173+
depends = jdk21-openjdk=21.u35-2
174+
provides = openjdk21-doc=21.u35-2

‎PKGBUILD‎

Lines changed: 69 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _securityver=0
1212
_updatever=35
1313
# pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
1414
pkgver=${_majorver}.u${_updatever}
15-
pkgrel=1
15+
pkgrel=2
1616
# _git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
1717
_git_tag=jdk-${_majorver}+${_updatever}
1818
arch=('x86_64')
@@ -52,12 +52,6 @@ _nonheadless=(lib/libawt_xawt.so
5252
lib/libjsound.so
5353
lib/libsplashscreen.so)
5454

55-
_nonjre=(lib/ct.sym
56-
lib/libattach.so
57-
lib/libsaproc.so
58-
lib/lible.so
59-
lib/src.zip)
60-
6155
prepare() {
6256
cd ${_jdkdir}
6357
patch -p1 -i ../xdg-basedir-compliant-fontconfig.patch
@@ -162,25 +156,15 @@ package_jre-openjdk-headless-xdg() {
162156

163157
cd ${_imgdir}/jre
164158

165-
install -dm 755 "${pkgdir}${_jvmdir}"/bin
166-
167-
for i in $(ls bin/); do
168-
cp ../jdk/bin/$i "${pkgdir}${_jvmdir}/bin/"
169-
done
170-
171-
cp -a ../jdk/lib "${pkgdir}${_jvmdir}"
159+
install -dm 755 "${pkgdir}${_jvmdir}"
172160

173-
for f in "${_nonjre[@]}"; do
174-
rm "${pkgdir}${_jvmdir}/${f}"
175-
done
161+
cp -a bin lib \
162+
"${pkgdir}${_jvmdir}"
176163

177164
for f in "${_nonheadless[@]}"; do
178165
rm "${pkgdir}${_jvmdir}/${f}"
179166
done
180167

181-
cp ../jdk/release "${pkgdir}${_jvmdir}"
182-
cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
183-
184168
# Conf
185169
install -dm 755 "${pkgdir}/etc"
186170
cp -r conf "${pkgdir}/etc/${pkgbase}"
@@ -219,20 +203,70 @@ package_jre-openjdk-xdg() {
219203

220204
install -dm 755 "${pkgdir}${_jvmdir}"
221205

206+
cp -a bin lib \
207+
"${pkgdir}${_jvmdir}"
208+
209+
222210
for f in "${_nonheadless[@]}"; do
223211
install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
224212
done
225213

226-
# Licenses
214+
# Conf
215+
install -dm 755 "${pkgdir}/etc"
216+
cp -r conf "${pkgdir}/etc/${pkgbase}"
217+
ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
218+
219+
# Legal
227220
install -dm 755 "${pkgdir}/usr/share/licenses"
221+
cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
228222
ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
223+
ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
224+
225+
# Man pages
226+
for f in bin/*; do
227+
f=$(basename "${f}")
228+
_man=../jdk/man/man1/"${f}.1"
229+
test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
230+
done
231+
ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
232+
233+
# Link JKS keystore from ca-certificates-utils
234+
rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
235+
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
229236
}
230237

231238
package_jdk-openjdk-xdg() {
232239
pkgdesc="OpenJDK Java ${_majorver} development kit - with improved Support for the XDG Base Directory Specification"
233240
depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3'
234-
'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs')
235-
provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
241+
'hicolor-icon-theme' 'libelf' 'glibc' 'gcc-libs' 'libgif.so' 'libpng'
242+
'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'libjpeg.so'
243+
'lcms2' 'liblcms2.so' 'libnet' 'freetype2' 'libfreetype.so' 'harfbuzz'
244+
'libharfbuzz.so')
245+
optdepends=('java-rhino: for some JavaScript support'
246+
'alsa-lib: for basic sound support'
247+
'gtk2: for the Gtk+ 2 look and feel - desktop usage'
248+
'gtk3: for the Gtk+ 3 look and feel - desktop usage')
249+
provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}"
250+
"java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
251+
"java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
252+
conflicts=("jre-openjdk" "jre-openjdk-headless"
253+
"java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
254+
"java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
255+
backup=(etc/${pkgbase}/logging.properties
256+
etc/${pkgbase}/management/jmxremote.access
257+
etc/${pkgbase}/management/jmxremote.password.template
258+
etc/${pkgbase}/management/management.properties
259+
etc/${pkgbase}/net.properties
260+
etc/${pkgbase}/security/java.policy
261+
etc/${pkgbase}/security/java.security
262+
etc/${pkgbase}/security/policy/README.txt
263+
etc/${pkgbase}/security/policy/limited/default_US_export.policy
264+
etc/${pkgbase}/security/policy/limited/default_local.policy
265+
etc/${pkgbase}/security/policy/limited/exempt_local.policy
266+
etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
267+
etc/${pkgbase}/security/policy/unlimited/default_local.policy
268+
etc/${pkgbase}/sound.properties)
269+
236270
install=install_jdk-openjdk.sh
237271

238272
cd ${_imgdir}/jdk
@@ -244,33 +278,30 @@ package_jdk-openjdk-xdg() {
244278

245279
rm "${pkgdir}${_jvmdir}/lib/src.zip"
246280

247-
# Remove files held by JRE
248-
pushd ../jre
249-
for d in bin lib; do
250-
find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
251-
done
252-
popd
253-
find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
254-
255-
# Conf files all belong to JRE
281+
# Conf
282+
install -dm 755 "${pkgdir}/etc"
283+
cp -r conf "${pkgdir}/etc/${pkgbase}"
284+
ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
256285

257286
# Legal
258287
install -dm 755 "${pkgdir}/usr/share/licenses"
259288
cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
260-
pushd ../jre/legal
261-
find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
262-
popd
263-
find "${pkgdir}/usr/share/licenses" -type d -empty -delete
264289
ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
290+
ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
265291

266292
# Man pages
267293
for f in bin/*; do
268294
f=$(basename "${f}")
269-
_man=man/man1/"${f}.1"
270-
test -f "../jre/bin/${f}" && continue
295+
_man=../jdk/man/man1/"${f}.1"
271296
test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
272297
done
273298

299+
ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
300+
301+
# Link JKS keystore from ca-certificates-utils
302+
rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
303+
ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
304+
274305
# Icons
275306
for s in 16 24 32 48; do
276307
install -Dm 644 \

0 commit comments

Comments
 (0)