widelands: update to 19
This commit is contained in:
parent
7125324e69
commit
34d457f974
|
@ -1,13 +1,11 @@
|
||||||
Disable execinfo.h and backtrace() for musl
|
--- src/logic/backtrace.cc 2016-11-10 08:28:01.000000000 +0100
|
||||||
|
+++ src/logic/backtrace.cc 2017-12-19 07:58:01.659673467 +0100
|
||||||
--- src/backtrace.cc 2015-06-01 10:36:22.655599851 +0200
|
|
||||||
+++ src/backtrace.cc 2015-06-01 10:35:04.179600083 +0200
|
|
||||||
@@ -22,15 +22,17 @@
|
@@ -22,15 +22,17 @@
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
-
|
-
|
||||||
+#ifdef __GLIBC__
|
+#if defined(__GLIBC__)
|
||||||
#include <execinfo.h>
|
#include <execinfo.h>
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
@ -17,10 +15,10 @@ Disable execinfo.h and backtrace() for musl
|
||||||
std::string result("Backtrace:\n");
|
std::string result("Backtrace:\n");
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
+#ifdef __GLIBC__
|
+#ifdef __GLIBC__
|
||||||
#define BACKTRACE_STACKSIZE 24
|
#define BACKTRACE_STACKSIZE 24
|
||||||
|
|
||||||
void * stack[BACKTRACE_STACKSIZE];
|
void* stack[BACKTRACE_STACKSIZE];
|
||||||
@@ -43,5 +45,6 @@
|
@@ -43,5 +45,6 @@
|
||||||
free(list);
|
free(list);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,18 +1,24 @@
|
||||||
--- src/i18n.cc 2014-02-22 10:06:51.000000000 +0100
|
--- src/base/i18n.cc 2016-11-10 08:28:01.000000000 +0100
|
||||||
+++ src/i18n.cc 2015-06-01 10:44:01.035598493 +0200
|
+++ src/base/i18n.cc 2017-12-19 07:16:43.225723387 +0100
|
||||||
@@ -192,6 +192,7 @@
|
@@ -45,7 +45,9 @@
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __linux__
|
+#if defined(__GLIBC__)
|
||||||
+#ifdef __GLIBC__
|
extern int _nl_msg_cat_cntr;
|
||||||
char * res = nullptr;
|
+#endif
|
||||||
char const * encoding[] = {"", ".utf-8", "@euro", ".UTF-8"};
|
|
||||||
std::size_t found = alt_str.find(',', 0);
|
namespace i18n {
|
||||||
@@ -236,6 +237,7 @@
|
|
||||||
|
@@ -302,9 +304,11 @@
|
||||||
|
locale = lang;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(__GLIBC__)
|
||||||
/* Finally make changes known. */
|
/* Finally make changes known. */
|
||||||
++_nl_msg_cat_cntr;
|
++_nl_msg_cat_cntr;
|
||||||
#endif
|
#endif
|
||||||
+#endif
|
+#endif
|
||||||
|
|
||||||
SETLOCALE(LC_ALL, ""); // call to libintl
|
SETLOCALE(LC_ALL, ""); // call to libintl
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'widelands'
|
# Template file for 'widelands'
|
||||||
pkgname=widelands
|
pkgname=widelands
|
||||||
version=18
|
version=19
|
||||||
revision=5
|
revision=1
|
||||||
wrksrc=${pkgname}-build${version}-src
|
wrksrc=${pkgname}-build${version}-src
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="
|
configure_args="
|
||||||
|
@ -11,14 +11,17 @@ configure_args="
|
||||||
-DWL_INSTALL_DATADIR=share/widelands
|
-DWL_INSTALL_DATADIR=share/widelands
|
||||||
-DWL_INSTALL_BINDIR=share/widelands"
|
-DWL_INSTALL_BINDIR=share/widelands"
|
||||||
hostmakedepends="python pkg-config"
|
hostmakedepends="python pkg-config"
|
||||||
makedepends="boost-devel minizip-devel glu-devel glew-devel SDL_gfx-devel SDL_image-devel SDL_net-devel SDL_mixer-devel SDL_ttf-devel lua51-devel"
|
makedepends="boost-devel icu-devel minizip-devel glu-devel glew-devel SDL2_gfx-devel
|
||||||
|
SDL2_image-devel SDL2_net-devel SDL2_mixer-devel SDL2_ttf-devel lua51-devel"
|
||||||
depends="${pkgname}-data-${version}_${revision}"
|
depends="${pkgname}-data-${version}_${revision}"
|
||||||
short_desc="A real-time strategy game"
|
short_desc="A real-time strategy game"
|
||||||
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://www.widelands.org/"
|
homepage="http://www.widelands.org/"
|
||||||
distfiles="https://launchpad.net/${pkgname}/build${version}/build-${version}/+download/${pkgname}-build${version}-src.tar.bz2"
|
distfiles="https://launchpad.net/${pkgname}/build${version}/build${version}/+download/${pkgname}-build${version}-src.tar.bz2"
|
||||||
checksum="6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3"
|
checksum="e511f9d26828a2b71b64cdfc6674e6e847543b2da73961ab882acca36c7c01a6"
|
||||||
|
|
||||||
|
CXXFLAGS="-Wno-maybe-uninitialized"
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
|
vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
|
||||||
|
@ -29,17 +32,6 @@ widelands-data_package() {
|
||||||
noarch=yes
|
noarch=yes
|
||||||
short_desc+=" - data files"
|
short_desc+=" - data files"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/share/widelands/campaigns
|
vmove usr/share/widelands
|
||||||
vmove usr/share/widelands/fonts
|
|
||||||
vmove usr/share/widelands/global
|
|
||||||
vmove usr/share/widelands/locale
|
|
||||||
vmove usr/share/widelands/maps
|
|
||||||
vmove usr/share/widelands/music
|
|
||||||
vmove usr/share/widelands/pics
|
|
||||||
vmove usr/share/widelands/scripting
|
|
||||||
vmove usr/share/widelands/sound
|
|
||||||
vmove usr/share/widelands/tribes
|
|
||||||
vmove usr/share/widelands/txts
|
|
||||||
vmove usr/share/widelands/worlds
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue