[notify] multimc: 0.6.12 -> 0.6.13 dependency change: openjdk8 -> openjdk11-jdk

4 files changed, 28 insertions, 18 deletions

diff --git a/multimc/.footprint b/multimc/.footprint
index 186cf5ebc..67d239391 100644
--- a/multimc/.footprint
+++ b/multimc/.footprint
@@ -2,9 +2,7 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/multimc
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libMultiMC_gui.so
 -rwxr-xr-x	root/root	usr/lib/libMultiMC_iconfix.so
--rwxr-xr-x	root/root	usr/lib/libMultiMC_logic.so
 -rwxr-xr-x	root/root	usr/lib/libMultiMC_nbt++.so
 -rwxr-xr-x	root/root	usr/lib/libMultiMC_quazip.so
 -rwxr-xr-x	root/root	usr/lib/libMultiMC_rainbow.so
diff --git a/multimc/.signature b/multimc/.signature
index ef40ed925..d1836aa39 100644
--- a/multimc/.signature
+++ b/multimc/.signature
@@ -1,8 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF375psAzDhAe53uqVVjxdDbs0PWNAf1SniUrGC0zdG7x9GtiXQ6ofiCfUDD4d/lyDJ6lMu3nw9kEG9G25HtD2fQo=
-SHA256 (Pkgfile) = ac912f64ba1d40a6d0e50b8148d1280bd1407e3ca7ae1d56923f32faae1cd0dd
-SHA256 (.footprint) = 1c4976080d5cc2d0c797311744a9865a39390ecd7ab5d268c375d540a0ffb8b8
-SHA256 (MultiMC5-0.6.12.tar.gz) = c251744b77d93db4ead56940b7b81d30dc5390fb86a1676d3f0364cc4e570185
+RWSagIOpLGJF38S3RLmFugJ4Zdvtbb40TW8pg1JwITzS1SLqk8QnKKOERBbp8qIFBPGV+8G5oINdaxVowhyuY6Z32qsdiqDzhA0=
+SHA256 (Pkgfile) = fdf8bbfeac4a5cf82233ee4d6737b12a83a02111ed273d45e84dcec30fc89d90
+SHA256 (.footprint) = e9a4a28059c35431dcd80a096e8622462fdb3f7691b894c71689653e98fba78c
+SHA256 (MultiMC5-0.6.13.tar.gz) = af083b41bda801c6d2b6639a2b7a8cfa3a472b1b5942a5af485900449343b967
 SHA256 (multimc-3.tar.gz) = ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18
 SHA256 (multimc-0.6.1.tar.gz) = 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
 SHA256 (quazip-fix-build-with-qt-511.patch) = 83906ae48e7861d149a93cd6ce7c083f52c67dd36589e84668881c8e8de1f868
+SHA256 (modern-java.patch) = 72dd9554a73d78c27ed26004d740be6955fd82e025580890438eac247049e9ae
diff --git a/multimc/Pkgfile b/multimc/Pkgfile
index a95d6e72a..b4f0b45bd 100644
--- a/multimc/Pkgfile
+++ b/multimc/Pkgfile
@@ -1,32 +1,31 @@
 # Description: Minecraft launcher with ability to manage multiple instances.
 # URL: https://multimc.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: openjdk8 qt5
+# Depends on: openjdk11-jdk qt5
 
 name=multimc
-version=0.6.12
+version=0.6.13
 release=1
-source=(
-	https://github.com/MultiMC/MultiMC5/archive/$version/MultiMC5-$version.tar.gz
+source=(https://github.com/MultiMC/MultiMC5/archive/$version/MultiMC5-$version.tar.gz
 	https://github.com/MultiMC/quazip/archive/multimc-3.tar.gz
 	https://github.com/MultiMC/libnbtplusplus/archive/multimc-0.6.1.tar.gz
 	quazip-fix-build-with-qt-511.patch
-)
+	modern-java.patch)
  
 build() {
 	cd MultiMC5-$version
 
 	rmdir libraries/libnbtplusplus
 	rmdir libraries/quazip
-	cp --recursive $SRC/libnbtplusplus-multimc-0.6.1/ \
-		libraries/libnbtplusplus
-	cp --recursive $SRC/quazip-multimc-3/ \
-		libraries/quazip
+	ln -sfT $SRC/libnbtplusplus-multimc-0.6.1/ libraries/libnbtplusplus
+	ln -sfT $SRC/quazip-multimc-3/ libraries/quazip
 
 	# https://github.com/MultiMC/quazip/pull/1
 	patch -d libraries/quazip -p1 -i $SRC/quazip-fix-build-with-qt-511.patch
 
-	export JAVA_HOME="/usr/lib/java/openjdk8/"
+	patch -p1 -i $SRC/modern-java.patch
+
+	export JAVA_HOME="/usr/lib/java/openjdk11-jdk/"
 
 	mkdir -p build
 	cd build
@@ -41,10 +40,10 @@ build() {
 	make
 	make DESTDIR=$PKG install
 
-	install -D $SRC/MultiMC5-$version/application/resources/multimc/scalable/multimc.svg \
+	install -D $SRC/MultiMC5-$version/launcher/resources/multimc/scalable/multimc.svg \
 		$PKG/usr/share/pixmaps/multimc.svg
 
-	install -D $SRC/MultiMC5-$version/application/package/linux/multimc.desktop \
+	install -D $SRC/MultiMC5-$version/launcher/package/linux/multimc.desktop \
 		 $PKG/usr/share/applications/multimc.desktop
 
 	install -D $SRC/MultiMC5-$version/build/libMultiMC_quazip.so \
diff --git a/multimc/modern-java.patch b/multimc/modern-java.patch
new file mode 100644
index 000000000..5ae55ca63
--- /dev/null
+++ b/multimc/modern-java.patch
@@ -0,0 +1,12 @@
+diff -r -U 0 a/libraries/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt
+--- a/libraries/javacheck/CMakeLists.txt	2019-08-05 00:46:59.000000000 +0200
++++ b/libraries/javacheck/CMakeLists.txt	2019-09-27 21:47:16.033545671 +0200
+@@ -7 +7 @@
+-set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
++set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked)
+diff -r -U 0 a/libraries/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt
+--- a/libraries/launcher/CMakeLists.txt	2019-08-05 00:46:59.000000000 +0200
++++ b/libraries/launcher/CMakeLists.txt	2019-09-27 21:47:36.803357383 +0200
+@@ -7 +7 @@
+-set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
++set(CMAKE_JAVA_COMPILE_FLAGS -target 8 -source 8 -Xlint:deprecation -Xlint:unchecked)