Update to 0.6.6, constrain java version

Doesn't build with Java 12 ("error: Source option 6 is no longer supported. Use 7 or later.").

If building on a dirty system, use archlinux-java to select a fitting
version.

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed5446544139..f5ff3d2cb614 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,31 @@
 pkgbase = multimc5
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
-	pkgver = 0.6.5
-	pkgrel = 2
+	pkgver = 0.6.6
+	pkgrel = 1
 	url = http://multimc.org/
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = cmake
-	makedepends = java-environment
+	makedepends = java-environment<12
 	depends = zlib
 	depends = libgl
 	depends = qt5-base
 	depends = qt5-x11extras
-	depends = java-runtime
+	depends = java-runtime<12
 	depends = qt5-svg
 	depends = xorg-xrandr
 	optdepends = mcedit: Allows editing of minecraft worlds
 	provides = multimc
 	conflicts = multimc
-	source = https://github.com/MultiMC/MultiMC5/archive/0.6.5.tar.gz
+	source = https://github.com/MultiMC/MultiMC5/archive/0.6.6.tar.gz
 	source = https://github.com/MultiMC/libnbtplusplus/archive/multimc-0.6.1.tar.gz
 	source = https://github.com/MultiMC/quazip/archive/multimc-3.tar.gz
 	source = quazip-fix-build-with-qt-511.patch
-	source = fix_shared_ptr_crashes.patch
-	sha512sums = 472c676223c180e176e1430d880cc7449118c7af501bb5354286158151b513b0b510c9c5ba1f4cf5e49ea46863b582dbf8ade84e1ec6b7716b297cbec9582082
+	sha512sums = b948d18ba48fafae449682a60e47a22d280e2a5f7d5c0b3fae380246c770943f46891bfa36eda9dd875ea02b3bc92161bcfbb3d528173dedb4fd801243e769e0
 	sha512sums = 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d
 	sha512sums = 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0
 	sha512sums = ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4
-	sha512sums = 3fde1fcac58e4ba80871443af7e8a7664e3973d1f6b1bf4bfe96fdbc64e75f624023d4938e03f32a44af9468af52aa58e1f61de5a13324254600ab869e417fa1
 
 pkgname = multimc5
 
diff --git a/PKGBUILD b/PKGBUILD
index 9da2097aff54..ec4acd327ec0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,29 @@
 # Contributor: b.klettbach@gmail.com
 
 pkgname=multimc5
-pkgver=0.6.5
-pkgrel=2
+pkgver=0.6.6
+pkgrel=1
 __pkgver_libnbtplusplus=multimc-0.6.1
 __pkgver_quazip=multimc-3
 pkgdesc="Minecraft launcher with ability to manage multiple instances."
 arch=('i686' 'x86_64')
 url="http://multimc.org/"
 license=('Apache')
-depends=('zlib' 'libgl' 'qt5-base' 'qt5-x11extras' 'java-runtime' 'qt5-svg' 'xorg-xrandr')
+depends=('zlib' 'libgl' 'qt5-base' 'qt5-x11extras' 'java-runtime<12' 'qt5-svg' 'xorg-xrandr')
 provides=('multimc')
 conflicts=('multimc')
-makedepends=('cmake' 'java-environment')
+makedepends=('cmake' 'java-environment<12')
 optdepends=('mcedit: Allows editing of minecraft worlds')
 
 source=("https://github.com/MultiMC/MultiMC5/archive/${pkgver}.tar.gz"
         "https://github.com/MultiMC/libnbtplusplus/archive/${__pkgver_libnbtplusplus}.tar.gz"
         "https://github.com/MultiMC/quazip/archive/${__pkgver_quazip}.tar.gz"
         "quazip-fix-build-with-qt-511.patch"
-        "fix_shared_ptr_crashes.patch"
 )
-sha512sums=('472c676223c180e176e1430d880cc7449118c7af501bb5354286158151b513b0b510c9c5ba1f4cf5e49ea46863b582dbf8ade84e1ec6b7716b297cbec9582082'
+sha512sums=('b948d18ba48fafae449682a60e47a22d280e2a5f7d5c0b3fae380246c770943f46891bfa36eda9dd875ea02b3bc92161bcfbb3d528173dedb4fd801243e769e0'
             '81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d'
             '2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0'
-            'ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4'
-            '3fde1fcac58e4ba80871443af7e8a7664e3973d1f6b1bf4bfe96fdbc64e75f624023d4938e03f32a44af9468af52aa58e1f61de5a13324254600ab869e417fa1')
+            'ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4')
 prepare() {
   cd "${srcdir}/MultiMC5-${pkgver}"
 
@@ -38,8 +36,6 @@ prepare() {
   cp --recursive "${srcdir}/quazip-${__pkgver_quazip}/" \
     "libraries/quazip"
 
-  patch -p1 < "${srcdir}/fix_shared_ptr_crashes.patch"
-
   cd "libraries/quazip"
   # https://github.com/MultiMC/quazip/pull/1
   patch -p1 < "${srcdir}/quazip-fix-build-with-qt-511.patch"