summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorseth2023-06-25 23:58:33 -0400
committerseth2023-06-25 23:58:33 -0400
commit639e7b6e32b7ff72730c4c0f4bd845cf6971697f (patch)
tree6b7e2a74c11b9e1b119f3682b3780a96707c73e5
parentee40b2167caf0c187723656d88597099dae6d187 (diff)
downloadaur-639e7b6e32b7ff72730c4c0f4bd845cf6971697f.tar.gz
specify java 17 in (make)depends + add jre8 to optdepends
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 91bdfff6804b..a2bac88403a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = prismlauncher-git
pkgdesc = Minecraft launcher with ability to manage multiple instances.
- pkgver = 6.0.r238.gdeed4957
+ pkgver = 8.0.r238.gdeed4957
pkgrel = 2
url = https://prismlauncher.org
arch = i686
@@ -10,11 +10,11 @@ pkgbase = prismlauncher-git
makedepends = cmake
makedepends = extra-cmake-modules
makedepends = git
- makedepends = java-environment
+ makedepends = jdk17-openjdk
makedepends = scdoc
makedepends = ghc-filesystem
makedepends = gamemode
- depends = java-runtime
+ depends = java-runtime=17
depends = libgl
depends = qt6-base
depends = qt6-5compat
@@ -29,6 +29,7 @@ pkgbase = prismlauncher-git
optdepends = openal: to use system OpenAL libraries
optdepends = visualvm: Profiling support
optdepends = xorg-xrandr: for older minecraft versions
+ optdepends = java-runtime=8: for older minecraft versions
provides = prismlauncher
conflicts = prismlauncher
options = debug
diff --git a/PKGBUILD b/PKGBUILD
index 28549304d612..ceb4f3177f20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
# Maintainer: Sefa Eyeoglu <contact@scrumplex.net>
# Maintainer: txtsd <aur.archlinux@ihavea.quest>
+# Maintainer: seth <getchoo at tuta dot io>
# Contributor: Elijah Gregg <lovetocode999 at tilde dot team>
# Contributor: Lenny McLennington <lennymclennington@protonmail.com>
# Contributor: Miko <mikoxyzzz@gmail.com>
@@ -13,14 +14,15 @@ pkgdesc="Minecraft launcher with ability to manage multiple instances."
arch=('i686' 'x86_64' 'aarch64')
url="https://prismlauncher.org"
license=('GPL3')
-depends=('java-runtime' 'libgl' 'qt6-base' 'qt6-5compat' 'qt6-svg' 'qt6-imageformats' 'zlib' 'hicolor-icon-theme' 'quazip-qt6' 'cmark' 'tomlplusplus')
+depends=('java-runtime=17' 'libgl' 'qt6-base' 'qt6-5compat' 'qt6-svg' 'qt6-imageformats' 'zlib' 'hicolor-icon-theme' 'quazip-qt6' 'cmark' 'tomlplusplus')
provides=('prismlauncher')
conflicts=('prismlauncher')
-makedepends=('cmake' 'extra-cmake-modules' 'git' 'java-environment' 'scdoc' 'ghc-filesystem' 'gamemode')
+makedepends=('cmake' 'extra-cmake-modules' 'git' 'jdk17-openjdk' 'scdoc' 'ghc-filesystem' 'gamemode')
optdepends=('glfw: to use system GLFW libraries'
'openal: to use system OpenAL libraries'
'visualvm: Profiling support'
'xorg-xrandr: for older minecraft versions'
+ 'java-runtime=8: for older minecraft versions'
)
options=(debug)
source=("git+https://github.com/PrismLauncher/PrismLauncher.git"
@@ -35,6 +37,7 @@ pkgver() {
prepare() {
cd "PrismLauncher"
+
git submodule init
git config submodule.libraries/cmark.active false
git config submodule.libraries/extra-cmake-modules.active false
@@ -47,6 +50,7 @@ prepare() {
}
build() {
+ export PATH="/usr/lib/jvm/java-17-openjdk/bin:$PATH"
cmake -DCMAKE_BUILD_TYPE= \
-DCMAKE_INSTALL_PREFIX="/usr" \