Skip to content

Commit

Permalink
upgpkg: java-openjdk-wakefield 21.0.1.0.r230.ge515e80-1
Browse files Browse the repository at this point in the history 
chore: Merge updates from upstream Arch packages

Signed-off-by: txtsd <[email protected]>
  • Loading branch information
@txtsd
txtsd committed Aug 24, 2024
1 parent 1822a2e commit f1f0db7
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 30 deletions.
45 changes: 25 additions & 20 deletions java-openjdk-wakefield/.SRCINFO
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pkgbase = java-openjdk-wakefield
pkgver = 21.0.1.0.r184.ge338a16
pkgrel = 5
url = https://openjdk.java.net/
pkgver = 21.0.1.0.r230.ge515e80
pkgrel = 1
url = https://openjdk.org/projects/wakefield/
arch = x86_64
license = custom
makedepends = java-environment>=17
license = LicenseRef-Java
makedepends = java-environment=21
makedepends = cpio
makedepends = unzip
makedepends = zip
Expand Down Expand Up @@ -32,14 +32,21 @@ pkgbase = java-openjdk-wakefield
makedepends = git
makedepends = jdk21-openjdk
makedepends = wayland
optdepends = gvfs: open links e.g. hyperlinks
source = git+https://github.com/openjdk/wakefield.git#branch=jdk21.0.1-wayland
source = freedesktop-java.desktop
source = freedesktop-jconsole.desktop
source = freedesktop-jshell.desktop
source = install_jdk-openjdk.sh
source = install_jre-openjdk-headless.sh
source = install_jre-openjdk.sh
sha256sums = SKIP
sha256sums = 72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93
sha256sums = 8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07
sha256sums = 50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e
sha256sums = 372ec6c61e53d5f52bd805ef4a7223ea39b6d55b8465ee41aa5b51f29a1394ba
sha256sums = e0815cc98f30d7ec1e9eb53b66794a87837de55cb47b5b0f5b857830937eda3e
sha256sums = 67cf0aed52028c8f2264b3e20c890d97b4c106d63ca23ba8ed262ea8ac638a95

pkgname = jre-openjdk-wakefield-headless
pkgdesc = OpenJDK Java 21 headless wayland runtime environment
Expand All @@ -63,8 +70,8 @@ pkgname = jre-openjdk-wakefield-headless
optdepends = java-rhino: for some JavaScript support
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk-wakefield-headless=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk-headless=21.0.1.0.r230.ge515e80-1
provides = jre21-openjdk-wakefield-headless=21.0.1.0.r230.ge515e80-1
conflicts = jdk-openjdk
conflicts = jre-openjdk
conflicts = jdk-openjdk-wakefield
Expand Down Expand Up @@ -106,15 +113,14 @@ pkgname = jre-openjdk-wakefield
depends = libgif.so
depends = libpng
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=21
provides = java-runtime-openjdk=21
provides = jre21-openjdk=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk=21.0.1.0.r230.ge515e80-1
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk-wakefield=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk-headless=21.0.1.0.r230.ge515e80-1
provides = jre21-openjdk-wakefield=21.0.1.0.r230.ge515e80-1
conflicts = jdk-openjdk
conflicts = jdk-openjdk-wakefield
conflicts = jre-openjdk-headless
Expand Down Expand Up @@ -170,18 +176,17 @@ pkgname = jdk-openjdk-wakefield
depends = libharfbuzz.so
optdepends = java-rhino: for some JavaScript support
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-environment=21
provides = java-environment-openjdk=21
provides = jdk21-openjdk=21.0.1.0.r184.ge338a16-5
provides = jdk21-openjdk=21.0.1.0.r230.ge515e80-1
provides = java-runtime=21
provides = java-runtime-openjdk=21
provides = jre21-openjdk=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk=21.0.1.0.r230.ge515e80-1
provides = java-runtime-headless=21
provides = java-runtime-headless-openjdk=21
provides = jre21-openjdk-headless=21.0.1.0.r184.ge338a16-5
provides = jdk21-openjdk-wakefield=21.0.1.0.r184.ge338a16-5
provides = jre21-openjdk-headless=21.0.1.0.r230.ge515e80-1
provides = jdk21-openjdk-wakefield=21.0.1.0.r230.ge515e80-1
conflicts = jre-openjdk
conflicts = jre-openjdk-wakefield
conflicts = jre-openjdk-headless
Expand All @@ -204,11 +209,11 @@ pkgname = jdk-openjdk-wakefield
pkgname = openjdk-wakefield-src
pkgdesc = OpenJDK Java 21 wayland sources
arch = any
depends = jdk21-openjdk-wakefield=21.0.1.0.r184.ge338a16-5
provides = openjdk21-src=21.0.1.0.r184.ge338a16-5
depends = jdk21-openjdk-wakefield=21.0.1.0.r230.ge515e80-1
provides = openjdk21-src=21.0.1.0.r230.ge515e80-1

