Attachment #180749 for bug #217726

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

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= megaglest	4	PORTNAME= megaglest
5	PORTVERSION= 3.12.0	5	PORTVERSION= 3.13.0
6	PORTREVISION= 1
7	CATEGORIES= games	6	CATEGORIES= games
8		7
9	MAINTAINER= monwarez@mailoo.org	8	MAINTAINER= monwarez@mailoo.org

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297	1	TIMESTAMP = 1489313085
2	SIZE (MegaGlest-megaglest-source-3.12.0_GH0.tar.gz) = 3638252	2	SHA256 (MegaGlest-megaglest-source-3.13.0_GH0.tar.gz) = efb5d755f44055e4b41ac6fc29e5cbe167f9d74eac800b3070f4b11b15f3b464
		3	SIZE (MegaGlest-megaglest-source-3.13.0_GH0.tar.gz) = 3654879




--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2016-04-02 12:36:57 UTC
+++ source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -19,10 +19,7 @@
 #if !defined(DISABLE_IRCCLIENT)
 
 #include <libircclient.h>
-// upstream moved some defines into new headers as of 1.6
-#ifndef LIBIRCCLIENT_PRE1_6
 #include <libirc_rfcnumeric.h>
-#endif
 
 #endif
 
yes
native
text/plain




--- source/shared_lib/sources/platform/posix/socket.cpp.orig	2016-12-26 00:02:43.325573000 +0100
+++ source/shared_lib/sources/platform/posix/socket.cpp	2016-12-26 00:04:06.681172000 +0100
@@ -2632,7 +2632,7 @@
 
 				//printf("UPnP device found: [%s] [%s] lanaddr [%s]\n", dev->descURL, dev->st,lanaddr);
 #if (defined(MINIUPNPC_API_VERSION)  && MINIUPNPC_API_VERSION >= 9) || (!defined(MINIUPNPC_VERSION_PRE1_7) && !defined(MINIUPNPC_VERSION_PRE1_6))
-				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0);
+				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])),0,0);
 #else
 				char *descXML = (char *)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) / sizeof(lanaddr[0])));
 #endif
yes
native
text/plain




--- source/shared_lib/include/platform/sdl/platform_main.h.orig	2016-04-02 12:37:33 UTC
+++ source/shared_lib/include/platform/sdl/platform_main.h
@@ -667,7 +667,7 @@ int mainSetup(int argc, char **argv) {
 	}
 	else {
 		 if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
-		 if(SDL_Init(SDL_INIT_EVERYTHING) < 0)  {
+		 if(SDL_Init(SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER | SDL_INIT_EVENTS) < 0)  {
 			if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 			std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
 			return 3;
yes
native
text/plain




--- source/shared_lib/sources/platform/common/platform_common.cpp.orig	2016-04-02 12:36:57 UTC
+++ source/shared_lib/sources/platform/common/platform_common.cpp
@@ -124,7 +124,7 @@ tm threadsafe_localtime(const time_t &ti
 // extracting std::time_t from std:chrono for "now"
 time_t systemtime_now() {
 #if __cplusplus > 199711L
-	system_time_point system_now = std::chrono::system_clock::now();
+	auto system_now = std::chrono::system_clock::now();
 	return std::chrono::system_clock::to_time_t(system_now);
 #else
 	return time(NULL);
yes
native
text/plain




--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2017-03-12 11:21:46 UTC
+++ source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -20,9 +20,7 @@
 
 #include <libircclient.h>
 // upstream moved some defines into new headers as of 1.6
-#ifndef LIBIRCCLIENT_PRE1_6
 #include <libirc_rfcnumeric.h>
-#endif
 
 #endif
 
yes
native
text/plain

Return to bug 217726

Lines 1-13 Link Here

(-)files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp (-16 lines)
1	--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig 2016-04-02 12:36:57 UTC
2	+++ source/shared_lib/sources/platform/posix/ircclient.cpp
3	@@ -19,10 +19,7 @@
4	#if !defined(DISABLE_IRCCLIENT)
5
6	#include <libircclient.h>
7	-// upstream moved some defines into new headers as of 1.6
8	-#ifndef LIBIRCCLIENT_PRE1_6
9	#include <libirc_rfcnumeric.h>
10	-#endif
11
12	#endif
13
14	yes
15	native
16	text/plain

Lines 1-11 Link Here

(-)files/patch-source_shared__lib_include_platform_sdl_platform__main.h (-14 lines)
1	--- source/shared_lib/include/platform/sdl/platform_main.h.orig 2016-04-02 12:37:33 UTC
2	+++ source/shared_lib/include/platform/sdl/platform_main.h
3	@@ -667,7 +667,7 @@ int mainSetup(int argc, char **argv) {
4	}
5	else {
6	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
7	- if(SDL_Init(SDL_INIT_EVERYTHING) < 0) {
8	+ if(SDL_Init(SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_JOYSTICK \| SDL_INIT_GAMECONTROLLER \| SDL_INIT_EVENTS) < 0) {
9	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
10	std::cerr << "Couldn't initialize SDL: " << SDL_GetError() << "\n";
11	return 3;
12	yes
13	native
14	text/plain

Lines 1-11 Link Here

(-)files/patch-source_shared__lib_sources_platform_common_platform__common.cpp (-14 lines)
1	--- source/shared_lib/sources/platform/common/platform_common.cpp.orig 2016-04-02 12:36:57 UTC
2	+++ source/shared_lib/sources/platform/common/platform_common.cpp
3	@@ -124,7 +124,7 @@ tm threadsafe_localtime(const time_t &ti
4	// extracting std::time_t from std:chrono for "now"
5	time_t systemtime_now() {
6	#if __cplusplus > 199711L
7	- system_time_point system_now = std::chrono::system_clock::now();
8	+ auto system_now = std::chrono::system_clock::now();
9	return std::chrono::system_clock::to_time_t(system_now);
10	#else
11	return time(NULL);
12	yes
13	native
14	text/plain