Date: Tuesday, October 23, 2018 @ 04:12:47 Author: sangy Revision: 398642
upgpkg: netbeans 9.0-3 Modified: netbeans/trunk/PKGBUILD ----------+ PKGBUILD | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-23 03:43:25 UTC (rev 398641) +++ PKGBUILD 2018-10-23 04:12:47 UTC (rev 398642) @@ -1,4 +1,4 @@ -# Maintainer: +# Maintainer: Santiago Torres-Arias <santi...@archlinux.org> # Contributor: Timm Preetz <t...@preetz.us> # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> # Contributor: Ben Wolsieffer <benwolsief...@gmail.com> @@ -5,14 +5,14 @@ pkgname=netbeans pkgver=9.0 -pkgrel=2 +pkgrel=3 pkgdesc='IDE for Java, HTML5, PHP, Groovy, C and C++' arch=('any') url='http://netbeans.apache.org/' license=('Apache2') # classpath is not needed, see FS#38567 (Oracle JDK does not need atk either) -depends=('java-environment' 'ttf-font' 'jdk10-openjdk') -makedepends=('ant' 'java-environment' 'jdk8-openjdk') +depends=('ttf-font') +makedepends=('ant' 'java-environment=8') optdepends=('php: for developing programs in php' 'groovy: for developing programs in groovy' 'lib32-glibc') @@ -27,8 +27,8 @@ build() { # full cluster configuration is not available at this time #ant -quiet -Dcluster.config=full - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk/ - ant -quiet -Dnbjdk.home=/usr/lib/jvm/java-8-openjdk -Djava.home=/usr/lib/jvm/java-8-openjdk + export LDFLAGS_EXTRA=$LDFLAGS CFLAGS_EXTRA=$CFLAGS + ant -quiet } check() { @@ -37,13 +37,14 @@ } package() { + depends+=('java-environment>=9') - # load script - install -Dm755 "nbbuild/${pkgname}/bin/${pkgname}" "$pkgdir/usr/bin/$pkgname" + # install launcher script + install -Dm755 "nbbuild/${pkgname}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" # Resources for platform config - mkdir -vp "${pkgdir}/usr/lib/${pkgname}" - cp -r "nbbuild/${pkgname}/"{java,harness,javafx,profiler,nb,ide,extide,apisupport,websvccommon,platform} "$pkgdir/usr/lib/${pkgname}" + mkdir -p "${pkgdir}/usr/lib/${pkgname}" + cp -r "nbbuild/${pkgname}/"{java,harness,javafx,profiler,nb,ide,extide,apisupport,websvccommon,platform} "${pkgdir}/usr/lib/${pkgname}" # copy cluster configuration install -Dm644 "${srcdir}/nbbuild/netbeans/etc/netbeans."* -t "${pkgdir}/usr/lib/${pkgname}/etc/" @@ -51,11 +52,16 @@ # Desktop shortcut and icon install -Dm644 "nbbuild/packaging/snap/gui/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + "${pkgdir}/usr/share/applications/${pkgname}.desktop" sed -i "s/Icon=.*/Icon=\/usr\/share\/pixmaps\/${pkgname}.png/" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 "ide.branding/release/${pkgname}.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "ide.branding/release/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + # remove non-linux non x86_64 binaries (FIXME: ideally we should just *not* build these) + rm -rf "${pkgdir}/usr/lib/${pkgname}/ide/bin/nativeexecution/SunOS*" + rm -rf "${pkgdir}/usr/lib/${pkgname}/ide/bin/nativeexecution/MacOSX*" + rm -rf "${pkgdir}/usr/lib/${pkgname}/ide/bin/nativeexecution/Windows*" + rm -rf "${pkgdir}/usr/lib/${pkgname}/ide/bin/nativeexecution/*-sparc_64" + find "${pkgdir}/usr/lib/${pkgname}/" -name "*.exe" -exec rm {} \; + find "${pkgdir}/usr/lib/${pkgname}/" -name "*.dll" -exec rm {} \; + } - -# getver: netbeans.org -# vim:set ts=2 sw=2 et: