View | Details | Raw Unified | Return to bug 228819
Collapse All | Expand All

(-)multimc/distinfo (-7 / +7 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1514826359
1
TIMESTAMP = 1528391891
2
SHA256 (MultiMC-MultiMC5-0.6.0_GH0.tar.gz) = ac458be99250d2a369ee805bf9560e396d0e0f16a95cc84c36eb0ef1e94a6374
2
SHA256 (MultiMC-MultiMC5-0.6.2_GH0.tar.gz) = d5e5fdc3234ac423e4abf8ea3b46d851c2df54713eae61f2171cb6f85de78fee
3
SIZE (MultiMC-MultiMC5-0.6.0_GH0.tar.gz) = 1844862
3
SIZE (MultiMC-MultiMC5-0.6.2_GH0.tar.gz) = 2257365
4
SHA256 (MultiMC-libnbtplusplus-4b305bb_GH0.tar.gz) = 576391fb7aac44e8d8e2012f38b1f0bbb08cb9d0cd9104f162cfdee4b83e5627
4
SHA256 (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 14f16c8e6dc264017684774cdd9c6f149855e464895b28c29f9f55ea76d34f1a
5
SIZE (MultiMC-libnbtplusplus-4b305bb_GH0.tar.gz) = 47080
5
SIZE (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 47406
6
SHA256 (MultiMC-quazip-164acc3_GH0.tar.gz) = fb289ba497f2e315a8e85881ca78218f859d7a72f11463251cfb83271c4381b7
6
SHA256 (MultiMC-quazip-3691d57_GH0.tar.gz) = 17a9457360053fa2c6c849c75fa760383036bd14d7d8f7bd0d958bfc2a584009
7
SIZE (MultiMC-quazip-164acc3_GH0.tar.gz) = 103454
7
SIZE (MultiMC-quazip-3691d57_GH0.tar.gz) = 103508
(-)multimc/files/patch-api_logic_minecraft_update_FMLLibrariesTask.h (-10 lines)
Lines 1-10 Link Here
1
--- api/logic/minecraft/update/FMLLibrariesTask.h.orig	2018-06-03 04:17:36 UTC
2
+++ api/logic/minecraft/update/FMLLibrariesTask.h
3
@@ -1,6 +1,7 @@
4
 #pragma once
5
 #include "tasks/Task.h"
6
 #include "net/NetJob.h"
7
+#include "minecraft/VersionFilterData.h"
8
 class MinecraftInstance;
9
 
10
 class FMLLibrariesTask : public Task
(-)multimc/files/patch-application_CMakeLists.txt (-31 lines)
Lines 1-31 Link Here
1
--- application/CMakeLists.txt.orig	2017-12-18 00:19:43 UTC
2
+++ application/CMakeLists.txt
3
@@ -27,11 +27,11 @@ set(MultiMC_PASTE_EE_API_KEY "" CACHE ST
4
 set(MultiMC_ANALYTICS_ID "" CACHE STRING "ID you can get from Google analytics")
5
 
6
 #### Check the current Git commit and branch
7
-include(GetGitRevisionDescription)
8
-get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT)
9
+#include(GetGitRevisionDescription)
10
+#get_git_head_revision(MultiMC_GIT_REFSPEC MultiMC_GIT_COMMIT)
11
 
12
-message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}")
13
-message(STATUS "Git refspec: ${MultiMC_GIT_REFSPEC}")
14
+#message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}")
15
+#message(STATUS "Git refspec: ${MultiMC_GIT_REFSPEC}")
16
 
17
 set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}.${MultiMC_VERSION_HOTFIX}")
18
 
19
@@ -390,9 +390,9 @@ elseif(MultiMC_LAYOUT_REAL STREQUAL "lin
20
 	install(PROGRAMS package/linux/MultiMC DESTINATION ${BUNDLE_DEST_DIR})
21
 
22
 elseif(MultiMC_LAYOUT_REAL STREQUAL "lin-system")
23
-	set(MultiMC_BINARY_DEST_DIR "usr/bin" CACHE STRING "Relative path from packaging root to the binary directory")
24
-	set(MultiMC_LIBRARY_DEST_DIR "usr/lib" CACHE STRING "Relative path from packaging root to the library directory")
25
-	set(MultiMC_SHARE_DEST_DIR "usr/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory")
26
+	set(MultiMC_BINARY_DEST_DIR "usr/local/bin" CACHE STRING "Relative path from packaging root to the binary directory")
27
+	set(MultiMC_LIBRARY_DEST_DIR "usr/local/lib" CACHE STRING "Relative path from packaging root to the library directory")
28
+	set(MultiMC_SHARE_DEST_DIR "usr/local/share/multimc" CACHE STRING "Relative path from packaging root to the shared data directory")
29
 	set(MultiMC_APP_BINARY_NAME "multimc" CACHE STRING "Name of the MultiMC binary for the purposes of linux packaging")
30
 	set(JARS_DEST_DIR "${MultiMC_SHARE_DEST_DIR}")
31
 
(-)multimc/files/patch-CMakeLists.txt (-11 lines)
Lines 1-11 Link Here
1
--- CMakeLists.txt.orig	2017-12-18 00:19:43 UTC
2
+++ CMakeLists.txt
3
@@ -5,6 +5,8 @@ if(IS_IN_SOURCE_BUILD)
4
 	message(AUTHOR_WARNING "You are building MultiMC in-source. This is NOT recommended!")
5
 endif()
6
 
7
+set(CMAKE_INSTALL_PREFIX "/")
8
+
9
 if(WIN32)
10
 	# In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
11
 	cmake_policy(SET CMP0020 OLD)
(-)multimc/Makefile (-4 / +4 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	multimc
3
PORTNAME=	multimc
4
DISTVERSION=	0.6.0
4
DISTVERSION=	0.6.2
5
CATEGORIES=	games java
5
CATEGORIES=	games java
6
6
7
MAINTAINER=	me@tsundoku.ne.jp
7
MAINTAINER=	me@tsundoku.ne.jp
Lines 16-28 Link Here
16
USE_GITHUB=	yes
16
USE_GITHUB=	yes
17
GH_ACCOUNT=	MultiMC
17
GH_ACCOUNT=	MultiMC
18
GH_PROJECT=	MultiMC5
18
GH_PROJECT=	MultiMC5
19
GH_TUPLE=	MultiMC:libnbtplusplus:4b305bb:libnbtplusplus/libraries/libnbtplusplus \
19
GH_TUPLE=	MultiMC:libnbtplusplus:508eda8:libnbtplusplus/libraries/libnbtplusplus \
20
		MultiMC:quazip:164acc3:quazip/libraries/quazip
20
		MultiMC:quazip:3691d57:quazip/libraries/quazip
21
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
22
USE_JAVA=	1.8+
22
USE_JAVA=	1.8+
23
USE_QT5=	buildtools core concurrent gui network qmake testlib_build widgets xml
23
USE_QT5=	buildtools core concurrent gui network qmake testlib_build widgets xml
24
24
25
CMAKE_ARGS=	-DMultiMC_LAYOUT="lin-system"
25
CMAKE_ARGS=	-DMultiMC_LAYOUT="lin-system" -DCMAKE_INSTALL_PREFIX="/usr/local"
26
CMAKE_OFF=	MultiMC_UPDATER
26
CMAKE_OFF=	MultiMC_UPDATER
27
CXXFLAGS+=	-Wno-inconsistent-missing-override \
27
CXXFLAGS+=	-Wno-inconsistent-missing-override \
28
		-Wno-delete-non-virtual-dtor \
28
		-Wno-delete-non-virtual-dtor \

Return to bug 228819