!52 merge master

From: @DXwangg 
Reviewed-by: @jvmboy 
Signed-off-by: @jvmboy

0003-fix-cast-between-incompatible-function-types.patch

@@ -1,77 +0,0 @@
-From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Thu, 21 Jun 2018 15:57:01 +0100
-Subject: [PATCH 4/4] fix cast between incompatible function types
-
----
- modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++--
- .../src/main/native-glass/gtk/glass_window_ime.cpp       | 9 +++------
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
-index f85b1dae..3b9225f7 100644
---- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
-+++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
-@@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() {
-     return ctx;
- }
- 
--static gboolean dnd_finish_callback() {
-+static gboolean dnd_finish_callback(gpointer data) {
-     if (dnd_window) {
-         dnd_set_performed_action(
-                 translate_gdk_action_to_glass(
-@@ -1079,6 +1079,10 @@ gboolean DragView::get_drag_image_offset(int* x, int* y) {
-     return offset_set;
- }
- 
-+static void on_pixbuf_destroy_notify(guchar *pixels, gpointer data) {
-+	g_free(pixels);
-+}
-+
- GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* height) {
-     GdkPixbuf *pixbuf = NULL;
-     gboolean is_raw = FALSE;
-@@ -1106,7 +1110,7 @@ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* h
-                     if (data) {
-                         memcpy(data, (raw + whsz), nraw - whsz);
-                         pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8,
--                                w, h, w * 4, (GdkPixbufDestroyNotify) g_free, NULL);
-+                                w, h, w * 4, (GdkPixbufDestroyNotify) on_pixbuf_destroy_notify, NULL);
-                     }
-                 }
-             }
-diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
-index 82e54d11..51af2a6a 100644
---- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
-+++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
-@@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) {
-     }
- }
- 
--//Note: this function must return int, despite the fact it doesn't conform to XIMProc type.
--// This is required in documentation of XIM
--static int im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
-+static void im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
-     (void)im_xim;
-     (void)call;
- 
-     mainEnv->CallVoidMethod((jobject) client, jViewNotifyPreeditMode, JNI_TRUE);
--    CHECK_JNI_EXCEPTION_RET(mainEnv, -1);
--    return -1; // No restrictions
-+    CHECK_JNI_EXCEPTION(mainEnv);
- }
- 
- static void im_preedit_done(XIM im_xim, XPointer client, XPointer call) {
-@@ -234,7 +231,7 @@ void WindowContextBase::enableOrResetIME() {
-             return;
-         }
- 
--        XIMCallback startCallback = {(XPointer) jview, (XIMProc) im_preedit_start};
-+        XIMCallback startCallback = {(XPointer) jview, im_preedit_start};
-         XIMCallback doneCallback = {(XPointer) jview, im_preedit_done};
-         XIMCallback drawCallback = {(XPointer) jview, im_preedit_draw};
-         XIMCallback caretCallback = {(XPointer) jview, im_preedit_caret};
--- 
-2.17.1
-

0004-Fix-Compilation-Flags.patch

@@ -1,23 +0,0 @@
---- rt-8u202-b07/buildSrc/linux.gradle
-+++ rt-8u202-b07-patched/buildSrc/linux.gradle
-@@ -54,7 +54,7 @@
- def ccFlags = [
-         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
-         "-ffunction-sections", "-fdata-sections",
--        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
-+        IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
- def ccFlagsGTK3 = ccFlags
- //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
- def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
-
---- rt-8u202-b07/buildSrc/x86egl.gradle
-+++ rt-8u202-b07-patched/buildSrc/x86egl.gradle
-@@ -99,7 +99,7 @@
- def ccFlags = [
-         commonFlags,
-         "-I$JDK_HOME/include", "-I$JDK_HOME/include/${jniPlatform}", "-c",
--        IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
-+        IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
- //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
- def linkFlags = ["-shared", commonFlags].flatten()
- 

0005-fxpackager-extract-jre-accept-symlink.patch

@@ -1,14 +0,0 @@
---- rt-8u202-b07/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java
-+++ rt-8u202-b07-patched/modules/fxpackager/src/main/java/com/oracle/tools/packager/linux/LinuxAppBundler.java
-@@ -116,8 +116,8 @@
-             BundleParams.PARAM_RUNTIME,
-             RelativeFileSet.class,
-             params -> JreUtils.extractJreAsRelativeFileSet(System.getProperty("java.home"),
--                    LINUX_JRE_RULES.fetchFrom(params)),
--            (s, p) -> JreUtils.extractJreAsRelativeFileSet(s, LINUX_JRE_RULES.fetchFrom(p))
-+                    LINUX_JRE_RULES.fetchFrom(params), true),
-+            (s, p) -> JreUtils.extractJreAsRelativeFileSet(s, LINUX_JRE_RULES.fetchFrom(p), true)
-     );
- 
-     @Override
-

openjfx8.spec

@@ -10,15 +10,15 @@
 %endif
 
 Name:           openjfx8
-Version:        8.0.202
-Release:        26.b07
+Version:        8u370
+Release:        1
 Summary:        Rich client application platform for Java
 
 #fxpackager is BSD
-License:        GPL-2.0-only and Apache-2.0 and Public Domain and LGPL-2.1-only and GPL-2.0-or-later and MIT and LGPL-2.0-only and ICU
-URL:            http://openjdk.java.net/projects/openjfx/
+License:        GPL v2 with exceptions and BSD
+URL:            https://www.openeuler.org/zh/
 
-Source0:        http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/8u202-b07.tar.bz2
+Source0:        %{version}.tar.gz
 Source1:        README.openeuler
 Source2:        pom-base.xml
 Source3:        pom-builders.xml
@@ -56,9 +56,6 @@ Source34:       fxpackager-so.xml
 Source35:       settings.xml
 
 Patch0:         0000-Fix-wait-call-in-PosixPlatform.patch
-Patch1:         0003-fix-cast-between-incompatible-function-types.patch
-Patch2:         0004-Fix-Compilation-Flags.patch
-Patch3:         0005-fxpackager-extract-jre-accept-symlink.patch
 
 ExclusiveArch:  x86_64 aarch64
 
@@ -106,11 +103,8 @@ This package contains javadoc for %{name}.
 %global debug_package %{nil}
 
 %prep
-%setup -q -n rt-8u202-b07
+%setup -q -n openjfx8-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
  
 cp %{SOURCE1} .
 
@@ -234,8 +228,29 @@ ln -s %{openjfxdir}/bin/javapackager %{buildroot}%{_bindir}
 %license LICENSE
 
 %changelog
-* Wed Sep 22 2021 sunguoshuai <sunguoshuai@huawei.com> - 8.0.202-26.b07
-- change maven repository to huaweicloud
+* Tue Jun 20 2023 DXwangg <wangjiawei80@huawei.com> - 8u370.1
+- update 8u353.tar.gz to 8u370.tar.gz
+
+* Wed Dec 12 2022 douyiwang <douyiwang@huawei.com> - 8u353.1
+- update 8u352.tar.bz to 8u353.tar.gz
+
+* Wed Dec 7 2022 douyiwang <douyiwang@huawei.com> - 8u352.1
+- update 8u340.tar.bz to 8u352.tar.gz
+
+* Tue Jul 19 2022 DXwangg <wangjiawei80@huawei.com> - 8u340.1
+- update sqlite from 3.35.3 to 3.37.2
+
+* Tue Jul 12 2022 Noah <hedongbo@huawei.com> - 8u330.1
+- change upstream to openeuler
+- rm 0004-Fix-Compilation-Flags.patch
+- rm 0005-fxpackager-extract-jre-accept-symlink.patch
+- rm 0003-fix-cast-between-incompatible-function-types.patch
+
+* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 8.0,202-26.b07
+- change maven repository to huawei cloud
+
+* Sun Jul 11 2021 Benshuai5D <zhangyunbo7@huawei.com> - 8.0.202-26.b07
+- add openjfx8.yaml
 
 * Tue Mar 23 2021 Noah <hedongbo@huawei.com> - 8.0.202-25.b07
 - change maven repository to ali cloud

openjfx8.yaml

@@ -0,0 +1,5 @@
+---
+version_control: hg
+src_repo: http://hg.openjdk.java.net/openjfx/8u-dev/
+tag_prefix: 8u
+seperator: "-"

settings.xml

@@ -7,7 +7,7 @@
           <id>huaweicloud</id>
           <mirrorOf>central</mirrorOf>
           <name>central repo</name>
-          <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+          <url>https://repo.huaweicloud.com/repository/maven/</url>
         </mirror>
     </mirrors>
  </settings>