diff options
Diffstat (limited to 'libre/java8-openjdk/PKGBUILD')
| -rw-r--r-- | libre/java8-openjdk/PKGBUILD | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD index 7ec5d8f3d..dd66e66da 100644 --- a/libre/java8-openjdk/PKGBUILD +++ b/libre/java8-openjdk/PKGBUILD @@ -15,7 +15,7 @@ _jdk_update=20 _jdk_build=23 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgrel=3.parabola1 +pkgrel=4.parabola1 arch=('i686' 'x86_64') url='http://openjdk.java.net/' license=('custom') @@ -31,7 +31,6 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz 001_adjust-mflags-for-gmake-4.patch - 002_gcc.make-4.9.patch 003_nonreparenting-wm.patch) sha256sums=('ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237' @@ -43,7 +42,6 @@ sha256sums=('ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237' '05177c5ba5ec95d041d46e871358692ff1e62f8568c8c9580688b39e5165d580' '2499b19562e320eb304be8797c2a895f1fe2ab2d16fd7da68aeaed180b3f1899' '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9' - '5b1ed72ffd14a18e36aba2129e0781696b8c9cccd060bf4dbe1c4b9a44100b69' '7d3d7ce8661d0f33ff9ad8247f8cfef528c4dff74615e64fa0ac87f4beb78db4') case "${CARCH}" in @@ -71,8 +69,6 @@ prepare() { cd "${srcdir}/jdk8u-${_repo_ver}/hotspot" # https://bugs.openjdk.java.net/browse/JDK-8028407 patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch" - # https://bugs.openjdk.java.net/browse/JDK-8041658 - patch -p1 < "${srcdir}/002_gcc.make-4.9.patch" cd "${srcdir}/jdk8u-${_repo_ver}/jdk" # https://bugs.archlinux.org/task/41846 @@ -131,7 +127,7 @@ build() { package_jre8-openjdk-headless() { pkgdesc='OpenJDK Java 8 headless runtime environment (Parabola rebranded)' - depends=('java-common' 'ca-certificates-java' 'nss') + depends=('java-runtime-common' 'ca-certificates-java' 'nss') optdepends=('java-rhino: for some JavaScript support') provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') # Upstream config files that should go to etc and get backup @@ -240,7 +236,7 @@ package_jre8-openjdk() { package_jdk8-openjdk() { pkgdesc='OpenJDK Java 8 development kit (Parabola rebranded)' - depends=("jre8-openjdk=${pkgver}-${pkgrel}") + depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}") provides=('java-environment=8' 'java-environment-openjdk=8') replaces=('jdk8-openjdk-wm') install=install_jdk8-openjdk.sh |