[arch-commits] Commit in netbeans/trunk (PKGBUILD)

[Santiago Torres-Arias]

    Date: Monday, June 8, 2020 @ 23:55:21
  Author: sangy
Revision: 640638

upgpkg: netbeans 12.0-1

Attempt to fix FS#66706

Modified:
  netbeans/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-08 23:38:45 UTC (rev 640637)
+++ PKGBUILD	2020-06-08 23:55:21 UTC (rev 640638)
@@ -4,7 +4,7 @@
 # Contributor: Ben Wolsieffer <benwolsieffer at gmail.com>
 
 pkgname=netbeans
-pkgver=11.3
+pkgver=12.0
 pkgrel=1
 pkgdesc='IDE for Java, HTML5, PHP, Groovy, C and C++'
 arch=('any')
@@ -24,7 +24,7 @@
         "https://www.apache.org/dist/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-source.zip.asc"
        "netbeans.clusters")
 
-sha256sums=('f5cfb1988a64a8c2ce72ee8b1f19f89f5b98943909d3e50a7c4e8cfa0698e88c'
+sha256sums=('32e258a55b3a2f28a90755fc6dc9b8d71994f68af59c834b0738adc3fca736be'
             'SKIP'
             'a7849ee0f21acef34a7bbd1216e8f822aba38284e3138ea04532224ad6f227c2')
 
@@ -46,10 +46,10 @@
 
 # It appears that they have disabled the CI tests upstream, so I'll disable these for now...
 # see the parms here: https://travis-ci.org/apache/incubator-netbeans/jobs/473379270 
-#check() {
-#  cd "${srcdir}"
-#  ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild
-#}
+# check() {
+#   cd "${srcdir}"
+#   ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild
+# }
 
 package() {
   depends+=('java-environment>=9')
@@ -83,17 +83,19 @@
   sed -i "s/Icon=.*/Icon=netbeans/" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -Dm644 "${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
-  rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/solaris-"*
-  rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/hpux-"*
-  rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/linux-arm"*
-  rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk15/hpux-"*
-  rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk15/solaris-"*
-  find "${pkgdir}/usr/lib/${pkgname}/" -name "*.exe" -exec rm {} \;
-  find "${pkgdir}/usr/lib/${pkgname}/" -name "*.dll" -exec rm {} \;
+  # I'm leaving these as they seem to be necessary for building native
+  # executables (see bug #66706). I'd like to ideally build them with our 
+  # CFLAGS, but alas...
+  # 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
+  # rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/solaris-"*
+  # rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/hpux-"*
+  # rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk16/linux-arm"*
+  # rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk15/hpux-"*
+  # rm -rf "${pkgdir}/usr/lib/${pkgname}/profiler/lib/deployed/jdk15/solaris-"*
+  # find "${pkgdir}/usr/lib/${pkgname}/" -name "*.exe" -exec rm {} \;
+  # find "${pkgdir}/usr/lib/${pkgname}/" -name "*.dll" -exec rm {} \;
 
 }