From 748756d8d10e901754d9d33a9a6104284ebd6c76 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 4 Oct 2021 21:52:18 +0100 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/22489 Signed-off-by: Ionen Wolkens --- .../warmux/files/warmux-11.04.1-clang.patch | 13 ++++ games-strategy/warmux/warmux-11.04.1-r1.ebuild | 66 ------------------- games-strategy/warmux/warmux-11.04.1-r2.ebuild | 73 ++++++++++++++++++++++ 3 files changed, 86 insertions(+), 66 deletions(-) create mode 100644 games-strategy/warmux/files/warmux-11.04.1-clang.patch delete mode 100644 games-strategy/warmux/warmux-11.04.1-r1.ebuild create mode 100644 games-strategy/warmux/warmux-11.04.1-r2.ebuild (limited to 'games-strategy') 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 000000000000..eb4097bfe6f3 --- /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(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-r1.ebuild deleted file mode 100644 index fd2b025c8fa8..000000000000 --- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools desktop - -DESCRIPTION="A free Worms clone" -HOMEPAGE="http://gna.org/projects/warmux/" -SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2" -S="${WORKDIR}"/${PN}-11.04 - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug nls unicode" - -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 - media-fonts/dejavu - net-misc/curl - x11-libs/libX11 - nls? ( virtual/libintl ) - unicode? ( dev-libs/fribidi )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-zlib.patch - "${FILESDIR}"/${P}-action.patch - "${FILESDIR}"/${P}-gcc47.patch - "${FILESDIR}"/${P}-stat.patch - "${FILESDIR}"/${P}-fix-c++14.patch - "${FILESDIR}"/${P}-respect-AR.patch -) - -src_prepare() { - default - eautoreconf -} - -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 \ - $(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 -} diff --git a/games-strategy/warmux/warmux-11.04.1-r2.ebuild b/games-strategy/warmux/warmux-11.04.1-r2.ebuild new file mode 100644 index 000000000000..b387e9b15a27 --- /dev/null +++ b/games-strategy/warmux/warmux-11.04.1-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools desktop + +DESCRIPTION="A free Worms clone" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.bz2" +S="${WORKDIR}"/${PN}-11.04 + +LICENSE=" + GPL-2+ + || ( Apache-2.0 GPL-3 ) + UbuntuFontLicense-1.0 + vlgothic +" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +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:= + net-misc/curl + virtual/libintl + x11-libs/libX11 + unicode? ( dev-libs/fribidi ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-zlib.patch + "${FILESDIR}"/${P}-action.patch + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-stat.patch + "${FILESDIR}"/${P}-fix-c++14.patch + "${FILESDIR}"/${P}-respect-AR.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-nls \ + $(use_enable debug) \ + $(use_enable unicode fribidi) +} + +src_install() { + default + + doicon data/icon/warmux.svg + make_desktop_entry warmux Warmux +} -- cgit v1.2.3-65-gdbad