freeciv-2.5: Update to version 2.5.4

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2016-06-15 09:36:54 +03:00
parent 888a9e1663
commit 6e22026fa8
2 changed files with 10 additions and 10 deletions

View File

@@ -3,14 +3,14 @@ Give server more time to start
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd -X.diff_ignore freeciv/client/connectdlg_common.c freeciv/client/connectdlg_common.c
--- freeciv/client/connectdlg_common.c 2011-07-30 00:24:42.000000000 +0300
+++ freeciv/client/connectdlg_common.c 2012-05-14 23:31:13.000000000 +0300
@@ -60,7 +60,7 @@
--- freeciv/client/connectdlg_common.c 2016-04-25 15:07:18.840145337 +0300
+++ freeciv/client/connectdlg_common.c 2016-05-04 09:43:11.524504302 +0300
@@ -65,7 +65,7 @@
#include "tilespec.h"
#define WAIT_BETWEEN_TRIES 100000 /* usecs */
-#define NUMBER_OF_TRIES 500
+#define NUMBER_OF_TRIES 10000
#ifdef WIN32_NATIVE
/* FIXME: this is referenced directly in gui-win32/connectdlg.c. */
#if defined(HAVE_WORKING_FORK) && !defined(WIN32_NATIVE)
/* We are yet to see WIN32_NATIVE setup where even HAVE_WORKING_FORK would

View File

@@ -9,15 +9,15 @@ EXTRA_OECONF += "\
--with-qt5-libs=${STAGING_LIBDIR}/qt5 \
MOCCMD=${STAGING_BINDIR_NATIVE}/qt5/moc \
SDL2_CONFIG='${STAGING_BINDIR_NATIVE}/pkg-config sdl2' \
-enable-sdl-mixer=sdl2 \
--enable-sdl-mixer=sdl2 \
"
SRC_URI += "\
${SOURCEFORGE_MIRROR}/freeciv/freeciv-${PV}.tar.bz2 \
"
SRC_URI[md5sum] = "6bbdfa23392ca88fdb0b8f7caca66ddd"
SRC_URI[sha256sum] = "480b0381c64bf1a9423f2507a75d76bda9bf45c3c3badd30b5bad105e75d805c"
SRC_URI[md5sum] = "f2b2e1f0afc7daecc9050bf6ceadb1d8"
SRC_URI[sha256sum] = "9e64ef047fd0d2f8e9aa1da01586dea7cfe63a36b15875c168ada555c2e6634b"
PACKAGES =+ "${PN}-gtk3 ${PN}-qt"
@@ -29,7 +29,7 @@ ${datadir}/freeciv/themes/gui-gtk-3.0 \
${datadir}/freeciv/gtk_menus.xml \
"
RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins qtbase-fonts"
RDEPENDS_${PN}-qt = "freeciv-common freeciv-client-common qtbase-plugins"
RPROVIDES_${PN}-qt = "freeciv-client"
FILES_${PN}-qt = "\
${bindir}/freeciv-qt \