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

[Felix Yan]

    Date: Wednesday, September 15, 2021 @ 20:19:50
  Author: felixonmars
Revision: 424058

upgpkg: java-openjfx 17.0.0.1.u1-1

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

--------------------------+
 PKGBUILD                 |   20 +++++++++-----------
 java-openjfx-flags.patch |   28 ++++++++++++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-15 20:00:34 UTC (rev 424057)
+++ PKGBUILD	2021-09-15 20:19:50 UTC (rev 424058)
@@ -14,12 +14,13 @@
   java-openjfx-doc
   java-openjfx-src
 )
-_majorver=16
+_majorver=17
 _minorver=0
 _securityver=0
-_updatever=8
-#pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-pkgver=${_majorver}.u${_updatever}
+_patchver=1
+_updatever=1
+pkgver=${_majorver}.${_minorver}.${_securityver}.${_patchver}.u${_updatever}
+#pkgver=${_majorver}.u${_updatever}
 pkgrel=1
 pkgdesc="Java OpenJFX ${_majorver} client application platform (open-source implementation of JavaFX)"
 arch=(x86_64)
@@ -53,15 +54,13 @@
 source=(
   ${pkgbase}-${pkgver//.u/+}::https://github.com/openjdk/jfx/archive/${pkgver//.u/+}/jfx-${pkgver//.u/+}.tar.gz
   gradle.properties
-  https://services.gradle.org/distributions/gradle-6.3-bin.zip
   java-openjfx-flags.patch
   java-openjfx-no-xlocale.patch
   java-openjfx-gstreamer-lite-gcc10-compat.patch
 )
-sha256sums=('0cde9b8ce0902c71810f904ff58f48daedd98d8c958fd6fbcb7c2a65877f411a'
+sha256sums=('7398a87b1c1b593a2610ef84dd8b0fc31fc9a87dc5185ea4d1ef71b560920a5d'
             '2622aa35d733cc69f4421f1cd053bf425e89f93141cb52c9f016a9b425fc0cb6'
-            '038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768'
-            'af52cd9fb252770b6886eef2720ca4b6c582f3719f8a28128c498681b457233c'
+            '26a11b7f9bdba382de16fea691d01de270e79b055f765f7475294dd69605604c'
             '220c63396561867a6d07ae81b6390160d8f91502587e4873998e3b7a83793a1c'
             'd7f9db86854b1cb8ab973c2ff255e51a637b9c24af30144182202d33f01a9434')
 
@@ -78,7 +77,7 @@
 build() {
   cd jfx-${pkgver//.u/-}
 
-  ../gradle-6.3/bin/gradle zips
+  gradle zips
 }
 
 package_java-openjfx() {
@@ -108,7 +107,6 @@
 
   install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-${_majorver}-openjdk,share/licenses}
   cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/
-  rm "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/lib/src.zip
   cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/
   cp -dr --no-preserve=ownership build/sdk/legal "${pkgdir}"/usr/share/licenses/java-openjfx
 }
@@ -125,7 +123,7 @@
   cd jfx-${pkgver//.u/-}
 
   install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-${_majorver}-openjdk,share/licenses}
-  install -m 644 build/sdk/lib/src.zip "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/javafx-src.zip
+  install -m 644 build/sdk/src.zip "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/javafx-src.zip
   ln -s java-openjfx "${pkgdir}"/usr/share/licenses/java-openjfx-src
 }
 

Modified: java-openjfx-flags.patch
===================================================================
--- java-openjfx-flags.patch	2021-09-15 20:00:34 UTC (rev 424057)
+++ java-openjfx-flags.patch	2021-09-15 20:19:50 UTC (rev 424058)
@@ -37,8 +37,8 @@
      linkFlags += "-g"
 @@ -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"
@@ -57,19 +57,23 @@
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -29,13 +29,8 @@ CFLAGS = -fPIC                   \
+@@ -29,17 +29,13 @@ CFLAGS = -fPIC                   \
           -DLINUX                 \
           -DGST_DISABLE_LOADSAVE  \
           -DGSTREAMER_LITE \
 -         -ffunction-sections -fdata-sections
--
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+
+ ifneq ($(ARCH), aarch64)
+     CFLAGS += -msse2
+ endif
+
 -ifeq ($(BUILD_TYPE), Release)
 -    CFLAGS += -Os
 -else
 -    CFLAGS += -g -Wall
 -endif
-+         -ffunction-sections -fdata-sections \
-+         ${CFLAGS}
  
  PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
  PACKAGES_LIBS     := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -101,12 +105,18 @@
           -Wformat                \
           -Wextra                 \
           -Wformat-security       \
-@@ -30,14 +30,8 @@ CFLAGS = -fPIC                   \
+@@ -30,18 +30,13 @@ CFLAGS = -fPIC                   \
           -DGST_DISABLE_LOADSAVE  \
           -DGST_DISABLE_GST_DEBUG \
           -DGSTREAMER_LITE \
 -         -ffunction-sections -fdata-sections
--
++         -ffunction-sections -fdata-sections \
++         ${CFLAGS}
+ 
+ ifneq ($(ARCH), aarch64)
+     CFLAGS += -msse2
+ endif
+
 -ifeq ($(BUILD_TYPE), Release)
 -    CFLAGS += -Os
 -else
@@ -113,8 +123,6 @@
 -    CFLAGS += -g -Wall
 -endif
 -
-+         -ffunction-sections -fdata-sections \
-+         ${CFLAGS}
  
  INCLUDES = -I$(SRCBASE_DIR) \
  	   $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \