From 4095ae4b0bdfe7f3f8163ab4fb21942981743fdb Mon Sep 17 00:00:00 2001 From: Xiretza Date: Thu, 3 Oct 2019 17:25:47 +0200 Subject: [PATCH] Allow building with modern java Patch by Patrik Plihal --- .SRCINFO | 8 +++++--- PKGBUILD | 21 +++++++++++++-------- modern-java.patch | 12 ++++++++++++ 3 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 modern-java.patch diff --git a/.SRCINFO b/.SRCINFO index df98111..377ea2e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,18 +1,18 @@ pkgbase = multimc5 pkgdesc = Minecraft launcher with ability to manage multiple instances. pkgver = 0.6.7 - pkgrel = 1 + pkgrel = 2 url = http://multimc.org/ arch = i686 arch = x86_64 license = Apache makedepends = cmake - makedepends = java-environment<12 + makedepends = java-environment depends = zlib depends = libgl depends = qt5-base depends = qt5-x11extras - depends = java-runtime<12 + depends = java-runtime depends = qt5-svg depends = xorg-xrandr optdepends = mcedit: Allows editing of minecraft worlds @@ -22,10 +22,12 @@ pkgbase = multimc5 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 = modern-java.patch sha512sums = dd54ef2e0297f883a46ff22c035bc76a4bdaf0a6e8d728701d7f9eb3d595cfc67c868fa937282f1ad90bef941144ef93ec31b84fca14e43ed32e5e77e356ce10 sha512sums = 81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d sha512sums = 2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0 sha512sums = ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4 + sha512sums = ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b pkgname = multimc5 diff --git a/PKGBUILD b/PKGBUILD index e7dfc8e..5bc16ca 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,34 +1,39 @@ # Maintainer: xiretza # Contributor: vorpalblade77@gmail.com # Contributor: b.klettbach@gmail.com +# Contributor: Patrik Plihal pkgname=multimc5 pkgver=0.6.7 -pkgrel=1 +pkgrel=2 __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<12' 'qt5-svg' 'xorg-xrandr') +depends=('zlib' 'libgl' 'qt5-base' 'qt5-x11extras' 'java-runtime' 'qt5-svg' 'xorg-xrandr') provides=('multimc') conflicts=('multimc') -makedepends=('cmake' 'java-environment<12') +makedepends=('cmake' 'java-environment') 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" + "modern-java.patch" ) sha512sums=('dd54ef2e0297f883a46ff22c035bc76a4bdaf0a6e8d728701d7f9eb3d595cfc67c868fa937282f1ad90bef941144ef93ec31b84fca14e43ed32e5e77e356ce10' '81a1640a069d88df7ba0abf72089aecbe1e9d791c88acaaa7e70c8f0bcd0512cf8698178342657e363524ce8488dd072368a0aa8cc091a24912d6f8b6b0f4f2d' '2e9074203c67bc7ad98621c551047e5367f06e54cacfecc755a5bf2c9f99266eab42ad972f86ae28ed7e1507f6d27d8d2680a87ce9fd5b1e93a18bcb627ec3f0' - 'ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4') + 'ca7a350bdeecf65dbca7de8d6912c935c6ba603edcddcd4ffe71d8997e50e4046335dde6d1d7c629d35025073d18be4d112a960d43a8801de979687bc26e46d4' + 'ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b') prepare() { cd "${srcdir}/MultiMC5-${pkgver}" + patch -p1 < "${srcdir}/modern-java.patch" + rmdir "libraries/libnbtplusplus" rmdir "libraries/quazip" cp --recursive "${srcdir}/libnbtplusplus-${__pkgver_libnbtplusplus}/" \ @@ -47,10 +52,10 @@ build() { cd build cmake -DCMAKE_BUILD_TYPE=Release \ - -DMultiMC_UPDATER=OFF \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DMultiMC_LAYOUT=lin-system \ - .. + -DMultiMC_UPDATER=OFF \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DMultiMC_LAYOUT=lin-system \ + .. make } diff --git a/modern-java.patch b/modern-java.patch new file mode 100644 index 0000000..5ae55ca --- /dev/null +++ b/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)