diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -9,12 +9,14 @@ libcairo.so.2 libdl.so.2 libfreetype.so.6 +libgdk-3.so.0 libgdk-x11-2.0.so.0 libgdk_pixbuf-2.0.so.0 libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgthread-2.0.so.0 +libgtk-3.so.0 libgtk-x11-2.0.so.0 libm.so.6 libpango-1.0.so.0 diff --git a/files/0001-Disable-compiling-errors.patch b/files/0001-Disable-compiling-errors.patch new file mode 100644 --- /dev/null +++ b/files/0001-Disable-compiling-errors.patch @@ -0,0 +1,43 @@ +From 6c83ff4628dc22d5a91f108a5270358e787dcce2 Mon Sep 17 00:00:00 2001 +From: Philipp Trulson +Date: Fri, 1 Feb 2019 15:54:08 +0100 +Subject: [PATCH] Disable compiling errors + +--- + buildSrc/linux.gradle | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index c47b7b4..bf8edbd 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -199,7 +199,7 @@ LINUX.glass.javahInclude = [ + "com/sun/glass/ui/gtk/*"] + LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() + LINUX.glass.glass.compiler = compiler +-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() ++LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten() + LINUX.glass.glass.linker = linker + LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten() + LINUX.glass.glass.lib = "glass" +@@ -207,7 +207,7 @@ LINUX.glass.glass.lib = "glass" + LINUX.glass.glassgtk2 = [:] + LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() + LINUX.glass.glassgtk2.compiler = compiler +-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() ++LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten() + LINUX.glass.glassgtk2.linker = linker + LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten() + LINUX.glass.glassgtk2.lib = "glassgtk2" +@@ -215,7 +215,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2" + LINUX.glass.glassgtk3 = [:] + LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() + LINUX.glass.glassgtk3.compiler = compiler +-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten() ++LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten() + LINUX.glass.glassgtk3.linker = linker + LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten() + LINUX.glass.glassgtk3.lib = "glassgtk3" +-- +2.20.1 + diff --git a/files/0001-GCC6-fix.patch b/files/0001-GCC6-fix.patch deleted file mode 100644 --- a/files/0001-GCC6-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fixes a build error with GCC 6 -Author: Emmanuel Bourg -Forwarded: no -Bug-Debian: https://bugs.debian.org/837021 -diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -index 5c8f4b9..7c35213 100644 ---- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - - PosixPlatform::PosixPlatform(void) { -@@ -232,7 +233,7 @@ bool PosixProcess::Wait() { - - //TODO Use waitpid instead of wait - #ifdef LINUX -- wait(); -+ wait(&status); - #endif - #ifdef MAC - wpid = wait(&status); - diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : openjfx-8 -version : 8.192 -release : 4 +version : '8.202' +release : 5 source : - - https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/8u192-b10.tar.bz2 : 923db5bf61368ebcdda8733b8038cbebbd69d1faf3351958efd9de6f0d12dc80 + - https://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/8u202-b07.tar.bz2 : 99366488b43206bb3ceec2462306b453afd81147d87916c48882099a8d1ec109 license : GPL-2.0-or-later WITH Classpath-exception-2.0 component : programming.java summary : OpenJFX is an open source, next generation client application platform for desktop and embedded systems based on JavaSE @@ -11,9 +11,10 @@ builddeps : - pkgconfig(alsa) - pkgconfig(gtk+-2.0) + - pkgconfig(gtk+-3.0) - pkgconfig(libavcodec) - pkgconfig(Qt5Core) - - pkgconfig(ruby-2.3) + - pkgconfig(ruby-2.6) - pkgconfig(xtst) - gperf - gradle @@ -23,9 +24,8 @@ networking : yes setup : | cp $pkgfiles/gradle.properties . - %patch -p1 < $pkgfiles/0001-GCC6-fix.patch + %patch -p1 < $pkgfiles/0001-Disable-compiling-errors.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,8 +2,8 @@ openjfx-8 - Pierre-Yves - pyu@riseup.net + Philipp Trulson + philipp@trulson.de GPL-2.0-or-later WITH Classpath-exception-2.0 programming.java @@ -25,6 +25,8 @@ /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/libglassgtk2.so + /usr/lib64/openjdk-8/jre/lib/amd64/libglassgtk3.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 @@ -47,12 +49,12 @@ - - 2018-12-11 - 8.192 + + 2019-02-01 + 8.202 Packaging update - Pierre-Yves - pyu@riseup.net + Philipp Trulson + philipp@trulson.de \ No newline at end of file