diff options
author | Petr Mrázek | 2019-07-11 01:24:42 +0200 |
---|---|---|
committer | Petr Mrázek | 2019-07-11 01:24:42 +0200 |
commit | 9f861d80562c163cafbd815717c2ca8acc6ea7bd (patch) | |
tree | 9813a1eace842e047d885c2ccffc2cb0c6039248 | |
parent | 845d2e2132cb6b6d2f1aa9b820f523c3975a8e2a (diff) | |
download | aur-9f861d80562c163cafbd815717c2ca8acc6ea7bd.tar.gz |
Require and use a specific version of the jdk for building. Bump version.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rwxr-xr-x | PKGBUILD | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = multimc-git pkgdesc = Free, open source launcher and instance manager for Minecraft. - pkgver = 0.6.5.r24.g6c30076b + pkgver = 0.6.6.r0.gb9d42935 pkgrel = 1 url = http://multimc.org/ arch = i686 @@ -10,7 +10,7 @@ pkgbase = multimc-git makedepends = cmake makedepends = qt5-tools makedepends = qt5-x11extras - makedepends = java-environment + makedepends = jdk8-openjdk depends = zlib depends = libgl depends = qt5-base @@ -1,14 +1,14 @@ # Maintainer: peterix@gmail.com pkgname=multimc-git -pkgver=0.6.5.r24.g6c30076b +pkgver=0.6.6.r0.gb9d42935 pkgrel=1 pkgdesc="Free, open source launcher and instance manager for Minecraft." arch=('i686' 'x86_64') url="http://multimc.org/" license=('Apache') depends=('zlib' 'libgl' 'qt5-base' 'qt5-x11extras' 'java-runtime' 'qt5-svg' 'xorg-xrandr') -makedepends=('git' 'cmake' 'qt5-tools' 'qt5-x11extras' 'java-environment') +makedepends=('git' 'cmake' 'qt5-tools' 'qt5-x11extras' 'jdk8-openjdk') conflicts=('multimc' 'multimc5' 'multimc5-git') provides=('multimc' 'multimc5' 'multimc5-git') replaces=('multimc5-git') @@ -26,15 +26,15 @@ prepare() { } build() { + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk/ cd "$srcdir/$pkgname" mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release \ - -DMultiMC_UPDATER=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMultiMC_LAYOUT=lin-system \ - -DMultiMC_NOTIFICATION_URL:STRING=http://files.multimc.org/notifications.json \ + -DMultiMC_NOTIFICATION_URL:STRING=https://files.multimc.org/notifications.json \ .. make } |