[arch-commits] Commit in java11-openjfx/trunk (PKGBUILD java11-openjfx-flags.patch)

[Antonio Rojas]

    Date: Wednesday, December 8, 2021 @ 10:47:43
  Author: arojas
Revision: 430808

Update to 11.0.14.u2, use system gradle

Modified:
  java11-openjfx/trunk/PKGBUILD
  java11-openjfx/trunk/java11-openjfx-flags.patch

----------------------------+
 PKGBUILD                   |   23 +++++++++++------------
 java11-openjfx-flags.patch |    4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-08 10:46:56 UTC (rev 430807)
+++ PKGBUILD	2021-12-08 10:47:43 UTC (rev 430808)
@@ -13,7 +13,7 @@
   java11-openjfx-doc
   java11-openjfx-src
 )
-pkgver=11.0.10.u1
+pkgver=11.0.14.u2
 pkgrel=1
 pkgdesc='Java OpenJFX 11 client application platform (open-source implementation of JavaFX)'
 arch=(x86_64)
@@ -29,6 +29,7 @@
   gdk-pixbuf2
   glib2
   gperf
+  gradle
   gtk2
   gtk3
   java-environment-openjdk=11
@@ -43,22 +44,20 @@
   zip
 )
 source=(
-  https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/${pkgver//.u/+}.tar.bz2
+  $pkgname-$pkgver.tar.gz::https://github.com/openjdk/jfx11u/archive/refs/tags/${pkgver//.u/+}.tar.gz
   gradle.properties
-  https://services.gradle.org/distributions/gradle-4.8-bin.zip
   java11-openjfx-flags.patch
   java11-openjfx-no-xlocale.patch
   java11-openjfx-gstreamer-lite-gcc10-compat.patch
 )
-b2sums=('6bc1970151dae82595f23c90a5aabdb4fb86e683b7f896e59638e4710f614a61f98fe75843914a92ac57509826e7abff6980eab5fcb4de1ecd42c974025ed2b8'
+b2sums=('da57c9bb379119a17c7923ba85b1b9bd8d06db32e1d116e15f8766b7d66b593a45ef4bf137550cbee4898b6c846633107e8f7cf72dd9362f58cdf9305e03ab02'
         'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
-        'eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6'
-        '27f0bd59d53f3882e5226480c7763de04bb909af0863e8868fe92cc5906e5f8bdec71e04d366f300f9f4071c8791fb730d8a435136bc327e44d8065e4ae96ee3'
+        '764c8a1b23be12e967f14ee528709dc01735ae293984ff89b480a4271e5fbcb0826d75b47b299c6c8b2a98440a0b7ecd9bcf1863722d50e271461d7aa6aae125'
         '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
         '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64')
 
 prepare() {
-  cd rt-${pkgver//.u/+}
+  cd jfx11u-${pkgver//.u/-}
 
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java11-openjfx-flags.patch
@@ -67,9 +66,9 @@
 }
 
 build() {
-  cd rt-${pkgver//.u/+}
+  cd jfx11u-${pkgver//.u/-}
 
-  ../gradle-4.8/bin/gradle zips
+  gradle zips
 }
 
 package_java11-openjfx() {
@@ -87,7 +86,7 @@
   )
   provides=('java-openjfx=11')
 
-  cd rt-${pkgver//.u/+}
+  cd jfx11u-${pkgver//.u/-}
 
   install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses}
   cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-11-openjfx/
@@ -97,7 +96,7 @@
 }
 
 package_java11-openjfx-doc() {
-  cd rt-${pkgver//.u/+}
+  cd jfx11u-${pkgver//.u/-}
 
   install -dm 755 "${pkgdir}"/usr/share/{doc,licenses}
   cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java11-openjfx
@@ -105,7 +104,7 @@
 }
 
 package_java11-openjfx-src() {
-  cd rt-${pkgver//.u/+}
+  cd jfx11u-${pkgver//.u/-}
 
   install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-11-openjfx,share/licenses}
   install -m 644 build/sdk/lib/src.zip "${pkgdir}"/usr/lib/jvm/java-11-openjfx/javafx-src.zip

Modified: java11-openjfx-flags.patch
===================================================================
--- java11-openjfx-flags.patch	2021-12-08 10:46:56 UTC (rev 430807)
+++ java11-openjfx-flags.patch	2021-12-08 10:47:43 UTC (rev 430808)
@@ -38,8 +38,8 @@
  }
 @@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [
  LINUX.iio.compiler = compiler
- LINUX.iio.ccFlags = [ccFlags].flatten()
- LINUX.iio.linker = linker
+ LINUX.iio.ccFlags = [cFlags, "-fvisibility=hidden"].flatten()
+ LINUX.iio.linker = IS_STATIC_BUILD ? "ld" : linker
 -LINUX.iio.linkFlags = [linkFlags].flatten()
 +LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
  LINUX.iio.lib = "javafx_iio"