MultiMC: update to 0.4.11.

This commit is contained in:
Spencer Hill 2016-04-02 03:37:33 -04:00 committed by Juan RP
parent 1f5a8c55ae
commit a20e6b1f94
3 changed files with 15 additions and 22 deletions

View File

@ -1,2 +1,2 @@
#/bin/sh
#!/bin/sh
/usr/share/multimc/MultiMC -d ~/.multimc

View File

@ -1,15 +0,0 @@
diff --git a/MultiMC.cpp b/MultiMC.cpp.fixed
index 39cc850..be10ffc 100644
--- application/MultiMC.cpp
+++ application/MultiMC.cpp
@@ -154,8 +154,7 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
// static data paths... mostly just for translations
#ifdef Q_OS_LINUX
- QDir foo(PathCombine(binPath, ".."));
- staticDataPath = foo.absolutePath();
+ staticDataPath = dataPath;
#elif defined(Q_OS_WIN32)
staticDataPath = binPath;
#elif defined(Q_OS_MAC)

View File

@ -1,21 +1,26 @@
# Template file for 'MultiMC'
pkgname=MultiMC
version=0.4.7
version=0.4.11
revision=1
_commithashmmc="a3cd3d5ff18215a475ed6b5f231f3f02ccd668f7"
_commithashnbt="5d0ffb50a526173ce58ae57136bf5d79a7e1920d"
build_style=cmake
hostmakedepends="openjdk cmake xxd"
makedepends="qt5-devel qt5-x11extras-devel gtk+-devel"
hostmakedepends="openjdk cmake xxd git-all"
makedepends="qt5-devel qt5-x11extras-devel qt5-svg-devel gtk+-devel"
depends="virtual?java-environment"
short_desc="An instanced Minecraft client"
maintainer="Spencer H <spencernh77@gmail.com>"
license="Apache 2.0"
homepage="http://multimc.org"
distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${version}.tar.gz"
checksum=961ece29094931b0638244c4a2614623d6df3193ee1a9e156ed36c01325ebae0
wrksrc=${pkgname}5-$version
distfiles="https://github.com/${pkgname}/${pkgname}5/archive/${_commithashmmc}.tar.gz https://github.com/${pkgname}/libnbtplusplus/archive/${_commithashnbt}.tar.gz"
checksum="3c5d7ecf7d5b9d25304284b76cf15f70c9aae70be824fe351ff28d9a3851801c 893a4e639f300a121237e4cc83c39dd5701e7119ea79216f2e8fd1906dc2f1f4"
wrksrc=${pkgname}5-${_commithashmmc}
skip_extraction="${_commithashnbt}.tar.gz"
pre_configure() {
export JAVA_HOME=/usr/lib/jvm/openjdk
export PATH=$PATH:$JAVA_HOME/bin
tar zxvf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_commithashnbt}.tar.gz -C ${wrksrc}/depends/libnbtplusplus --strip-components 1
}
do_install() {
@ -23,5 +28,8 @@ do_install() {
vmkdir usr/share/multimc/jars
vcopy build/MultiMC usr/share/multimc
vcopy build/jars/*.jar usr/share/multimc/jars
vinstall build/librainbow.so 755 /usr/lib
vinstall build/libMultiMC_logic.so 755 /usr/lib
vinstall build/libnbt++.so 755 /usr/lib
vbin ${FILESDIR}/MultiMC.sh MultiMC
}