diff --git a/0003-fix-cast-between-incompatible-function-types.patch b/0003-fix-cast-between-incompatible-function-types.patch deleted file mode 100644 index 011e952b9440d15233823331bba7a588e701b6c6..0000000000000000000000000000000000000000 --- a/0003-fix-cast-between-incompatible-function-types.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 - diff --git a/0004-Fix-Compilation-Flags.patch b/0004-Fix-Compilation-Flags.patch deleted file mode 100644 index 17c91ab9ab882b924bf543da03778049ef026263..0000000000000000000000000000000000000000 --- a/0004-Fix-Compilation-Flags.patch +++ /dev/null @@ -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() - diff --git a/0005-fxpackager-extract-jre-accept-symlink.patch b/0005-fxpackager-extract-jre-accept-symlink.patch deleted file mode 100644 index ec5cf75628aeb7a748856082b8a93354e6719adf..0000000000000000000000000000000000000000 --- a/0005-fxpackager-extract-jre-accept-symlink.patch +++ /dev/null @@ -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 - diff --git a/8u202-b07.tar.bz2 b/8u353.tar.gz similarity index 73% rename from 8u202-b07.tar.bz2 rename to 8u353.tar.gz index e400c6f3fc268471038c6ea0bc02ddf337eaa74d..6c6f65bf554e8adc2a576e5c073e3eb399fff26e 100644 Binary files a/8u202-b07.tar.bz2 and b/8u353.tar.gz differ diff --git a/openjfx8.spec b/openjfx8.spec index 54c27e13ef34432fdc9380ffbf4e476a3b9f8b74..59f87db1f2b9b3b6b483a7dbac3433c93031ba72 100644 --- a/openjfx8.spec +++ b/openjfx8.spec @@ -10,15 +10,15 @@ %endif Name: openjfx8 -Version: 8.0.202 -Release: 27.b07 +Version: 8u353 +Release: 1 Summary: Rich client application platform for Java #fxpackager is BSD License: GPL v2 with exceptions and BSD -URL: http://openjdk.java.net/projects/openjfx/ +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,6 +228,21 @@ ln -s %{openjfxdir}/bin/javapackager %{buildroot}%{_bindir} %license LICENSE %changelog +* Wed Dec 12 2022 douyiwang - 8u353.1 +- update 8u352.tar.bz to 8u353.tar.gz + +* Wed Dec 7 2022 douyiwang - 8u352.1 +- update 8u340.tar.bz to 8u352.tar.gz + +* Tue Jul 19 2022 DXwangg - 8u340.1 +- update sqlite from 3.35.3 to 3.37.2 + +* Tue Jul 12 2022 Noah - 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 - 8.0,202-26.b07 - change maven repository to huawei cloud diff --git a/settings.xml b/settings.xml index 8460431dcfcb508ece7b551d05817ed7137ce6b5..119a67d5ad4f53d6816f1e5400a3c9fb7afe8ecf 100644 --- a/settings.xml +++ b/settings.xml @@ -7,7 +7,7 @@ huaweicloud central central repo - https://mirrors.huaweicloud.com/repository/maven/ + https://repo.huaweicloud.com/repository/maven/