diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | PKGBUILD | 17 | ||||
-rw-r--r-- | modern-java.patch | 12 |
3 files changed, 15 insertions, 24 deletions
@@ -1,7 +1,7 @@ pkgbase = multimc5 pkgdesc = Minecraft launcher with ability to manage multiple instances. - pkgver = 0.6.14 - pkgrel = 5 + pkgver = 0.6.16 + pkgrel = 1 url = https://multimc.org/ arch = i686 arch = x86_64 @@ -17,11 +17,10 @@ pkgbase = multimc5 optdepends = glfw: to use system GLFW libraries provides = multimc conflicts = multimc - source = multimc5::git+https://github.com/MultiMC/Launcher#tag=0.6.14 + source = multimc5::git+https://github.com/MultiMC/Launcher#tag=0.6.16 source = libnbtplusplus::git+https://github.com/MultiMC/libnbtplusplus#commit=dc72a20b7efd304d12af2025223fad07b4b78464 source = quazip::git+https://github.com/MultiMC/quazip#commit=b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b source = https://files.multimc.org/downloads/mmc-stable-lin64.tar.gz - source = modern-java.patch source = 0001-Readd-lin-system-and-LAUNCHER_LINUX_DATADIR.patch source = fix-jars.patch source = mmc-brand.patch @@ -29,8 +28,7 @@ pkgbase = multimc5 sha512sums = SKIP sha512sums = SKIP sha512sums = SKIP - sha512sums = 333cf8f504385d9e24a06cec12f3eb944b27773900595e6116cdd8e372d9ce564d53e4cf88f99b5d935345d2cf2a46309ea2431d86da6869236be17acd035b87 - sha512sums = ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b + sha512sums = 9b27fb72f68245c047916ed1a32c774577089ddb66cfcb3da8f32e2aba2e3913afc794424ebd6ed5563b4e2912b8a2f0234b2cd1648ba54791f9b6a5a1515dae sha512sums = d0e3152b885ec73b019dc0269d46e1ce0c43211bbcf05776a1e97f10fdc29f442930cc2d5144c0f979133e6aec68bf68474b924c746d1fa6b8c7f604af6eb83f sha512sums = df077c24a235117cc391ac515dd1e28c10b2082093c80aac5dcf3d6d8feaf07acacc79bfd5f111e389e7972e6f0a3b6eb217202d13e362219ed22a5437cd49c7 sha512sums = 1aeb819e1fc21f887e8f212f44eb22ccad320b9a1783ed9b55b8a2a9875103f079aaeb0a051b811f7ceb0708caf20f3c7b0c4ba21b5bb5dc25b0fec977dfc878 diff --git a/PKGBUILD b/PKGBUILD index eecbe510098c..f397094c11e4 100755..100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,10 +6,10 @@ pkgname=multimc5 _pkgname=multimc -pkgver=0.6.14 +pkgver=0.6.16 _nbtplusplusver=dc72a20b7efd304d12af2025223fad07b4b78464 _quazipver=b1a72ac0bb5a732bf887a535ab75c6f9bedb6b6b -pkgrel=5 +pkgrel=1 pkgdesc="Minecraft launcher with ability to manage multiple instances." arch=('i686' 'x86_64') url="https://multimc.org/" @@ -27,7 +27,6 @@ source=("${pkgname}::git+https://github.com/MultiMC/Launcher#tag=${pkgver}" "libnbtplusplus::git+https://github.com/MultiMC/libnbtplusplus#commit=${_nbtplusplusver}" "quazip::git+https://github.com/MultiMC/quazip#commit=${_quazipver}" "https://files.multimc.org/downloads/mmc-stable-lin64.tar.gz" - "modern-java.patch" "0001-Readd-lin-system-and-LAUNCHER_LINUX_DATADIR.patch" "fix-jars.patch" "mmc-brand.patch" @@ -36,8 +35,7 @@ source=("${pkgname}::git+https://github.com/MultiMC/Launcher#tag=${pkgver}" sha512sums=('SKIP' 'SKIP' 'SKIP' - '333cf8f504385d9e24a06cec12f3eb944b27773900595e6116cdd8e372d9ce564d53e4cf88f99b5d935345d2cf2a46309ea2431d86da6869236be17acd035b87' - 'ede87db7e1ce67184409123720b48f65d35884bac5dfff34cc099c5d7520fd9173be00997df82ad29da4640928134a7199ffdd1cbaa83a72101dbed72736508b' + '9b27fb72f68245c047916ed1a32c774577089ddb66cfcb3da8f32e2aba2e3913afc794424ebd6ed5563b4e2912b8a2f0234b2cd1648ba54791f9b6a5a1515dae' 'd0e3152b885ec73b019dc0269d46e1ce0c43211bbcf05776a1e97f10fdc29f442930cc2d5144c0f979133e6aec68bf68474b924c746d1fa6b8c7f604af6eb83f' 'df077c24a235117cc391ac515dd1e28c10b2082093c80aac5dcf3d6d8feaf07acacc79bfd5f111e389e7972e6f0a3b6eb217202d13e362219ed22a5437cd49c7' '1aeb819e1fc21f887e8f212f44eb22ccad320b9a1783ed9b55b8a2a9875103f079aaeb0a051b811f7ceb0708caf20f3c7b0c4ba21b5bb5dc25b0fec977dfc878' @@ -47,7 +45,6 @@ prepare() { cd "${srcdir}/${pkgname}" patch -p1 < "${srcdir}/0001-Readd-lin-system-and-LAUNCHER_LINUX_DATADIR.patch" - patch -p1 < "${srcdir}/modern-java.patch" patch -p1 < "${srcdir}/fix-jars.patch" patch -p1 < "${srcdir}/mmc-brand.patch" @@ -71,6 +68,7 @@ prepare() { build() { cd "${srcdir}/${pkgname}" + mkdir -p build cd build @@ -79,18 +77,25 @@ build() { -DLauncher_LAYOUT=lin-system \ -DLauncher_APP_BINARY_NAME="${_pkgname}" \ -DLauncher_SHARE_DEST_DIR="share/${_pkgname}" \ + -DLauncher_LIBRARAY_DEST_DIR="lib/${_pkgname}" \ .. make } check() { cd "${srcdir}/${pkgname}/build" + make test } package() { cd "${srcdir}/${pkgname}/build" + make install DESTDIR="${pkgdir}" + + mkdir -p "${pkgdir}/etc/ld.so.conf.d" + echo -e "/usr/lib/${_pkgname}" > "${pkgdir}/etc/ld.so.conf.d/multimc5.conf" + install -Dm644 "${srcdir}/${pkgname}/launcher/package/ubuntu/multimc/opt/multimc/icon.svg" "${pkgdir}/usr/share/pixmaps/multimc.svg" install -Dm644 "${srcdir}/multimc.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" } diff --git a/modern-java.patch b/modern-java.patch deleted file mode 100644 index 5ae55ca6367f..000000000000 --- a/modern-java.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) |