diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-java/openjfx/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'dev-java/openjfx/files')
-rw-r--r-- | dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch | 23 | ||||
-rw-r--r-- | dev-java/openjfx/files/11/wno-error.patch | 43 |
2 files changed, 43 insertions, 23 deletions
diff --git a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch b/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch deleted file mode 100644 index 51fde6ad39a3..000000000000 --- a/dev-java/openjfx/files/11/fix-build-on-gradle-5x.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2f74649395f0242d08b95572b7b30246457b1d6b Mon Sep 17 00:00:00 2001 -From: Ty Young <BlueGoliath@users.noreply.github.com> -Date: Mon, 3 Dec 2018 20:34:07 -0600 -Subject: [PATCH] Remove final from HashSet instance - -Removes final from HashSet instance at about line 107 which causes build failure ---- - .../main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy -index 10a85d62d1..13d573fe6e 100644 ---- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy -+++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy -@@ -102,7 +102,7 @@ class NativeCompileTask extends DefaultTask { - updateFiles(); - def source = project.files(allFiles); - boolean forceCompile = false; -- final Set<File> files = new HashSet<File>(); -+ Set<File> files = new HashSet<File>(); - source.each { File file -> - final Map fileData = dependencies.get(file.toString()); - final boolean isModified = fileData == null || diff --git a/dev-java/openjfx/files/11/wno-error.patch b/dev-java/openjfx/files/11/wno-error.patch new file mode 100644 index 000000000000..eb354c6f9fad --- /dev/null +++ b/dev-java/openjfx/files/11/wno-error.patch @@ -0,0 +1,43 @@ +From 737acaff3658663de61813ba877379841e76631e Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Thu, 19 Mar 2020 09:50:22 -0700 +Subject: [PATCH] remove werror + +--- + buildSrc/linux.gradle | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index 7a7cbc7..6955155 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g + LINUX.glass.glass = [:] + 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" +@@ -231,7 +231,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" +@@ -239,7 +239,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.24.1 + |