commit 541c537d218335dde64c8c7d6b8ab0e12cd42d98 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jun 3 22:42:13 2019 +1000 multimc: 0.6.4.r8 -> 0.6.5 diff --git a/multimc/.signature b/multimc/.signature index 948250b1..5de56111 100644 --- a/multimc/.signature +++ b/multimc/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38Xoz/ntkeXaeEa5JolclM494ZaBK9KdFZyw6XgtgspOFgu598hrIqYgskS5Ttq9aKtQ3aDvaW6L4M6S+YZ1kQk= -SHA256 (Pkgfile) = 4b00c6832f00189e637d8105ad26ebab2c7e1d59b9f1002808a2ec7f83557a21 +RWSagIOpLGJF30seFR5UbzgQC9+38LXTG6HIp0ciQ7lZuV0phIkK08QDA1RIOBidrRl/8tmblpkG1jQJReEYHqeH8qWUxm0+agg= +SHA256 (Pkgfile) = f2a1f6684eec48762b0442a0b5ad4818844d43c1c771bea662379f455a69aa34 SHA256 (.footprint) = 82975cabd95fbfe40b36392519f644b9ea93be9e9be0a8feedfeed5a4e274c6d -SHA256 (MultiMC5-0.6.4.r8.ge4599ee2.tar.xz) = c005914d72e1c31c29dd0c3ffa37be4781a2023b40973e558b0dbe0b33f4c877 +SHA256 (MultiMC5-0.6.5.tar.gz) = 98e8db7c0fda5e5a1917dc3f7cdbfd4b337c45aa47d1e7dbd45c380576bd7716 +SHA256 (multimc-3.tar.gz) = ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18 +SHA256 (multimc-0.6.1.tar.gz) = 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07 +SHA256 (quazip-fix-build-with-qt-511.patch) = 83906ae48e7861d149a93cd6ce7c083f52c67dd36589e84668881c8e8de1f868 diff --git a/multimc/Pkgfile b/multimc/Pkgfile index a0b74bff..c3e2e2de 100644 --- a/multimc/Pkgfile +++ b/multimc/Pkgfile @@ -4,12 +4,27 @@ # Depends on: openjdk8 qt5 name=multimc -version=0.6.4.r8 +version=0.6.5 release=1 -source=(http://crux.ster.zone/downloads/$name/MultiMC5-${version}.ge4599ee2.tar.xz) +source=( + https://github.com/MultiMC/MultiMC5/archive/$version/MultiMC5-$version.tar.g... + 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 +) build() { - cd MultiMC5 + 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 + + # 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/" @@ -26,9 +41,15 @@ build() { make make DESTDIR=$PKG install - install -D $SRC/MultiMC5/application/resources/multimc/scalable/multimc.svg \ + install -D $SRC/MultiMC5-$version/application/resources/multimc/scalable/multimc.svg \ $PKG/usr/share/pixmaps/multimc.svg - install -D $SRC/MultiMC5/application/package/linux/multimc.desktop \ + install -D $SRC/MultiMC5-$version/application/package/linux/multimc.desktop \ $PKG/usr/share/applications/multimc.desktop + + install -D $SRC/MultiMC5-$version/build/libMultiMC_quazip.so \ + $PKG/usr/lib/libMultiMC_quazip.so + + install -D $SRC/MultiMC5-$version/build/libMultiMC_nbt++.so \ + $PKG/usr/lib/libMultiMC_nbt++.so } diff --git a/multimc/quazip-fix-build-with-qt-511.patch b/multimc/quazip-fix-build-with-qt-511.patch new file mode 100644 index 00000000..14b58438 --- /dev/null +++ b/multimc/quazip-fix-build-with-qt-511.patch @@ -0,0 +1,33 @@ +From 469b97b618314ec009a37cad22e9d2541d6481f7 Mon Sep 17 00:00:00 2001 +From: Sergey Shatunov <me@prok.pw> +Date: Fri, 1 Jun 2018 21:07:13 +0700 +Subject: [PATCH] Fix build with Qt 5.11+ + +--- + CMakeLists.txt | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 376583c..7c0c6eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,10 +44,9 @@ endif() + + add_library(MultiMC_quazip SHARED ${QUAZIP_SRC}) + target_include_directories(MultiMC_quazip PUBLIC "quazip" "${CMAKE_CURRENT_BINARY_DIR}" PRIVATE ${ZLIB_INCLUDE_DIRS}) +-target_link_libraries(MultiMC_quazip ${ZLIB_LIBRARIES}) ++target_link_libraries(MultiMC_quazip Qt5::Core ${ZLIB_LIBRARIES}) + target_compile_definitions(MultiMC_quazip PRIVATE "-DQUAZIP_BUILD") + set_target_properties(MultiMC_quazip PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1) +-qt5_use_modules(MultiMC_quazip Core) + + # Install it + install( +@@ -84,6 +83,5 @@ set(QUAZIP_TEST_SRC + ) + + add_executable(MultiMC_quazip_test ${QUAZIP_TEST_SRC}) +-target_link_libraries(MultiMC_quazip_test MultiMC_quazip) +-qt5_use_modules(MultiMC_quazip_test Network Test) ++target_link_libraries(MultiMC_quazip_test MultiMC_quazip Qt5::Network Qt5::Test) + add_test(NAME quazip_testsuite COMMAND MultiMC_quazip_test)