[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/
commit: 428d22aca09a7b9fda1bab325ef24642d3e07448
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jul 26 18:21:23 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jul 26 18:23:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428d22ac
games-strategy/wesnoth: Fix build with boost-1.70
Closes: https://bugs.gentoo.org/690772
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../wesnoth/files/wesnoth-1.14.7-boost-1.70.patch | 24 ++
games-strategy/wesnoth/wesnoth-1.14.7.ebuild | 2 ++
2 files changed, 26 insertions(+)
diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
new file mode 100644
index 000..90c526789c5
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.14.7-boost-1.70.patch
@@ -0,0 +1,24 @@
+From 9d0e3bae096563297c9f51355968f27a67dbfdec Mon Sep 17 00:00:00 2001
+From: Charles Dang
+Date: Mon, 15 Jul 2019 03:18:31 +1100
+Subject: [PATCH] Removed redundant std::ref causing problems with Boost 1.70
+ (fixes #3990)
+
+The asio socket ctor already takes a reference.
+---
+ src/server/server_base.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/server/server_base.cpp b/src/server/server_base.cpp
+index 82b46e912025..8bcf974a62d1 100644
+--- a/src/server/server_base.cpp
b/src/server/server_base.cpp
+@@ -65,7 +65,7 @@ void server_base::start_server()
+
+ void server_base::serve()
+ {
+- socket_ptr socket =
std::make_shared(std::ref(io_service_));
++ socket_ptr socket =
std::make_shared(io_service_);
+ acceptor_.async_accept(*socket,
std::bind(_base::accept_connection, this, _1, socket));
+ }
+
diff --git a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
index 971ba1f87a9..e0b1b37602e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.7.ebuild
@@ -40,6 +40,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${P}-boost-1.70.patch )
+
pkg_setup() {
if use openmp; then
tc-has-openmp || die "Please switch to an openmp compatible
compiler"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/
commit: 9320a11fecbd758ca073072ebc06750313fbcdbb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jun 3 13:54:54 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 6 08:06:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9320a11f
games-strategy/wesnoth: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
games-strategy/wesnoth/Manifest | 1 -
games-strategy/wesnoth/files/wesnothd.rc | 22 -
games-strategy/wesnoth/wesnoth-1.12.6.ebuild | 119 ---
3 files changed, 142 deletions(-)
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 2a8b2573b38..ecefe36c0dd 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
-DIST wesnoth-1.12.6.tar.bz2 387869758 BLAKE2B
53328f8ebbaaabb266064fea57c0d28779183ba1b77ae8522c4dbb01c4a9ad9068d76307b48cec6576648132bf34f9a45efdb93ad36e03d035ed06e84711c9b6
SHA512
12ca3b5de8fd385b05cc8e76604f7aed68127a7542599d6e97cce793e10636e00bd65dcb088701e20ccc7191f41b1d67a00b291f885df880fac00d13d6fbde7a
DIST wesnoth-1.14.1.tar.gz 481355736 BLAKE2B
2cc41a36706919bbc505a9a6726ea9b0fbfd5bfde677da937fdde2645587f4407fb6ed2f7271efaf1763f9ab69a57d153130291d5dc0a79862e554963dd37079
SHA512
0372eb9479d3d24dc4bf692a83fe310d5b4493989f18f0a23070ee19a4bee2672efd38babe1579b08a321e3acba1ede5823376619c8a90102f968e53cc6e3f02
DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B
f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e
SHA512
010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
diff --git a/games-strategy/wesnoth/files/wesnothd.rc
b/games-strategy/wesnoth/files/wesnothd.rc
deleted file mode 100644
index f8662b0981f..000
--- a/games-strategy/wesnoth/files/wesnothd.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use net
-}
-
-start() {
- ebegin "Starting wesnothd"
- start-stop-daemon --start --quiet -b -m \
- --pidfile "GAMES_STATEDIR"/run/wesnothd/wesnothd.pid \
- -c GAMES_USER_DED:GAMES_GROUP \
- --exec "GAMES_BINDIR"/wesnothd
- eend $?
-}
-
-stop() {
- ebegin "Stopping wesnothd"
- start-stop-daemon --stop --quiet --pidfile
"GAMES_STATEDIR"/run/wesnothd/wesnothd.pid
- eend $?
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
b/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
deleted file mode 100644
index 3c5d8cf3cf0..000
--- a/games-strategy/wesnoth/wesnoth-1.12.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/;
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
- media-libs/sdl-net
- !dedicated? (
- >=media-libs/sdl-ttf-2.0.8
- >=media-libs/sdl-mixer-1.2[vorbis]
- >=media-libs/sdl-image-1.2[jpeg,png]
- fribidi? ( dev-libs/fribidi )
- dbus? ( sys-apps/dbus )
- sys-libs/zlib
- x11-libs/pango
- dev-lang/lua:0
- media-libs/fontconfig
- )
- >=dev-libs/boost-1.48:=[nls,threads]
- virtual/libintl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if use dedicated || use server ; then
- sed \
- -e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
- -e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
- -e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
- -e "s/GAMES_GROUP/${GAMES_GROUP}/"
"${FILESDIR}"/wesnothd.rc \
- > "${T}"/wesnothd || die
- fi
- if ! use doc ; then
- sed -i \
- -e '/manual/d' \
- doc/CMakeLists.txt || die
- fi
- # bug #472994
- mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
- mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
- # respect LINGUAS (bug #483316)
- if [[ ${LINGUAS+set} ]] ; then
- local langs
- for lang in $(cat po/LINGUAS)
- do
- has $lang $LINGUAS && langs+="$lang "
- done
-
[gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/files/, games-strategy/wesnoth/
commit: 4e4ea8746ff0c79b77dc4326dcd67db3db7eed64
Author: Matija Skala gmx com>
AuthorDate: Thu May 17 06:02:28 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu May 31 11:15:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4ea874
games-strategy/wesnoth: new wesnothd.rc file for 1.14
Bug: https://bugs.gentoo.org/654440
Closes: https://github.com/gentoo/gentoo/pull/8440
games-strategy/wesnoth/files/wesnothd.rc-r1| 23 ++
...noth-1.14.1.ebuild => wesnoth-1.14.1-r1.ebuild} | 4 ++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/games-strategy/wesnoth/files/wesnothd.rc-r1
b/games-strategy/wesnoth/files/wesnothd.rc-r1
new file mode 100644
index 000..c1a0d9d2016
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnothd.rc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use net
+}
+
+start() {
+ checkpath -q -d -m 0750 -o wesnoth:wesnoth /run/wesnothd
+ ebegin "Starting wesnothd"
+ start-stop-daemon --start --quiet -b -m \
+ --pidfile /run/wesnothd/wesnothd.pid \
+ -c wesnoth:wesnoth \
+ --exec /usr/bin/wesnothd
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping wesnothd"
+ start-stop-daemon --stop --quiet --pidfile /run/wesnothd/wesnothd.pid
+ eend $?
+}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
similarity index 96%
rename from games-strategy/wesnoth/wesnoth-1.14.1.ebuild
rename to games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
index 7372ade39d6..5a1f6c5af2e 100644
--- a/games-strategy/wesnoth/wesnoth-1.14.1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.14.1-r1.ebuild
@@ -108,7 +108,7 @@ src_configure() {
src_install() {
DOCS="README.md changelog.md players_changelog.md"
cmake-utils_src_install
if use dedicated || use server; then
- keepdir "/run/wesnothd"
- newinitd "${FILESDIR}"/wesnothd.rc wesnothd
+ rmdir "${ED%/}/run/wesnothd" || die
+ newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
fi
}
