summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Callear2018-04-25 10:19:15 -0600
committerZach Callear2018-04-25 10:19:15 -0600
commitba6097a7abe80c22793fef9884703fd9a93ec44e (patch)
tree17feef55b8bf0fa7d425facff3c992573e126e27
parent07c097567b99a3c1f09f10494f95495803778a53 (diff)
downloadaur-ba6097a7abe80c22793fef9884703fd9a93ec44e.tar.gz
Explicitly require OpenJDK 7 for build
Although this can build on OpenJDK 8, specifying that with java-environment and limiting the version still results in the user getting a prompt to pick the specific version they want. Requiring specifically OpenJDK 7, as the official package does, makes it much more foolproof for the user.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e94c3ce2131..d4f310ffe2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = java8-openjdk
pkgver = 8.u172
- pkgrel = 1
+ pkgrel = 2
url = http://openjdk.java.net/
arch = x86_64
arch = i686
license = custom
- makedepends = java-environment>=7
- makedepends = java-environment<9
+ makedepends = jdk7-openjdk
makedepends = ccache
makedepends = cpio
makedepends = unzip
@@ -53,7 +52,7 @@ pkgname = jre8-openjdk-headless-infinality
pkgname = jre8-openjdk-infinality
pkgdesc = OpenJDK Java 8 full runtime environment with infinality patch applied
install = install_jre8-openjdk.sh
- depends = jre8-openjdk-headless-infinality=8.u172-1
+ depends = jre8-openjdk-headless-infinality=8.u172-2
depends = xdg-utils
depends = hicolor-icon-theme
optdepends = icedtea-web: web browser plugin + Java Web Start
@@ -69,7 +68,7 @@ pkgname = jdk8-openjdk-infinality
pkgdesc = OpenJDK Java 8 development kit with infinality patch applied
install = install_jdk8-openjdk.sh
depends = java-environment-common
- depends = jre8-openjdk-infinality=8.u172-1
+ depends = jre8-openjdk-infinality=8.u172-2
provides = java-environment=8
provides = java-environment-openjdk=8
conflicts = jdk8-openjdk
diff --git a/PKGBUILD b/PKGBUILD
index ab456a4b27c..21ebf180ffa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,11 +18,11 @@ _jdk_update=172
_jdk_build=11
pkgver=${_java_ver}.u${_jdk_update}
_repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
arch=('x86_64' 'i686')
url='http://openjdk.java.net/'
license=('custom')
-makedepends=('java-environment>=7' 'java-environment<9' 'ccache' 'cpio' 'unzip' 'zip'
+makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
_url_src=http://hg.openjdk.java.net/jdk8u/jdk8u
source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz