Attachment 168653 Details for Bug 205485 – megaglest-3.12.0 svn diff

[patch] megaglest-3.12.0 svn diff

megaglest-3.12.0.diff (text/plain), 10.09 KB, created by Thibault Payet on 2016-03-26 15:47:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Payet

Created: 2016-03-26 15:47:45 UTC

Size: 10.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 411822)
>+++ Makefile	(copie de travail)
>@@ -2,13 +2,11 @@
> # $FreeBSD$
> 
> PORTNAME=	megaglest
>-PORTVERSION=	3.9.0.4
>-PORTREVISION=	8
>+PORTVERSION=	3.12.0
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/archived/${PORTNAME}_3.9.0/
> DISTNAME=	${PORTNAME}-source-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	monwarez@mailoo.org
> COMMENT=	Open source 3D real-time strategy game
> 
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>@@ -20,6 +18,10 @@
> 		${LOCALBASE}/include/miniupnpc/miniupnpc.h:${PORTSDIR}/net/miniupnpc
> RUN_DEPENDS=	${DATADIR}/tutorials/2_basic_tutorial/2_basic_tutorial.xml:${PORTSDIR}/games/megaglest-data
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	MegaGlest
>+GH_PROJECT=	megaglest-source
>+
> SUB_FILES=	pkg-message
> 
> USES=		cmake compiler:c++11-lib display:build dos2unix jpeg lua \
>@@ -28,11 +30,9 @@
> USE_SDL=	yes
> USE_WX=		3.0
> USE_CXXSTD=	c++11
>-WX_UNICODE=	yes
> 
> CFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -lssl -lcrypto
>-WRKSRC=		${WRKDIR}/${PORTNAME}-3.9.0
> 
> OPTIONS_DEFINE=	EDITOR DOCS
> OPTIONS_SUB=	yes
>@@ -49,13 +49,14 @@
> do-install:
> 	${STRIP_CMD} ${WRKSRC}/source/glest_game/megaglest
> 	@${MKDIR} ${STAGEDIR}${DATADIR}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
> 	${INSTALL_PROGRAM} ${WRKSRC}/source/glest_game/megaglest ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>-.for f in glest.ini glestkeys.ini servers.ini
>+.for f in mk/linux/glest.ini mk/shared/glestkeys.ini mk/shared/servers.ini
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
> .endfor
> .if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-. for f in AUTHORS.source_code.txt CHANGELOG.txt README.txt COPYRIGHT.source_code.txt
>+. for f in docs/AUTHORS.source_code.txt docs/CHANGELOG.txt docs/README.txt docs/COPYRIGHT.source_code.txt
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
> . endfor
> .endif
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 411822)
>+++ distinfo	(copie de travail)
>@@ -1,2 +1,2 @@
>-SHA256 (megaglest-source-3.9.0.4.tar.xz) = 3362ade61af3c01c2d8976d2d481769698dc0c800f35251b8c5489f8e41d9bc3
>-SIZE (megaglest-source-3.9.0.4.tar.xz) = 1596692
>+SHA256 (megaglest-source-3.12.0_GH0.tar.xz) = 13c0ed6320f52558939cadcb1b1d16e6ac94cb3b22be6d4d761723ef41e87297
>+SIZE (megaglest-source-3.12.0_GH0.tar.xz) = 3638252
>Index: files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp
>===================================================================
>--- files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	(rÃ©vision 411822)
>+++ files/patch-source-shared_lib-sources-platform-posix-ircclient.cpp	(copie de travail)
>@@ -1,5 +1,5 @@
>---- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2013-11-22 15:51:23.000000000 -0600
>-+++ source/shared_lib/sources/platform/posix/ircclient.cpp	2013-11-22 15:51:42.000000000 -0600
>+--- source/shared_lib/sources/platform/posix/ircclient.cpp.orig	2016-03-26 14:06:43 UTC
>++++ source/shared_lib/sources/platform/posix/ircclient.cpp
> @@ -19,10 +19,7 @@
>  #if !defined(DISABLE_IRCCLIENT)
>  
>Index: files/patch-source__shared_lib__CMakeLists.txt
>===================================================================
>--- files/patch-source__shared_lib__CMakeLists.txt	(rÃ©vision 411822)
>+++ files/patch-source__shared_lib__CMakeLists.txt	(nonexistent)
>@@ -1,21 +0,0 @@
>-commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
>-Author: Michael Palimaka <kensington@gentoo.org>
>-Date:   Wed May 13 04:22:45 2015 +1000
>-
>-    Fix build with >=cmake-3.2.
>-
>-    The FindOpenGL module no longer pulls in X11 libraries.
>-
>---- source/shared_lib/CMakeLists.txt
>-+++ source/shared_lib/CMakeLists.txt
>-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
>- 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
>- 	ENDIF()
>- 
>-+        IF(UNIX)
>-+		FIND_PACKAGE(X11 REQUIRED)
>-+		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
>-+        ENDIF()
>- 
>-         IF(WANT_XERCES)
>- 	        FIND_PACKAGE(XercesC REQUIRED)
>
>Modification de propriÃ©tÃ©s sur files/patch-source__shared_lib__CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_sources_miniz_miniz.c
>===================================================================
>--- files/patch-source_shared__lib_sources_miniz_miniz.c	(rÃ©vision 411822)
>+++ files/patch-source_shared__lib_sources_miniz_miniz.c	(nonexistent)
>@@ -1,19 +0,0 @@
>---- source/shared_lib/sources/miniz/miniz.c.orig	2015-04-13 04:50:02 UTC
>-+++ source/shared_lib/sources/miniz/miniz.c
>-@@ -2765,6 +2765,7 @@ mz_uint tdefl_create_comp_flags_from_zip
>- // http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
>- void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out)
>- {
>-+  static const mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06};
>-   tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); tdefl_output_buffer out_buf; int i, bpl = w * num_chans, y, z; mz_uint32 c; *pLen_out = 0;
>-   if (!pComp) return NULL;
>-   MZ_CLEAR_OBJ(out_buf); out_buf.m_expandable = MZ_TRUE; out_buf.m_capacity = 57+MZ_MAX(64, (1+bpl)*h); if (NULL == (out_buf.m_pBuf = (mz_uint8*)MZ_MALLOC(out_buf.m_capacity))) { MZ_FREE(pComp); return NULL; }
>-@@ -2778,7 +2779,7 @@ void *tdefl_write_image_to_png_file_in_m
>-   *pLen_out = out_buf.m_size-41;
>-   {
>-     mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
>--      0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,"\0\0\04\02\06"[num_chans],0,0,0,0,0,0,0,
>-+      0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,chans[num_chans],0,0,0,0,0,0,0,
>-       (mz_uint8)(*pLen_out>>24),(mz_uint8)(*pLen_out>>16),(mz_uint8)(*pLen_out>>8),(mz_uint8)*pLen_out,0x49,0x44,0x41,0x54};
>-     c=(mz_uint32)mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((mz_uint8*)(pnghdr+29))[i]=(mz_uint8)(c>>24);
>-     memcpy(out_buf.m_pBuf, pnghdr, 41);
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_sources_miniz_miniz.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_sources_platform_common_platform__common.cpp
>===================================================================
>--- files/patch-source_shared__lib_sources_platform_common_platform__common.cpp	(nonexistent)
>+++ files/patch-source_shared__lib_sources_platform_common_platform__common.cpp	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- source/shared_lib/sources/platform/common/platform_common.cpp.orig	2016-03-26 14:08:38 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);
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_sources_platform_common_platform__common.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_shared__lib_sources_platform_posix_socket.cpp
>===================================================================
>--- files/patch-source_shared__lib_sources_platform_posix_socket.cpp	(rÃ©vision 411822)
>+++ files/patch-source_shared__lib_sources_platform_posix_socket.cpp	(nonexistent)
>@@ -1,14 +0,0 @@
>---- source/shared_lib/sources/platform/posix/socket.cpp.orig	2015-10-14 18:18:16 UTC
>-+++ source/shared_lib/sources/platform/posix/socket.cpp
>-@@ -2554,7 +2554,11 @@ int UPNP_Tools::upnp_init(void *param) {
>- 		int upnp_error = 0;
>- 
>- #ifndef MINIUPNPC_VERSION_PRE1_6
>-+#if MINIUPNPC_API_VERSION >= 14
>-+		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, 2, &upnp_error);
>-+#else
>- 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
>-+#endif
>- 
>- 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
>- 		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
>
>Modification de propriÃ©tÃ©s sur files/patch-source_shared__lib_sources_platform_posix_socket.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 411822)
>+++ pkg-plist	(copie de travail)
>@@ -1,9 +1,9 @@
>-%%EDITOR%%bin/megaglest_editor
> bin/megaglest
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
>+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
>+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
> %%DATADIR%%/glest.ini
> %%DATADIR%%/glestkeys.ini
> %%DATADIR%%/servers.ini
>-%%PORTDOCS%%%%DOCSDIR%%/README.txt
>-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.source_code.txt
>-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
>-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.source_code.txt
>+@dir share/icons

Actions: View | Diff

Attachments on bug 205485: 164451 | 164452 | 164453 | 164599 | 164600 | 164601 | 164625 | 164662 | 164669 | 164696 | 164699 | 164759 | 164824 | 168653 | 168665 | 168666 | 168681 | 168704 | 168890 | 168892 | 168893 | 168901 | 168918 | 168919