[openjfx] 01/01: * Add build dependency on openjdk-8-doc, point JDK_DOCS to it.

Matthias Klose doko at moszumanska.debian.org
Thu Oct 8 11:31:52 UTC 2015


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

doko pushed a commit to branch master
in repository openjfx.

commit eb7e0f31ed4790cbc9198f9b3f51caebeef7a8f8
Author: Matthias Klose <doko at ubuntu.com>
Date:   Thu Oct 8 13:31:13 2015 +0200

      * Add build dependency on openjdk-8-doc, point JDK_DOCS to it.
---
 debian/changelog                                |  2 +-
 debian/patches/15-fix-javadoc-refererences.diff | 13 +++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5158733..07462f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ openjfx (8u60-b27-2) UNRELEASED; urgency=medium
 
   * Fix build on arm64, patch taken from the webkitgtk package.
   * Kill most of the direct -m32 / -m64 settings. Closes: #779833.
-  * Add build dependency on openjdk-8-doc.
+  * Add build dependency on openjdk-8-doc, point JDK_DOCS to it.
 
  -- Matthias Klose <doko at ubuntu.com>  Thu, 08 Oct 2015 09:47:38 +0200
 
diff --git a/debian/patches/15-fix-javadoc-refererences.diff b/debian/patches/15-fix-javadoc-refererences.diff
new file mode 100644
index 0000000..5138ae7
--- /dev/null
+++ b/debian/patches/15-fix-javadoc-refererences.diff
@@ -0,0 +1,13 @@
+Index: b/build.gradle
+===================================================================
+--- a/build.gradle
++++ b/build.gradle
+@@ -275,7 +275,7 @@ defineProperty("JAVA", cygpath("$JDK_HOM
+ defineProperty("JAVAC", cygpath("$JDK_HOME/bin/javac${IS_WINDOWS ? '.exe' : ''}"))
+ defineProperty("JAVAH", cygpath("$JDK_HOME/bin/javah${IS_WINDOWS ? '.exe' : ''}"))
+ defineProperty("JAVADOC", cygpath("$JDK_HOME/bin/javadoc${IS_WINDOWS ? '.exe' : ''}"))
+-defineProperty("JDK_DOCS", "https://docs.oracle.com/javase/8/docs/api/")
++defineProperty("JDK_DOCS", "file:///usr/share/doc/openjdk-8-doc/api/")
+ 
+ defineProperty("javaRuntimeVersion", System.getProperty("java.runtime.version"))
+ defineProperty("javaVersion", javaRuntimeVersion.split("-")[0])
diff --git a/debian/patches/series b/debian/patches/series
index 87601b1..8116310 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 12-generic-qmake-spec.patch
 fix-arm64-build.patch
 fix-arm32-build.patch
+15-fix-javadoc-refererences.diff

-- 
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