pkgname = openjdk-wakefield-doc
pkgdesc = OpenJDK Java 21 wayland documentation
arch = any
depends = jdk21-openjdk-wakefield=21.0.1.0.r184.ge338a16-5
provides = openjdk21-doc=21.0.1.0.r184.ge338a16-5
depends = jdk21-openjdk-wakefield=21.0.1.0.r230.ge515e80-1
provides = openjdk21-doc=21.0.1.0.r230.ge515e80-1
26 changes: 16 additions & 10 deletions java-openjdk-wakefield/PKGBUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,32 @@ _majorver=21
_minorver=0
_securityver=1
_updatever=0
pkgver=21.0.1.0.r184.ge338a16
pkgrel=5
pkgver=21.0.1.0.r230.ge515e80
pkgrel=1
_git_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
arch=('x86_64')
url='https://openjdk.java.net/'
license=('custom')
makedepends=('java-environment>=17' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
url='https://openjdk.org/projects/wakefield/'
license=('LicenseRef-Java')
makedepends=('java-environment=21' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
'graphviz' 'libfreetype.so' 'libjpeg.so' 'libgif.so' 'libpng' 'liblcms2.so'
'libnet' 'bash' 'libharfbuzz.so' 'gcc-libs' 'glibc' 'git' 'jdk21-openjdk'
'wayland')
optdepends=('gvfs: open links e.g. hyperlinks')
source=("git+https://github.com/openjdk/wakefield.git#branch=jdk21.0.1-wayland"
"freedesktop-java.desktop"
"freedesktop-jconsole.desktop"
"freedesktop-jshell.desktop")
"freedesktop-jshell.desktop"
"install_jdk-openjdk.sh"
"install_jre-openjdk-headless.sh"
"install_jre-openjdk.sh")
sha256sums=('SKIP'
'72111743ab6ab36854b0c85a504172983715d0798fce10bc4e35689b7d15fd93'
'8ecdf5c1605bafa58b3f7da615e6d8d3d943e3a2d3831930d6efa7815aacce07'
'50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e')
'50fc0d677489b73d549df2f08d759d5f057f200adbbab83ea5e87456152ee03e'
'372ec6c61e53d5f52bd805ef4a7223ea39b6d55b8465ee41aa5b51f29a1394ba'
'e0815cc98f30d7ec1e9eb53b66794a87837de55cb47b5b0f5b857830937eda3e'
'67cf0aed52028c8f2264b3e20c890d97b4c106d63ca23ba8ed262ea8ac638a95')

case "${CARCH}" in
x86_64) _JARCH='x86_64';;
Expand Down Expand Up @@ -125,13 +132,14 @@ build() {
--with-native-debug-symbols=internal \
--enable-unlimited-crypto \
--disable-warnings-as-errors \
--with-vendor-name="Arch Linux" \
${NUM_PROC_OPT}
#--disable-javac-server

make images legacy-jre-image docs

# https://bugs.openjdk.java.net/browse/JDK-8173610
find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
find "${srcdir}/${_imgdir}" -iname '*.so' -exec chmod +x {} \;
}

check() {
Expand Down Expand Up @@ -202,7 +210,6 @@ package_jre-openjdk-wakefield() {
pkgdesc="OpenJDK Java ${_majorver} full wayland runtime environment"
depends=("${_commondeps[@]}" 'giflib' 'libgif.so' 'libpng')
optdepends=('alsa-lib: for basic sound support'
'gtk2: for the Gtk+ 2 look and feel - desktop usage'
'gtk3: for the Gtk+ 3 look and feel - desktop usage')
provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
"java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}"
Expand Down Expand Up @@ -275,7 +282,6 @@ package_jdk-openjdk-wakefield() {
'libharfbuzz.so')
optdepends=('java-rhino: for some JavaScript support'
'alsa-lib: for basic sound support'
'gtk2: for the Gtk+ 2 look and feel - desktop usage'
'gtk3: for the Gtk+ 3 look and feel - desktop usage')
provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}"
"java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}"
Expand Down

0 comments on commit f1f0db7

Please sign in to comment.