diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -9,12 +9,10 @@ libcairo.so.2 libdl.so.2 libfreetype.so.6 -libgcc_s.so.1 libgdk-x11-2.0.so.0 libgdk_pixbuf-2.0.so.0 libgio-2.0.so.0 libglib-2.0.so.0 -libgmodule-2.0.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 libgtk-x11-2.0.so.0 @@ -22,6 +20,4 @@ libpango-1.0.so.0 libpangoft2-1.0.so.0 libpthread.so.0 -libstdc++.so.6 -libxml2.so.2 -libxslt.so.1 +librt.so.1 diff --git a/files/gcc6.patch b/files/0001-GCC6-fix.patch rename from files/gcc6.patch rename to files/0001-GCC6-fix.patch --- a/files/gcc6.patch +++ b/files/0001-GCC6-fix.patch @@ -23,3 +23,4 @@ #endif #ifdef MAC wpid = wait(&status); + diff --git a/files/0002-Fix-build-errors.patch b/files/0002-Fix-build-errors.patch new file mode 100644 --- /dev/null +++ b/files/0002-Fix-build-errors.patch @@ -0,0 +1,40 @@ +From 048a5ff439bd6e969fd9ccda56d3a74447850090 Mon Sep 17 00:00:00 2001 +From: Philipp Trulson +Date: Tue, 23 Oct 2018 11:04:08 +0200 +Subject: [PATCH] Fix build errors. Disabling xlocale, because it's missing in + newer glibc. + +--- + .../3rd_party/glib/glib-2.56.1/build/linux/x64/config.h | 2 +- + .../src/main/native/Source/ThirdParty/libxslt/linux/config.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h +index 1359356..c448395 100644 +--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h ++++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/build/linux/x64/config.h +@@ -646,7 +646,7 @@ + /* #undef HAVE_XATTR_NOFOLLOW */ + + /* Define to 1 if you have the header file. */ +-#define HAVE_XLOCALE_H 1 ++/* #undef HAVE_XLOCALE_H */ + + /* Define to 1 if you have the `_NSGetEnviron' function. */ + /* #undef HAVE__NSGETENVIRON */ +diff --git a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h +index bd44c16..566bf64 100644 +--- a/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h ++++ b/modules/web/src/main/native/Source/ThirdParty/libxslt/linux/config.h +@@ -143,7 +143,7 @@ + #define HAVE_VSPRINTF 1 + + /* Define to 1 if you have the header file. */ +-#define HAVE_XLOCALE_H 1 ++/* #undef HAVE_XLOCALE_H */ + + /* Define to 1 if you have the `_stat' function. */ + /* #undef HAVE__STAT */ +-- +2.19.1 + diff --git a/files/0003-Disable-compiler-errors.patch b/files/0003-Disable-compiler-errors.patch new file mode 100644 --- /dev/null +++ b/files/0003-Disable-compiler-errors.patch @@ -0,0 +1,26 @@ +From 3fcb74ea6c498185bcbc6e6adbdc8189f1ed1767 Mon Sep 17 00:00:00 2001 +From: Philipp Trulson +Date: Mon, 22 Oct 2018 16:17:43 +0200 +Subject: [PATCH] Disable compiling errors + +--- + buildSrc/linux.gradle | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index b87e22b..1600771 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -141,7 +141,7 @@ LINUX.glass.javahInclude = [ + "com/sun/glass/ui/gtk/*"] + LINUX.glass.nativeSource = file("modules/graphics/src/main/native-glass/gtk") + LINUX.glass.compiler = compiler +-LINUX.glass.ccFlags = [ccFlags, "-Werror"].flatten() ++LINUX.glass.ccFlags = [ccFlags, "-Wno-error"].flatten() + LINUX.glass.linker = linker + LINUX.glass.linkFlags = [linkFlags].flatten() + LINUX.glass.lib = "glass" +-- +2.19.1 + + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,9 +1,9 @@ name : openjfx-8 -version : '8.172' -release : 2 +version : 8.192 +release : 3 source : - - http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/2991e8b097f3.tar.bz2 : 9d63ed315949362bbb14020c2e0251a872640e43b33d2a60982c0d815190a93b -license : GPL-2.0 + - https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/8u192-b10.tar.bz2 : 923db5bf61368ebcdda8733b8038cbebbd69d1faf3351958efd9de6f0d12dc80 +license : GPL-2.0-with-classpath-exception component : programming.java summary : OpenJFX is an open source, next generation client application platform for desktop and embedded systems based on JavaSE description: | @@ -15,6 +15,7 @@ - pkgconfig(libxslt) - pkgconfig(Qt5Core) - pkgconfig(ruby-2.3) + - pkgconfig(x11) - pkgconfig(xtst) - gperf - gradle @@ -24,7 +25,9 @@ networking : yes setup : | cp $pkgfiles/gradle.properties . - %patch -p1 < $pkgfiles/gcc6.patch + %patch -p1 < $pkgfiles/0001-GCC6-fix.patch + %patch -p1 < $pkgfiles/0002-Fix-build-errors.patch + %patch -p1 < $pkgfiles/0003-Disable-compiler-errors.patch build : | export GRADLE_USER_HOME=$workdir gradle --no-daemon --stacktrace diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,10 +2,10 @@ openjfx-8 - Bryan T. Meyers - bmeyers@datadrake.com + Philipp Trulson + philipp@trulson.de - GPL-2.0 + GPL-2.0-with-classpath-exception programming.java OpenJFX is an open source, next generation client application platform for desktop and embedded systems based on JavaSE OpenJFX is an open source, next generation client application platform for desktop and embedded systems based on JavaSE @@ -25,6 +25,7 @@ /usr/lib64/openjdk-8/jre/lib/amd64/libdecora_sse.so /usr/lib64/openjdk-8/jre/lib/amd64/libfxplugins.so /usr/lib64/openjdk-8/jre/lib/amd64/libglass.so + /usr/lib64/openjdk-8/jre/lib/amd64/libglib-lite.so /usr/lib64/openjdk-8/jre/lib/amd64/libgstreamer-lite.so /usr/lib64/openjdk-8/jre/lib/amd64/libjavafx_font.so /usr/lib64/openjdk-8/jre/lib/amd64/libjavafx_font_freetype.so @@ -41,16 +42,17 @@ /usr/lib64/openjdk-8/lib/ant-javafx.jar /usr/lib64/openjdk-8/lib/javafx-mx.jar /usr/lib64/openjdk-8/lib/packager.jar - /usr/share/man + /usr/share/man/man1/javafxpackager.1 + /usr/share/man/man1/javapackager.1 - - 2017-12-23 - 8.172 + + 2018-10-23 + 8.192 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + Philipp Trulson + philipp@trulson.de \ No newline at end of file