Date: Saturday, October 7, 2017 @ 16:16:59 Author: guillaume Revision: 307128
archrelease: copy trunk to extra-i686, extra-x86_64 Added: java-openjfx/repos/extra-i686/17-gcc-compatibility.patch (from rev 307127, java-openjfx/trunk/17-gcc-compatibility.patch) java-openjfx/repos/extra-i686/PKGBUILD (from rev 307127, java-openjfx/trunk/PKGBUILD) java-openjfx/repos/extra-i686/gradle.properties (from rev 307127, java-openjfx/trunk/gradle.properties) java-openjfx/repos/extra-x86_64/17-gcc-compatibility.patch (from rev 307127, java-openjfx/trunk/17-gcc-compatibility.patch) java-openjfx/repos/extra-x86_64/PKGBUILD (from rev 307127, java-openjfx/trunk/PKGBUILD) java-openjfx/repos/extra-x86_64/gradle.properties (from rev 307127, java-openjfx/trunk/gradle.properties) Deleted: java-openjfx/repos/extra-i686/17-gcc-compatibility.patch java-openjfx/repos/extra-i686/18-fix-ambiguous-pow.patch java-openjfx/repos/extra-i686/PKGBUILD java-openjfx/repos/extra-i686/gradle.properties java-openjfx/repos/extra-x86_64/17-gcc-compatibility.patch java-openjfx/repos/extra-x86_64/18-fix-ambiguous-pow.patch java-openjfx/repos/extra-x86_64/PKGBUILD java-openjfx/repos/extra-x86_64/gradle.properties -----------------------------------------+ /17-gcc-compatibility.patch | 50 ++++++ /PKGBUILD | 228 ++++++++++++++++++++++++++++++ /gradle.properties | 8 + extra-i686/17-gcc-compatibility.patch | 25 --- extra-i686/18-fix-ambiguous-pow.patch | 13 - extra-i686/PKGBUILD | 111 -------------- extra-i686/gradle.properties | 4 extra-x86_64/17-gcc-compatibility.patch | 25 --- extra-x86_64/18-fix-ambiguous-pow.patch | 13 - extra-x86_64/PKGBUILD | 111 -------------- extra-x86_64/gradle.properties | 4 11 files changed, 286 insertions(+), 306 deletions(-) Deleted: extra-i686/17-gcc-compatibility.patch =================================================================== --- extra-i686/17-gcc-compatibility.patch 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-i686/17-gcc-compatibility.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,25 +0,0 @@ -Description: Fixes a build error with GCC 6 -Author: Emmanuel Bourg <ebo...@apache.org> -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 <iostream> - #include <dlfcn.h> - #include <signal.h> -+#include <sys/wait.h> - - - 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); Copied: java-openjfx/repos/extra-i686/17-gcc-compatibility.patch (from rev 307127, java-openjfx/trunk/17-gcc-compatibility.patch) =================================================================== --- extra-i686/17-gcc-compatibility.patch (rev 0) +++ extra-i686/17-gcc-compatibility.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,25 @@ +Description: Fixes a build error with GCC 6 +Author: Emmanuel Bourg <ebo...@apache.org> +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 <iostream> + #include <dlfcn.h> + #include <signal.h> ++#include <sys/wait.h> + + + 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); Deleted: extra-i686/18-fix-ambiguous-pow.patch =================================================================== --- extra-i686/18-fix-ambiguous-pow.patch 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-i686/18-fix-ambiguous-pow.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,13 +0,0 @@ -Description: Fixes an ambiguous call to the pow() function -Origin: backport, https://github.com/WebKit/webkit/commit/2931450725 ---- a/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp -+++ b/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp -@@ -43,7 +43,7 @@ - - LayoutUnit ratio = radius / margin; - if (ratio < 1) -- return radius + (margin * (1 + pow(ratio - 1, 3))); -+ return radius + (margin * (1 + pow(ratio - 1, 3.0))); - - return radius + margin; - } Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-i686/PKGBUILD 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,111 +0,0 @@ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com> -# Contributor: Richard Jackson <rdjack21 at gmail dot com> -# Contributor: Tinx <arch at tinx dot eu> -# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de> -# Contributor: Olli <olli at coderkun dot de> - -# Demos available in `apps/samples` -# To build them: `ant -Dplatforms.JDK_1.8.home=/usr/lib/jvm/default jar` - -pkgbase=java-openjfx -pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src') -_java_ver=8 -_jdk_update=121 -_jdk_build=13 -_hgtag=${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgver=${_java_ver}.u${_jdk_update} -pkgrel=1 -pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' -arch=('i686' 'x86_64') -url='https://wiki.openjdk.java.net/display/OpenJFX/Main' -license=('GPL') -makedepends=('java-environment-openjdk=8' 'bison' 'gperf' 'gtk2' - 'libxtst' 'ffmpeg' 'python2' 'qt5-base' 'webkit2gtk' 'ruby' 'cmake') -source=(http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/${_hgtag}.tar.bz2 - gradle.properties - https://services.gradle.org/distributions/gradle-1.8-bin.zip - # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/17-gcc-compatibility.patch - 17-gcc-compatibility.patch - # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/18-fix-ambiguous-pow.patch - 18-fix-ambiguous-pow.patch) - -sha256sums=('51008376a03c6603d0d0f039f3253cda98822fdda757f6cee385b594ef4ac85b' - '1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c' - 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703' - '864967467efeaffdabe1e60b7cfd0a27ce93be55ef45ef9993790219ad164554' - 'e909ae1dcb1d6c0fb0148815c3fcdbff8a15b2f05520eed2c830dc0859f75115') - -_openjdk8dir="/usr/lib/jvm/java-8-openjdk" - -case $CARCH in - 'i686') _CARCH='i386' ;; - 'x86_64')_CARCH='amd64' ;; -esac - -prepare() { - cd "rt-${_hgtag}" - for p in 17-gcc-compatibility.patch 18-fix-ambiguous-pow.patch; do - patch -p1 < "${srcdir}/${p}" - done -} - -build() { - cd "rt-${_hgtag}" - - ln -sf "${srcdir}/gradle.properties" . - export GRADLE_USER_HOME="${srcdir}/gradle_home" - mkdir -p ${GRADLE_USER_HOME} - - "${srcdir}"/gradle-1.8/bin/gradle -} - -package_java-openjfx() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' - depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkit2gtk' 'ffmpeg' 'qt5-base') - conflicts=('openjfx') - replaces=('openjfx') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - - install -d "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" - install -m755 "${_sdkdir}/rt/lib/${_CARCH}"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" - - install -d "${pkgdir}${_openjdk8dir}/jre/lib/ext" - install -m644 "${_sdkdir}/rt/lib/ext"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/ext" - install -m644 "${_sdkdir}/rt/lib"/*.* "${pkgdir}${_openjdk8dir}/jre/lib" - - install -d "${pkgdir}${_openjdk8dir}/lib" - install -m644 "${_sdkdir}/lib"/*.* "${pkgdir}${_openjdk8dir}/lib" - - install -d "${pkgdir}${_openjdk8dir}/bin" - install -m755 "${_sdkdir}/bin"/* "${pkgdir}${_openjdk8dir}/bin" - - install -m644 -D "${_sdkdir}/man/man1/javapackager.1" "${pkgdir}/usr/share/man/man1/javapackager.1" -} - -package_java-openjfx-doc() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - documentation' - conflicts=('openjfx-doc') - replaces=('openjfx-doc') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - local docdir="/usr/share/doc" - - install -d "${pkgdir}${docdir}/openjfx" - cp -dr --no-preserve=ownership "${_builddir}/javadoc"/* "${pkgdir}${docdir}/openjfx" -} - -package_java-openjfx-src() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - sources' - conflicts=('openjfx-src') - replaces=('openjfx-src') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - - install -d "${pkgdir}${_openjdk8dir}" - install -m644 "${_builddir}/javafx-src.zip" "${pkgdir}${_openjdk8dir}" -} Copied: java-openjfx/repos/extra-i686/PKGBUILD (from rev 307127, java-openjfx/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,114 @@ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: William Gathoye <william + archlinux at gathoye dot be> +# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com> +# Contributor: Richard Jackson <rdjack21 at gmail dot com> +# Contributor: Tinx <arch at tinx dot eu> +# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de> +# Contributor: Olli <olli at coderkun dot de> + +# Demos available in `` +# To build and test this pakcage: +# - install this version of java-openjfx +# - cd apps/samples +# - ant -Dplatforms.JDK_1.8.home=/usr/lib/jvm/default jar +# - java -jar ./Ensemble8/dist/Ensemble8.jar +# - java -jar ./Modena/dist/Modena.jar +# - java -jar ./3DViewer/dist/3DViewer.jar + +pkgbase=java-openjfx +pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src') +_java_ver=8 +_jdk_update=172 +_jdk_build=00 +_hgtag=${_java_ver}u${_jdk_update}-b${_jdk_build} +pkgver=${_java_ver}.u${_jdk_update} +pkgrel=1 +pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' +arch=('i686' 'x86_64') +url='https://wiki.openjdk.java.net/display/OpenJFX/Main' +license=('GPL') +makedepends=('java-environment-openjdk=8' 'bison' 'gperf' 'gtk2' + 'libxtst' 'ffmpeg' 'python2' 'qt5-base' 'webkit2gtk' 'ruby' 'cmake' 'unzip') + # TODO add junit antlr3 swt so that they are not downloaed during the build +source=(http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/${_hgtag}.tar.bz2 + gradle.properties + https://services.gradle.org/distributions/gradle-1.8-bin.zip + # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/17-gcc-compatibility.patch + 17-gcc-compatibility.patch) + +sha256sums=('435a59c9883ce79b74e2c1e61eac4ce7da54ba58179363a572bfbd8d2363c4bf' + '1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c' + 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703' + '864967467efeaffdabe1e60b7cfd0a27ce93be55ef45ef9993790219ad164554') + +_openjdk8dir="/usr/lib/jvm/java-8-openjdk" + +case $CARCH in + 'i686') _CARCH='i386' ;; + 'x86_64')_CARCH='amd64' ;; +esac + +prepare() { + cd "rt-${_hgtag}" + patch -p1 < "${srcdir}/17-gcc-compatibility.patch" +} + +build() { + cd "rt-${_hgtag}" + + ln -sf "${srcdir}/gradle.properties" . + export GRADLE_USER_HOME="${srcdir}/gradle_home" + mkdir -p ${GRADLE_USER_HOME} + + "${srcdir}"/gradle-1.8/bin/gradle +} + +package_java-openjfx() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' + depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkit2gtk' 'ffmpeg' 'qt5-base') + conflicts=('openjfx') + replaces=('openjfx') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + + install -d "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" + install -m755 "${_sdkdir}/rt/lib/${_CARCH}"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" + + install -d "${pkgdir}${_openjdk8dir}/jre/lib/ext" + install -m644 "${_sdkdir}/rt/lib/ext"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/ext" + install -m644 "${_sdkdir}/rt/lib"/*.* "${pkgdir}${_openjdk8dir}/jre/lib" + + install -d "${pkgdir}${_openjdk8dir}/lib" + install -m644 "${_sdkdir}/lib"/*.* "${pkgdir}${_openjdk8dir}/lib" + + install -d "${pkgdir}${_openjdk8dir}/bin" + install -m755 "${_sdkdir}/bin"/* "${pkgdir}${_openjdk8dir}/bin" + + install -m644 -D "${_sdkdir}/man/man1/javapackager.1" "${pkgdir}/usr/share/man/man1/javapackager.1" +} + +package_java-openjfx-doc() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - documentation' + conflicts=('openjfx-doc') + replaces=('openjfx-doc') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + local docdir="/usr/share/doc" + + install -d "${pkgdir}${docdir}/openjfx" + cp -dr --no-preserve=ownership "${_builddir}/javadoc"/* "${pkgdir}${docdir}/openjfx" +} + +package_java-openjfx-src() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - sources' + conflicts=('openjfx-src') + replaces=('openjfx-src') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + + install -d "${pkgdir}${_openjdk8dir}" + install -m644 "${_builddir}/javafx-src.zip" "${pkgdir}${_openjdk8dir}" +} Deleted: extra-i686/gradle.properties =================================================================== --- extra-i686/gradle.properties 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-i686/gradle.properties 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,4 +0,0 @@ -COMPILE_WEBKIT = true -COMPILE_MEDIA = true -BUILD_JAVADOC = true -BUILD_SRC_ZIP = true Copied: java-openjfx/repos/extra-i686/gradle.properties (from rev 307127, java-openjfx/trunk/gradle.properties) =================================================================== --- extra-i686/gradle.properties (rev 0) +++ extra-i686/gradle.properties 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,4 @@ +COMPILE_WEBKIT = true +COMPILE_MEDIA = true +BUILD_JAVADOC = true +BUILD_SRC_ZIP = true Deleted: extra-x86_64/17-gcc-compatibility.patch =================================================================== --- extra-x86_64/17-gcc-compatibility.patch 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-x86_64/17-gcc-compatibility.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,25 +0,0 @@ -Description: Fixes a build error with GCC 6 -Author: Emmanuel Bourg <ebo...@apache.org> -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 <iostream> - #include <dlfcn.h> - #include <signal.h> -+#include <sys/wait.h> - - - 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); Copied: java-openjfx/repos/extra-x86_64/17-gcc-compatibility.patch (from rev 307127, java-openjfx/trunk/17-gcc-compatibility.patch) =================================================================== --- extra-x86_64/17-gcc-compatibility.patch (rev 0) +++ extra-x86_64/17-gcc-compatibility.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,25 @@ +Description: Fixes a build error with GCC 6 +Author: Emmanuel Bourg <ebo...@apache.org> +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 <iostream> + #include <dlfcn.h> + #include <signal.h> ++#include <sys/wait.h> + + + 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); Deleted: extra-x86_64/18-fix-ambiguous-pow.patch =================================================================== --- extra-x86_64/18-fix-ambiguous-pow.patch 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-x86_64/18-fix-ambiguous-pow.patch 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,13 +0,0 @@ -Description: Fixes an ambiguous call to the pow() function -Origin: backport, https://github.com/WebKit/webkit/commit/2931450725 ---- a/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp -+++ b/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp -@@ -43,7 +43,7 @@ - - LayoutUnit ratio = radius / margin; - if (ratio < 1) -- return radius + (margin * (1 + pow(ratio - 1, 3))); -+ return radius + (margin * (1 + pow(ratio - 1, 3.0))); - - return radius + margin; - } Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-x86_64/PKGBUILD 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,111 +0,0 @@ -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com> -# Contributor: Richard Jackson <rdjack21 at gmail dot com> -# Contributor: Tinx <arch at tinx dot eu> -# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de> -# Contributor: Olli <olli at coderkun dot de> - -# Demos available in `apps/samples` -# To build them: `ant -Dplatforms.JDK_1.8.home=/usr/lib/jvm/default jar` - -pkgbase=java-openjfx -pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src') -_java_ver=8 -_jdk_update=121 -_jdk_build=13 -_hgtag=${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgver=${_java_ver}.u${_jdk_update} -pkgrel=1 -pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' -arch=('i686' 'x86_64') -url='https://wiki.openjdk.java.net/display/OpenJFX/Main' -license=('GPL') -makedepends=('java-environment-openjdk=8' 'bison' 'gperf' 'gtk2' - 'libxtst' 'ffmpeg' 'python2' 'qt5-base' 'webkit2gtk' 'ruby' 'cmake') -source=(http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/${_hgtag}.tar.bz2 - gradle.properties - https://services.gradle.org/distributions/gradle-1.8-bin.zip - # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/17-gcc-compatibility.patch - 17-gcc-compatibility.patch - # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/18-fix-ambiguous-pow.patch - 18-fix-ambiguous-pow.patch) - -sha256sums=('51008376a03c6603d0d0f039f3253cda98822fdda757f6cee385b594ef4ac85b' - '1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c' - 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703' - '864967467efeaffdabe1e60b7cfd0a27ce93be55ef45ef9993790219ad164554' - 'e909ae1dcb1d6c0fb0148815c3fcdbff8a15b2f05520eed2c830dc0859f75115') - -_openjdk8dir="/usr/lib/jvm/java-8-openjdk" - -case $CARCH in - 'i686') _CARCH='i386' ;; - 'x86_64')_CARCH='amd64' ;; -esac - -prepare() { - cd "rt-${_hgtag}" - for p in 17-gcc-compatibility.patch 18-fix-ambiguous-pow.patch; do - patch -p1 < "${srcdir}/${p}" - done -} - -build() { - cd "rt-${_hgtag}" - - ln -sf "${srcdir}/gradle.properties" . - export GRADLE_USER_HOME="${srcdir}/gradle_home" - mkdir -p ${GRADLE_USER_HOME} - - "${srcdir}"/gradle-1.8/bin/gradle -} - -package_java-openjfx() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' - depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkit2gtk' 'ffmpeg' 'qt5-base') - conflicts=('openjfx') - replaces=('openjfx') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - - install -d "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" - install -m755 "${_sdkdir}/rt/lib/${_CARCH}"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" - - install -d "${pkgdir}${_openjdk8dir}/jre/lib/ext" - install -m644 "${_sdkdir}/rt/lib/ext"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/ext" - install -m644 "${_sdkdir}/rt/lib"/*.* "${pkgdir}${_openjdk8dir}/jre/lib" - - install -d "${pkgdir}${_openjdk8dir}/lib" - install -m644 "${_sdkdir}/lib"/*.* "${pkgdir}${_openjdk8dir}/lib" - - install -d "${pkgdir}${_openjdk8dir}/bin" - install -m755 "${_sdkdir}/bin"/* "${pkgdir}${_openjdk8dir}/bin" - - install -m644 -D "${_sdkdir}/man/man1/javapackager.1" "${pkgdir}/usr/share/man/man1/javapackager.1" -} - -package_java-openjfx-doc() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - documentation' - conflicts=('openjfx-doc') - replaces=('openjfx-doc') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - local docdir="/usr/share/doc" - - install -d "${pkgdir}${docdir}/openjfx" - cp -dr --no-preserve=ownership "${_builddir}/javadoc"/* "${pkgdir}${docdir}/openjfx" -} - -package_java-openjfx-src() { - pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - sources' - conflicts=('openjfx-src') - replaces=('openjfx-src') - - local _builddir="${srcdir}/rt-${_hgtag}/build" - local _sdkdir="${_builddir}/sdk" - - install -d "${pkgdir}${_openjdk8dir}" - install -m644 "${_builddir}/javafx-src.zip" "${pkgdir}${_openjdk8dir}" -} Copied: java-openjfx/repos/extra-x86_64/PKGBUILD (from rev 307127, java-openjfx/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,114 @@ +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: William Gathoye <william + archlinux at gathoye dot be> +# Contributor: Emanuel Couto <emanuel dot amaral dot couto at gmail dot com> +# Contributor: Richard Jackson <rdjack21 at gmail dot com> +# Contributor: Tinx <arch at tinx dot eu> +# Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de> +# Contributor: Olli <olli at coderkun dot de> + +# Demos available in `` +# To build and test this pakcage: +# - install this version of java-openjfx +# - cd apps/samples +# - ant -Dplatforms.JDK_1.8.home=/usr/lib/jvm/default jar +# - java -jar ./Ensemble8/dist/Ensemble8.jar +# - java -jar ./Modena/dist/Modena.jar +# - java -jar ./3DViewer/dist/3DViewer.jar + +pkgbase=java-openjfx +pkgname=('java-openjfx' 'java-openjfx-doc' 'java-openjfx-src') +_java_ver=8 +_jdk_update=172 +_jdk_build=00 +_hgtag=${_java_ver}u${_jdk_update}-b${_jdk_build} +pkgver=${_java_ver}.u${_jdk_update} +pkgrel=1 +pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' +arch=('i686' 'x86_64') +url='https://wiki.openjdk.java.net/display/OpenJFX/Main' +license=('GPL') +makedepends=('java-environment-openjdk=8' 'bison' 'gperf' 'gtk2' + 'libxtst' 'ffmpeg' 'python2' 'qt5-base' 'webkit2gtk' 'ruby' 'cmake' 'unzip') + # TODO add junit antlr3 swt so that they are not downloaed during the build +source=(http://hg.openjdk.java.net/openjfx/8u-dev/rt/archive/${_hgtag}.tar.bz2 + gradle.properties + https://services.gradle.org/distributions/gradle-1.8-bin.zip + # https://anonscm.debian.org/cgit/pkg-java/openjfx.git/tree/debian/patches/17-gcc-compatibility.patch + 17-gcc-compatibility.patch) + +sha256sums=('435a59c9883ce79b74e2c1e61eac4ce7da54ba58179363a572bfbd8d2363c4bf' + '1d09385ac23d755aec079954247365de3875507641f5ecd7bd3511ebf3fa9e3c' + 'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703' + '864967467efeaffdabe1e60b7cfd0a27ce93be55ef45ef9993790219ad164554') + +_openjdk8dir="/usr/lib/jvm/java-8-openjdk" + +case $CARCH in + 'i686') _CARCH='i386' ;; + 'x86_64')_CARCH='amd64' ;; +esac + +prepare() { + cd "rt-${_hgtag}" + patch -p1 < "${srcdir}/17-gcc-compatibility.patch" +} + +build() { + cd "rt-${_hgtag}" + + ln -sf "${srcdir}/gradle.properties" . + export GRADLE_USER_HOME="${srcdir}/gradle_home" + mkdir -p ${GRADLE_USER_HOME} + + "${srcdir}"/gradle-1.8/bin/gradle +} + +package_java-openjfx() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX)' + depends=('java-runtime-openjdk=8' 'gstreamer' 'libxtst' 'webkit2gtk' 'ffmpeg' 'qt5-base') + conflicts=('openjfx') + replaces=('openjfx') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + + install -d "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" + install -m755 "${_sdkdir}/rt/lib/${_CARCH}"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/${_CARCH}" + + install -d "${pkgdir}${_openjdk8dir}/jre/lib/ext" + install -m644 "${_sdkdir}/rt/lib/ext"/*.* "${pkgdir}${_openjdk8dir}/jre/lib/ext" + install -m644 "${_sdkdir}/rt/lib"/*.* "${pkgdir}${_openjdk8dir}/jre/lib" + + install -d "${pkgdir}${_openjdk8dir}/lib" + install -m644 "${_sdkdir}/lib"/*.* "${pkgdir}${_openjdk8dir}/lib" + + install -d "${pkgdir}${_openjdk8dir}/bin" + install -m755 "${_sdkdir}/bin"/* "${pkgdir}${_openjdk8dir}/bin" + + install -m644 -D "${_sdkdir}/man/man1/javapackager.1" "${pkgdir}/usr/share/man/man1/javapackager.1" +} + +package_java-openjfx-doc() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - documentation' + conflicts=('openjfx-doc') + replaces=('openjfx-doc') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + local docdir="/usr/share/doc" + + install -d "${pkgdir}${docdir}/openjfx" + cp -dr --no-preserve=ownership "${_builddir}/javadoc"/* "${pkgdir}${docdir}/openjfx" +} + +package_java-openjfx-src() { + pkgdesc='Java OpenJFX 8 client application platform (open-source implementation of JavaFX) - sources' + conflicts=('openjfx-src') + replaces=('openjfx-src') + + local _builddir="${srcdir}/rt-${_hgtag}/build" + local _sdkdir="${_builddir}/sdk" + + install -d "${pkgdir}${_openjdk8dir}" + install -m644 "${_builddir}/javafx-src.zip" "${pkgdir}${_openjdk8dir}" +} Deleted: extra-x86_64/gradle.properties =================================================================== --- extra-x86_64/gradle.properties 2017-10-07 15:36:19 UTC (rev 307127) +++ extra-x86_64/gradle.properties 2017-10-07 16:16:59 UTC (rev 307128) @@ -1,4 +0,0 @@ -COMPILE_WEBKIT = true -COMPILE_MEDIA = true -BUILD_JAVADOC = true -BUILD_SRC_ZIP = true Copied: java-openjfx/repos/extra-x86_64/gradle.properties (from rev 307127, java-openjfx/trunk/gradle.properties) =================================================================== --- extra-x86_64/gradle.properties (rev 0) +++ extra-x86_64/gradle.properties 2017-10-07 16:16:59 UTC (rev 307128) @@ -0,0 +1,4 @@ +COMPILE_WEBKIT = true +COMPILE_MEDIA = true +BUILD_JAVADOC = true +BUILD_SRC_ZIP = true