This is an automated email from the git hooks/post-receive script. doko pushed a commit to branch master in repository openjfx.
commit 207bdfbcd1978af42514c88e35b77bf98570f3a1 Author: Matthias Klose <[email protected]> Date: Tue Oct 6 15:39:04 2015 +0200 * Build using the qmake linux-g++ spec. --- debian/changelog | 1 + debian/patches/12-generic-qmake-spec.diff | 23 +++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) diff --git a/debian/changelog b/debian/changelog index dbb6d93..06ed066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ openjfx (8u60-b27-1ubuntu1) UNRELEASED; urgency=medium [ Matthias Klose ] * Fix installation into the jre architecture directory. * Enable verbose (debug) build for slow architectures. + * Build using the qmake linux-g++ spec. -- Matthias Klose <[email protected]> Tue, 06 Oct 2015 11:58:43 +0200 diff --git a/debian/patches/12-generic-qmake-spec.diff b/debian/patches/12-generic-qmake-spec.diff new file mode 100644 index 0000000..a43db7f --- /dev/null +++ b/debian/patches/12-generic-qmake-spec.diff @@ -0,0 +1,23 @@ +Index: b/build.gradle +=================================================================== +--- a/build.gradle ++++ b/build.gradle +@@ -2548,17 +2548,9 @@ project(":web") { + "QMAKE_LFLAGS" : "-m64", + ]) + } else if (t.name == "linux") { +- if (IS_64) { + environment([ +- "QMAKESPEC" : "linux-g++-64", ++ "QMAKESPEC" : "linux-g++", + ]) +- } else { +- environment([ +- "QMAKESPEC" : "linux-g++-32", +- "QMAKE_CFLAGS" : "-m32", +- "QMAKE_LFLAGS" : "-m32", +- ]) +- } + } else if (t.name.startsWith("arm")) { + // ARM cross build + def webkitProperties = project.rootProject.ext[t.upper].webkit diff --git a/debian/patches/series b/debian/patches/series index 37a02ac..6d28521 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 09-fix-conflicting-uchar32-typedef.patch 10-javadoc-locale.patch 11-icu-dynamic-linking.patch +12-generic-qmake-spec.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
