Date: Thursday, March 9, 2017 @ 17:43:43
Author: svenstaro
Revision: 215412
upgpkg: megaglest 3.13.0-1
upstream release 3.13.0
Modified:
megaglest/trunk/PKGBUILD
Deleted:
megaglest/trunk/megaglest-gcc6.patch
megaglest/trunk/megaglest-miniupnpc2.patch
megaglest/trunk/miniupnpc14.patch
----------------------------+
PKGBUILD | 10 +++++-----
megaglest-gcc6.patch | 13 -------------
megaglest-miniupnpc2.patch | 14 --------------
miniupnpc14.patch | 22 ----------------------
4 files changed, 5 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-09 17:35:55 UTC (rev 215411)
+++ PKGBUILD 2017-03-09 17:43:43 UTC (rev 215412)
@@ -3,11 +3,11 @@
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=megaglest
-pkgver=3.12.0
-pkgrel=2
+pkgver=3.13.0
+pkgrel=1
pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world"
arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/megaglest/";
+url="https://megaglest.org";
license=('GPL3')
depends=('curl' 'megaglest-data' 'xerces-c' 'sdl2' 'libvorbis' 'openal'
'libgl' 'lua51' 'icu' 'ftgl' 'glew'
'libircclient' 'miniupnpc' 'wxgtk' 'glu' 'libx11')
@@ -20,9 +20,9 @@
prepare() {
cd megaglest-source
# Fix build with GCC 6 (Fedora)
- patch -p1 -i ../megaglest-gcc6.patch
+ # patch -p1 -i ../megaglest-gcc6.patch
# Fix build with miniupnpc 2 (Fedora)
- patch -p1 -i ../megaglest-miniupnpc2.patch
+ # patch -p1 -i ../megaglest-miniupnpc2.patch
}
build() {
Deleted: megaglest-gcc6.patch
===================================================================
--- megaglest-gcc6.patch 2017-03-09 17:35:55 UTC (rev 215411)
+++ megaglest-gcc6.patch 2017-03-09 17:43:43 UTC (rev 215412)
@@ -1,13 +0,0 @@
-diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
----
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp.orig
2016-06-24 07:56:09.496569134 -0300
-+++
megaglest-3.12.0/source/shared_lib/sources/platform/common/platform_common.cpp
2016-06-24 07:56:11.962569290 -0300
-@@ -124,8 +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();
-- return std::chrono::system_clock::to_time_t(system_now);
-+ return
std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
- #else
- return time(NULL);
- #endif
Deleted: megaglest-miniupnpc2.patch
===================================================================
--- megaglest-miniupnpc2.patch 2017-03-09 17:35:55 UTC (rev 215411)
+++ megaglest-miniupnpc2.patch 2017-03-09 17:43:43 UTC (rev 215412)
@@ -1,14 +0,0 @@
-diff -up
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
---- megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp.orig
2016-06-24 08:00:27.521585488 -0300
-+++ megaglest-3.12.0/source/shared_lib/sources/platform/posix/socket.cpp
2016-06-24 08:00:43.947586530 -0300
-@@ -2631,7 +2631,9 @@ int UPNP_Tools::upnp_init(void *param) {
- if(SystemFlags::VERBOSE_MODE_ENABLED)
printf("UPnP device found: %s %s\n", dev->descURL, dev->st);
-
- //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))
-+#if (defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 16)
-+ char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])), 0, NULL);
-+#elif (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);
- #else
- char *descXML = (char
*)miniwget_getaddr(dev->descURL, &descXMLsize, lanaddr, (sizeof(lanaddr) /
sizeof(lanaddr[0])));
Deleted: miniupnpc14.patch
===================================================================
--- miniupnpc14.patch 2017-03-09 17:35:55 UTC (rev 215411)
+++ miniupnpc14.patch 2017-03-09 17:43:43 UTC (rev 215412)
@@ -1,22 +0,0 @@
-diff --git a/source/shared_lib/sources/platform/posix/socket.cpp
b/source/shared_lib/sources/platform/posix/socket.cpp
-index a5d4b92..4cac74f 100644
---- a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -2563,10 +2563,17 @@ int UPNP_Tools::upnp_init(void *param) {
- const char *upnp_minissdpdsock = NULL;
- int upnp_sameport = 0;
- int upnp_ipv6 = 0;
-+#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
-+ unsigned char upnp_ttl = 2;
-+#endif
- int upnp_error = 0;
-
- #ifndef MINIUPNPC_VERSION_PRE1_6
-+# if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
-+ devlist = upnpDiscover(upnp_delay, upnp_multicastif,
upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &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);
