[openjfx] 03/05: Removed gradle-2.x.patch (fixed upstream)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sun Oct 4 10:58:26 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit b8f7fb8be341d1da9e125ee4477ecad849ebeb65
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 11 13:24:52 2015 +0200

    Removed gradle-2.x.patch (fixed upstream)
---
 debian/patches/gradle-2.x.patch | 25 -------------------------
 debian/patches/series           |  1 -
 2 files changed, 26 deletions(-)

diff --git a/debian/patches/gradle-2.x.patch b/debian/patches/gradle-2.x.patch
deleted file mode 100644
index b63c22f..0000000
--- a/debian/patches/gradle-2.x.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Fri, 21 Aug 2015 23:53:28 +0200
-Subject: gradle 2.x
-
----
- build.gradle | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/build.gradle b/build.gradle
-index 105baac..da7da96 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -2670,11 +2670,7 @@ allprojects {
-     // compiler with the right settings.
-     //
-     // Also, we need to remove jfxrt.jar from the ext classpath (if it is there)
--    tasks.withType(Compile) { compile ->
--        // It looks like we have to use ant to compile instead of the built-in gradle
--        // compiler stuff because otherwise it won't compile on CYGWIN
--        // TODO need to file issue with Gradle
--        compile.options.useAnt = true
-+    tasks.withType(JavaCompile) { compile ->
-         compile.options.debug = true // we always generate debugging info in the class files
-         compile.options.debugOptions.debugLevel = IS_DEBUG_JAVA ? "source,lines,vars" : "source,lines"
-         compile.options.fork = true
diff --git a/debian/patches/series b/debian/patches/series
index 9f7900b..04828de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 08-disable-sse2.patch
 09-fix-conflicting-uchar32-typedef.patch
 10-javadoc-locale.patch
-#gradle-2.x.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git



More information about the pkg-java-commits mailing list