* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warmux/files/, games-strategy/warmux/
@ 2016-12-17 10:47 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-12-17 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 0455ee01fd7b958c9a36ae568b7cac0725416b9e
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 17 10:36:47 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec 17 10:37:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0455ee01
games-strategy/warmux: Fix building with GCC 6
Gentoo-bug: 598639
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../warmux/files/warmux-11.04.1-fix-c++14.patch | 14 ++++++++++++++
games-strategy/warmux/warmux-11.04.1-r1.ebuild | 21 ++++++++++++---------
2 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
new file mode 100644
index 00000000..223ee47
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
@@ -0,0 +1,14 @@
+In C++14, bool -> T* implicit conversions are not allowed anymore.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=598639
+
+--- a/src/interface/weapon_menu.cpp
++++ b/src/interface/weapon_menu.cpp
+@@ -391,7 +391,7 @@
+ Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
+ {
+ if (!show)
+- return false;
++ return NULL;
+ const std::vector<PolygonItem *>& items = poly->GetItem();
+ WeaponMenuItem * tmp;
+ Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
index 6f265a9..17086e7 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=6
+
inherit autotools eutils
DESCRIPTION="A free Worms clone"
@@ -14,15 +15,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="debug nls unicode"
-RDEPEND="media-libs/libsdl[joystick,video,X]
+RDEPEND="
+ dev-libs/libxml2
+ media-libs/libsdl[joystick,video,X]
media-libs/sdl-image[jpeg,png]
media-libs/sdl-mixer[vorbis]
media-libs/sdl-ttf
media-libs/sdl-net
- >=media-libs/sdl-gfx-2.0.22
- net-misc/curl
+ media-libs/sdl-gfx
media-fonts/dejavu
- dev-libs/libxml2
+ net-misc/curl
x11-libs/libX11
nls? ( virtual/libintl )
unicode? ( dev-libs/fribidi )"
@@ -38,19 +40,19 @@ PATCHES=(
"${FILESDIR}"/${P}-action.patch
"${FILESDIR}"/${P}-gcc47.patch
"${FILESDIR}"/${P}-stat.patch
+ "${FILESDIR}"/${P}-fix-c++14.patch
)
src_prepare() {
default
-
eautoreconf
}
src_configure() {
econf \
- --with-localedir-name=/usr/share/locale \
- --with-datadir-name=/usr/share/${PN} \
- --with-font-path=/usr/share/fonts/dejavu/DejaVuSans.ttf \
+ --with-localedir-name="${EPREFIX}"/usr/share/locale \
+ --with-datadir-name="${EPREFIX}"/usr/share/${PN} \
+ --with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
$(use_enable debug) \
$(use_enable nls) \
$(use_enable unicode fribidi)
@@ -58,7 +60,8 @@ src_configure() {
src_install() {
default
- rm -f "${D}/usr/share/${PN}/font/DejaVuSans.ttf"
+
+ rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
doicon data/icon/warmux.svg
make_desktop_entry warmux Warmux
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-strategy/warmux/files/, games-strategy/warmux/
@ 2021-10-04 23:58 Ionen Wolkens
0 siblings, 0 replies; 2+ messages in thread
From: Ionen Wolkens @ 2021-10-04 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 748756d8d10e901754d9d33a9a6104284ebd6c76
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Oct 4 20:52:18 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 23:56:18 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748756d8
games-strategy/warmux: fix build, deps, bump eapi
Remove nls USE flag, because it caused build failure when disabled,
because in that case it defines its own ngettext macro, which conflicts
with that function defined in libintl.h which is transitively included
anyway.
Closes: https://bugs.gentoo.org/739400
Closes: https://bugs.gentoo.org/796914
Closes: https://bugs.gentoo.org/631434
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/22489
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../warmux/files/warmux-11.04.1-clang.patch | 13 ++++++++
...-11.04.1-r1.ebuild => warmux-11.04.1-r2.ebuild} | 37 +++++++++++++---------
2 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/games-strategy/warmux/files/warmux-11.04.1-clang.patch b/games-strategy/warmux/files/warmux-11.04.1-clang.patch
new file mode 100644
index 00000000000..eb4097bfe6f
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-clang.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/739400
+
+--- a/src/map/tile.cpp
++++ b/src/map/tile.cpp
+@@ -673,7 +673,7 @@ Tile::SynchTileList Tile::GetTilesToSynch()
+ TileItem_NonEmpty *t = static_cast<TileItem_NonEmpty*>(item[i]);
+
+ if (t->NeedSynch()) {
+- SynchTileInfo info = { i, t->GetSynchsum() };
++ SynchTileInfo info = { (uint16_t)i, t->GetSynchsum() };
+ list.push_back(info);
+ }
+ }
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r2.ebuild
similarity index 64%
rename from games-strategy/warmux/warmux-11.04.1-r1.ebuild
rename to games-strategy/warmux/warmux-11.04.1-r2.ebuild
index fd2b025c8fa..b387e9b15a2 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r2.ebuild
@@ -1,36 +1,46 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit autotools desktop
DESCRIPTION="A free Worms clone"
-HOMEPAGE="http://gna.org/projects/warmux/"
-SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
S="${WORKDIR}"/${PN}-11.04
-LICENSE="GPL-2"
+LICENSE="
+ GPL-2+
+ || ( Apache-2.0 GPL-3 )
+ UbuntuFontLicense-1.0
+ vlgothic
+"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls unicode"
+IUSE="debug unicode"
RDEPEND="
dev-libs/libxml2
+ media-libs/libpng:=
media-libs/libsdl[joystick,video,X]
media-libs/sdl-image[jpeg,png]
media-libs/sdl-mixer[vorbis]
media-libs/sdl-ttf
media-libs/sdl-net
- media-libs/sdl-gfx
- media-fonts/dejavu
+ media-libs/sdl-gfx:=
net-misc/curl
+ virtual/libintl
x11-libs/libX11
- nls? ( virtual/libintl )
- unicode? ( dev-libs/fribidi )"
+ unicode? ( dev-libs/fribidi )
+"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
+ sys-devel/gettext
virtual/pkgconfig
- nls? ( sys-devel/gettext )"
+"
PATCHES=(
"${FILESDIR}"/${P}-gentoo.patch
@@ -40,6 +50,7 @@ PATCHES=(
"${FILESDIR}"/${P}-stat.patch
"${FILESDIR}"/${P}-fix-c++14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+ "${FILESDIR}"/${P}-clang.patch
)
src_prepare() {
@@ -49,18 +60,14 @@ src_prepare() {
src_configure() {
econf \
- --with-localedir-name="${EPREFIX}"/usr/share/locale \
- --with-datadir-name="${EPREFIX}"/usr/share/${PN} \
- --with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
+ --enable-nls \
$(use_enable debug) \
- $(use_enable nls) \
$(use_enable unicode fribidi)
}
src_install() {
default
- rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
doicon data/icon/warmux.svg
make_desktop_entry warmux Warmux
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-04 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-17 10:47 [gentoo-commits] repo/gentoo:master commit in: games-strategy/warmux/files/, games-strategy/warmux/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-10-04 23:58 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox