MULTIMC: Update to version 0.5.0

2 files changed, 19 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b9eb96fe44e..9f5b6fc0e0c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb 29 12:17:39 UTC 2016
+# Sun Jan 15 12:57:55 UTC 2017
 pkgbase = multimc5
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
-	pkgver = 0.4.11
+	pkgver = 0.5.0
 	pkgrel = 1
 	url = http://multimc.org/
 	arch = i686
@@ -22,13 +22,13 @@ pkgbase = multimc5
 	depends = qt5-svg
 	optdepends = mcedit: Allows editing of minecraft worlds
 	conflicts = multimc5-git
-	source = https://github.com/MultiMC/MultiMC5/archive/0.4.11.tar.gz
-	source = https://github.com/MultiMC/libnbtplusplus/archive/v2.3.1-alpha.tar.gz
+	source = https://github.com/MultiMC/MultiMC5/archive/0.5.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
-	sha512sums = b2d2da85e5c61aed41d6be40e20e54a19b7d7b42570e16113c16018954b4b717804aea1e0f7f1a6201cf7e23629a73ba155c10e8b1aabd064068769cbe7097b3
-	sha512sums = 5e7a85275b7452ce1f507273e1ee264df8ba6536c431df8d223f2512b4823417f9699c1403108468c066c0f7f9bd359bce27cd3a33f35726fb6ba1a2d9b8e4de
+	sha512sums = 290949b17acd008697e5752c201f3076f02c12719a8ee3d685564a276af12b990b49d1f0f7b28fa4db78d2e0af10bc503cfb48ccfb7c28bae0b80a13d9594d14
+	sha512sums = 333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68
 	sha512sums = 6f891ba6b1d940297ffd1b6007f65ce64abe4f6c7bd8ce7d5204fe9886f006f5080c2cb26c7adfaf00e281f92342e5280f2c675b74c3e9b6f5a769169d56dd26
 	sha512sums = a6712d0e84acc719ed1aff740717add44202f88cb42a0b7a3157108b73a1009ac7edd325f75d372e0a63617f40eb614d55fb4e24e5c1fb8957cd280486070675
 	sha512sums = af4e13cedcf275ca1f95643e88162b741256309f0e6af3629762f204093946cc972a9345f838035777a1e9a64ac0f7893266a43631b9c21967c1b237264ec646
diff --git a/PKGBUILD b/PKGBUILD
index f76fab843630..3e9537b7bb38 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # Contributor: b.klettbach@gmail.com
 
 pkgname=multimc5
-pkgver=0.4.11
-__pkgver_libnbtplusplus=2.3.1-alpha
+pkgver=0.5.0
+__pkgver_libnbtplusplus=multimc-${pkgver}
+__install_dir="/usr/lib/multimc5"
 pkgrel=1
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'x86_64')
@@ -14,13 +15,13 @@ makedepends=('git' 'patch' 'cmake' 'qt5-tools' 'qt5-x11extras' 'java-environment
 optdepends=('mcedit: Allows editing of minecraft worlds')
 conflicts=('multimc5-git')
 source=("https://github.com/MultiMC/MultiMC5/archive/${pkgver}.tar.gz"
-  "https://github.com/MultiMC/libnbtplusplus/archive/v${__pkgver_libnbtplusplus}.tar.gz"
+  "https://github.com/MultiMC/libnbtplusplus/archive/${__pkgver_libnbtplusplus}.tar.gz"
   'multimc5.sh'
   'multimc5.desktop'
   'cmake-patch.diff'
 )
-sha512sums=('b2d2da85e5c61aed41d6be40e20e54a19b7d7b42570e16113c16018954b4b717804aea1e0f7f1a6201cf7e23629a73ba155c10e8b1aabd064068769cbe7097b3'
-            '5e7a85275b7452ce1f507273e1ee264df8ba6536c431df8d223f2512b4823417f9699c1403108468c066c0f7f9bd359bce27cd3a33f35726fb6ba1a2d9b8e4de'
+sha512sums=('290949b17acd008697e5752c201f3076f02c12719a8ee3d685564a276af12b990b49d1f0f7b28fa4db78d2e0af10bc503cfb48ccfb7c28bae0b80a13d9594d14'
+            '333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68'
             '6f891ba6b1d940297ffd1b6007f65ce64abe4f6c7bd8ce7d5204fe9886f006f5080c2cb26c7adfaf00e281f92342e5280f2c675b74c3e9b6f5a769169d56dd26'
             'a6712d0e84acc719ed1aff740717add44202f88cb42a0b7a3157108b73a1009ac7edd325f75d372e0a63617f40eb614d55fb4e24e5c1fb8957cd280486070675'
             'af4e13cedcf275ca1f95643e88162b741256309f0e6af3629762f204093946cc972a9345f838035777a1e9a64ac0f7893266a43631b9c21967c1b237264ec646')
@@ -32,13 +33,14 @@ prepare() {
 }
 
 build() {
-  rmdir "${srcdir}/MultiMC5-${pkgver}/depends/libnbtplusplus" | echo "libnbtplusplus has data"
-  cp --recursive "${srcdir}/libnbtplusplus-${__pkgver_libnbtplusplus}/" "${srcdir}/MultiMC5-${pkgver}/depends/libnbtplusplus"
+  rmdir "${srcdir}/MultiMC5-${pkgver}/libraries/libnbtplusplus" | echo "libnbtplusplus has data"
+  cp --recursive "${srcdir}/libnbtplusplus-${__pkgver_libnbtplusplus}/" \
+    "${srcdir}/MultiMC5-${pkgver}/libraries/libnbtplusplus"
   cd "${srcdir}/MultiMC5-${pkgver}"
   #sed -i '/add_subdirectory(mmc_updater)/d' CMakeLists.txt
   mkdir -p build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX="/usr/lib/multimc5" -DNBT_USE_ZLIB=ON $srcdir/MultiMC5-${pkgver}
+  cmake -DCMAKE_INSTALL_PREFIX="${__install_dir}" -DNBT_USE_ZLIB=ON $srcdir/MultiMC5-${pkgver}
   make
 }
 
@@ -48,7 +50,9 @@ package() {
   #install -D MultiMC "${pkgdir}/usr/lib/multimc5/MultiMC5"
   install -D libMultiMC_logic.so \
     "${pkgdir}/usr/lib/multimc5/bin/libMultiMC_logic.so"
-  install -D librainbow.so "${pkgdir}/usr/lib/multimc5/bin/librainbow.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 "${srcdir}/multimc5.sh" "${pkgdir}/usr/bin/multimc5"
   install -D \
     "${srcdir}/MultiMC5-${pkgver}/application/resources/multimc/scalable/multimc.svg" \