diff --git a/java17-openjdk/PKGBUILD b/java17-openjdk/PKGBUILD index 65e8bb3..800f09b 100644 --- a/java17-openjdk/PKGBUILD +++ b/java17-openjdk/PKGBUILD @@ -4,7 +4,7 @@ # TODO add test, see about packaging jtreg and using it here pkgbase=java17-openjdk -pkgname=('jre17-openjdk-headless' 'jre17-openjdk' 'jdk17-openjdk' 'openjdk17-src' 'openjdk17-doc') +pkgname=('jre17-openjdk-headless' 'jre17-openjdk' 'jdk17-openjdk' 'openjdk17-src') _majorver=17 _minorver=0 _securityver=0 @@ -16,8 +16,8 @@ arch=('x86_64') url='https://openjdk.java.net/' license=('custom') makedepends=('java-environment=16' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11' - 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc' - 'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' + 'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' + 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2' 'fontconfig' 'libnet' 'bash' 'harfbuzz' 'gcc-libs' 'glibc') source=(https://github.com/openjdk/jdk${_majorver}u/archive/${_git_tag}.tar.gz freedesktop-java.desktop @@ -94,7 +94,7 @@ build() { ${NUM_PROC_OPT} #--disable-javac-server - make images legacy-jre-image docs + make images legacy-jre-image # https://bugs.openjdk.java.net/browse/JDK-8173610 find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \; @@ -260,17 +260,4 @@ package_openjdk17-src() { ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" } -package_openjdk17-doc() { - pkgdesc="OpenJDK Java ${_majorver} documentation" - # Depends on JDK to get license files - depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}") - provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}") - - install -dm 755 "${pkgdir}/usr/share/doc" - cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}" - - install -dm 755 "${pkgdir}/usr/share/licenses" - ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" -} - # vim: ts=2 sw=2 et: