UPDATE: Update to 0.6.0
* Added new required library quazip * Removed various hacks * Using svg and desktop files from source code * Removed cmake patch * Removed patch for newer gcc version
This commit is contained in:
Taylor Smock
parent
e45e6e7fd3
commit
680e467791
18
.SRCINFO
18
.SRCINFO
|
|
@ -1,8 +1,8 @@
|
|||
# Generated by mksrcinfo v8
|
||||
# Fri Oct 27 22:24:18 UTC 2017
|
||||
# Mon Jan 1 12:16:10 UTC 2018
|
||||
pkgbase = multimc5
|
||||
pkgdesc = Minecraft launcher with ability to manage multiple instances.
|
||||
pkgver = 0.5.2
|
||||
pkgver = 0.6.0
|
||||
pkgrel = 1
|
||||
url = http://multimc.org/
|
||||
arch = i686
|
||||
|
|
@ -23,18 +23,12 @@ pkgbase = multimc5
|
|||
optdepends = mcedit: Allows editing of minecraft worlds
|
||||
conflicts = multimc5-git
|
||||
conflicts = multimc-git
|
||||
source = https://github.com/MultiMC/MultiMC5/archive/0.5.2.tar.gz
|
||||
source = https://github.com/MultiMC/MultiMC5/archive/0.6.0.tar.gz
|
||||
source = https://github.com/MultiMC/libnbtplusplus/archive/multimc-0.5.0.tar.gz
|
||||
source = multimc5.sh
|
||||
source = multimc5.desktop
|
||||
source = cmake-patch.diff
|
||||
source = https://github.com/MultiMC/MultiMC5/commit/88041783e6a8c8f4b1e9bda55e6defe9feb7d93b.patch
|
||||
sha512sums = 9ebd46519520f355ad2ec735a7d9f2a4e8273b66c0c13948dcf9e950358eaee90c53bb0aedfd1083323e01417de410c60fbd554fcbf14c0be35764a47152f66d
|
||||
source = https://github.com/MultiMC/quazip/archive/multimc-2.tar.gz
|
||||
sha512sums = f077e49a6cd76c150ea897518665d55eb160ed69891614f6ec5d510d6c4ac7f660b911438d6e50ee6e026a98ca4a2b65b5e7c4888bbefc125dd20680a3e5bc3a
|
||||
sha512sums = 333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68
|
||||
sha512sums = 6d5982ef93ffdf2910c9005d8d647523a7e225f95f6f9e45f2efbb690767a580bfd059804d891ba4507fde97432da73594d202970514476b764dd0cdb50e537c
|
||||
sha512sums = a6712d0e84acc719ed1aff740717add44202f88cb42a0b7a3157108b73a1009ac7edd325f75d372e0a63617f40eb614d55fb4e24e5c1fb8957cd280486070675
|
||||
sha512sums = af4e13cedcf275ca1f95643e88162b741256309f0e6af3629762f204093946cc972a9345f838035777a1e9a64ac0f7893266a43631b9c21967c1b237264ec646
|
||||
sha512sums = 645537ff55fee95f3e8361f62f976852159a62a46538d71e4b537e5d54f59f64addef97121a0f2540f142d74d7d612395a3b56144adbc2d2847abe4a90aec0d9
|
||||
sha512sums = de5169e46018b61f9d1221e537785c19e62d7de57e9726f65668ee5c265b4db8464cc6f8ac48bd28c0166b186fff31115c11e05451259437f3358e3b2c5fc57f
|
||||
|
||||
pkgname = multimc5
|
||||
|
||||
|
|
|
|||
56
PKGBUILD
56
PKGBUILD
|
|
@ -2,10 +2,10 @@
|
|||
# Contributor: b.klettbach@gmail.com
|
||||
|
||||
pkgname=multimc5
|
||||
pkgver=0.5.2
|
||||
pkgver=0.6.0
|
||||
pkgrel=1
|
||||
__pkgver_libnbtplusplus=multimc-0.5.0
|
||||
__install_dir="/usr/lib/multimc5"
|
||||
__pkgver_quazip=multimc-2
|
||||
pkgdesc="Minecraft launcher with ability to manage multiple instances."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://multimc.org/"
|
||||
|
|
@ -16,53 +16,35 @@ optdepends=('mcedit: Allows editing of minecraft worlds')
|
|||
conflicts=('multimc5-git' 'multimc-git')
|
||||
source=("https://github.com/MultiMC/MultiMC5/archive/${pkgver}.tar.gz"
|
||||
"https://github.com/MultiMC/libnbtplusplus/archive/${__pkgver_libnbtplusplus}.tar.gz"
|
||||
'multimc5.sh'
|
||||
'multimc5.desktop'
|
||||
'cmake-patch.diff'
|
||||
'https://github.com/MultiMC/MultiMC5/commit/88041783e6a8c8f4b1e9bda55e6defe9feb7d93b.patch'
|
||||
"https://github.com/MultiMC/quazip/archive/${__pkgver_quazip}.tar.gz"
|
||||
)
|
||||
sha512sums=('9ebd46519520f355ad2ec735a7d9f2a4e8273b66c0c13948dcf9e950358eaee90c53bb0aedfd1083323e01417de410c60fbd554fcbf14c0be35764a47152f66d'
|
||||
sha512sums=('f077e49a6cd76c150ea897518665d55eb160ed69891614f6ec5d510d6c4ac7f660b911438d6e50ee6e026a98ca4a2b65b5e7c4888bbefc125dd20680a3e5bc3a'
|
||||
'333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68'
|
||||
'6d5982ef93ffdf2910c9005d8d647523a7e225f95f6f9e45f2efbb690767a580bfd059804d891ba4507fde97432da73594d202970514476b764dd0cdb50e537c'
|
||||
'a6712d0e84acc719ed1aff740717add44202f88cb42a0b7a3157108b73a1009ac7edd325f75d372e0a63617f40eb614d55fb4e24e5c1fb8957cd280486070675'
|
||||
'af4e13cedcf275ca1f95643e88162b741256309f0e6af3629762f204093946cc972a9345f838035777a1e9a64ac0f7893266a43631b9c21967c1b237264ec646'
|
||||
'645537ff55fee95f3e8361f62f976852159a62a46538d71e4b537e5d54f59f64addef97121a0f2540f142d74d7d612395a3b56144adbc2d2847abe4a90aec0d9')
|
||||
|
||||
|
||||
'de5169e46018b61f9d1221e537785c19e62d7de57e9726f65668ee5c265b4db8464cc6f8ac48bd28c0166b186fff31115c11e05451259437f3358e3b2c5fc57f')
|
||||
prepare() {
|
||||
cd "${srcdir}/MultiMC5-${pkgver}"
|
||||
patch -p1 -i "${srcdir}/cmake-patch.diff"
|
||||
patch -p1 -i "${srcdir}/88041783e6a8c8f4b1e9bda55e6defe9feb7d93b.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
rmdir "${srcdir}/MultiMC5-${pkgver}/libraries/libnbtplusplus" | echo "libnbtplusplus has data"
|
||||
rmdir "${srcdir}/MultiMC5-${pkgver}/libraries/quazip" | echo "quazip has data"
|
||||
cp --recursive "${srcdir}/libnbtplusplus-${__pkgver_libnbtplusplus}/" \
|
||||
"${srcdir}/MultiMC5-${pkgver}/libraries/libnbtplusplus"
|
||||
cp --recursive "${srcdir}/quazip-${__pkgver_quazip}/" \
|
||||
"${srcdir}/MultiMC5-${pkgver}/libraries/quazip"
|
||||
}
|
||||
build() {
|
||||
cd "${srcdir}/MultiMC5-${pkgver}"
|
||||
#sed -i '/add_subdirectory(mmc_updater)/d' CMakeLists.txt
|
||||
mkdir -p build
|
||||
|
||||
cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX="${__install_dir}" -DNBT_USE_ZLIB=ON $srcdir/MultiMC5-${pkgver}
|
||||
cmake -DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_INSTALL_PREFIX="${pkgdir}" \
|
||||
-DMultiMC_UPDATER=OFF \
|
||||
-DMultiMC_LAYOUT=lin-system \
|
||||
..
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/MultiMC5-${pkgver}/build"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
#install -D MultiMC "${pkgdir}/usr/lib/multimc5/MultiMC5"
|
||||
install -D libMultiMC_logic.so \
|
||||
"${pkgdir}/usr/lib/multimc5/bin/libMultiMC_logic.so"
|
||||
install -D libMultiMC_rainbow.so \
|
||||
"${pkgdir}/${__install_dir}/bin/libMultiMC_rainbow.so"
|
||||
install -D libMultiMC_gui.so \
|
||||
"${pkgdir}/${__install_dir}/bin/libMultiMC_gui.so"
|
||||
install -D libMultiMC_nbt++.so \
|
||||
"${pkgdir}/${__install_dir}/bin/libMultiMC_nbt++.so"
|
||||
install -D "${srcdir}/multimc5.sh" "${pkgdir}/usr/bin/multimc5"
|
||||
install -D \
|
||||
"${srcdir}/MultiMC5-${pkgver}/application/resources/multimc/scalable/multimc.svg" \
|
||||
"${pkgdir}/usr/share/pixmaps/multimc5.svg"
|
||||
install -D "${srcdir}/multimc5.desktop" \
|
||||
"${pkgdir}/usr/share/applications/multimc5.desktop"
|
||||
make install
|
||||
install -D "${srcdir}/MultiMC5-${pkgver}/application/resources/multimc/scalable/multimc.svg" "${pkgdir}/usr/share/pixmaps/multimc.svg"
|
||||
install -D "${srcdir}/MultiMC5-${pkgver}/application/package/linux/multimc.desktop" "${pkgdir}/usr/share/applications/multimc.desktop"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
|
||||
index d9c37a4..b3a5985 100644
|
||||
--- a/application/CMakeLists.txt
|
||||
+++ b/application/CMakeLists.txt
|
||||
@@ -459,12 +459,12 @@ else()
|
||||
endif()
|
||||
|
||||
# qtconf
|
||||
-install(
|
||||
- CODE "
|
||||
-file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
|
||||
-"
|
||||
- COMPONENT Runtime
|
||||
-)
|
||||
+# install(
|
||||
+# CODE "
|
||||
+# file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
|
||||
+# "
|
||||
+# COMPONENT Runtime
|
||||
+# )
|
||||
|
||||
# ICNS file for OS X
|
||||
if(APPLE)
|
||||
diff --git a/application/install_prereqs.cmake.in b/application/install_prereqs.cmake.in
|
||||
index 11c8bbc..ba40cbc 100644
|
||||
--- a/application/install_prereqs.cmake.in
|
||||
+++ b/application/install_prereqs.cmake.in
|
||||
@@ -26,5 +26,5 @@ set(gp_cmd_paths ${gp_cmd_paths}
|
||||
)
|
||||
|
||||
include(BundleUtilities)
|
||||
-fixup_bundle("@APPS@" "${QTPLUGINS}" "@DIRS@")
|
||||
+# fixup_bundle("@APPS@" "${QTPLUGINS}" "@DIRS@")
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
#!/usr/bin/env xdg-open
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Encoding=UTF-8
|
||||
Name=MultiMC5
|
||||
GenericName=MultiMC5
|
||||
Comment=MultiMC5
|
||||
Type=Application
|
||||
Exec=multimc5
|
||||
Icon=multimc5
|
||||
Categories=Application;Game
|
||||
27
multimc5.sh
27
multimc5.sh
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Usage: $0 [DATA_DIR] [NAME]
|
||||
set -e
|
||||
set -x
|
||||
function variables() {
|
||||
NAME="${2:-multimc}"
|
||||
if [ "${1}" ]; then
|
||||
DATA_DIR="${1}"
|
||||
else
|
||||
if [ "${XDG_DATA_HOME}" ]; then
|
||||
DATA_DIR="${XDG_DATA_HOME}/${NAME}"
|
||||
elif [ -d "${HOME}/.local/share" ]; then
|
||||
DATA_DIR="${HOME}/.local/share/${NAME}"
|
||||
else
|
||||
DATA_DIR="${HOME}/.${NAME}"
|
||||
fi
|
||||
fi
|
||||
echo ${DATA_DIR}
|
||||
}
|
||||
|
||||
function main() {
|
||||
variables $@
|
||||
mkdir --parents "${DATA_DIR}"
|
||||
/usr/lib/multimc5/MultiMC5 --dir "${DATA_DIR}" | \
|
||||
/usr/lib/multimc5/MultiMC --dir "${DATA_DIR}"
|
||||
}
|
||||
main $@
|
||||
Reference in a new issue