diff options
Diffstat (limited to 'games-strategy/warmux')
-rw-r--r-- | games-strategy/warmux/Manifest | 9 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-action.patch | 12 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch | 14 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-gcc47.patch | 11 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-gentoo.patch | 40 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-stat.patch | 61 | ||||
-rw-r--r-- | games-strategy/warmux/files/warmux-11.04.1-zlib.patch | 11 | ||||
-rw-r--r-- | games-strategy/warmux/metadata.xml | 8 | ||||
-rw-r--r-- | games-strategy/warmux/warmux-11.04.1-r1.ebuild | 66 |
9 files changed, 232 insertions, 0 deletions
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest new file mode 100644 index 000000000000..822667f27489 --- /dev/null +++ b/games-strategy/warmux/Manifest @@ -0,0 +1,9 @@ +AUX warmux-11.04.1-action.patch 549 BLAKE2B d22e26bae34efd28729cbdb98e97365fb2e42de0bc8c464d2ccc9f2845a78d92716b8d432ae72deedd824938a5243aa3736baeccf7c12ec3cfba7c10573dd4d7 SHA512 c31ac142b43e593f4c7b9fff36a8dd0bb34b371a63935cf55627660d96eda8fe68af721254bd72a2168045a27b32a407df494eb6b216115a0bb0516478187ec9 +AUX warmux-11.04.1-fix-c++14.patch 488 BLAKE2B 0f60ce6c6d4238ec9eaa06428b4ff251fca1bfb8e3d05cb5c57a9a5d9e229c0775b76fffe33704aa6d8b636959cffc4f529d19cd09065e5842ccfd89745207cd SHA512 c8c6d5d070e926f7ffd03766c95481c0db8b43a8a0f3fad301e7e7210013098696ad5af0c5ab8c70f0081711b6b50847d8873af0ea79315c4c45c760e915eb88 +AUX warmux-11.04.1-gcc47.patch 335 BLAKE2B cfa1e6b42a00a0683c06257bd9156a8a85eef3181ba385f3eb4a82f944259cd2db1b0b56bccf0f68b6b09505f6825e02394fc07c8cd76bd8772340eefa43bc65 SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270 +AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffce3362528bf2967b790bb51d7d8ec5bbd803d019dd0d4a68bc757cbe82bf4ca4f03745ffb6c91cbe76e17c34ce9e8e SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9 +AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902 +AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c +DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d +EBUILD warmux-11.04.1-r1.ebuild 1465 BLAKE2B 266e0cbed986da4ee8ccfcd6982eead0627e1f6d90fbdf4cbe1e4a9c915149ccf0d7a7f289436c4abce4a331325bc2b4977af5268b95e5dfdaba1246e20377e9 SHA512 2e0d118e1a9fbb86fdaeaaa6504629c0ab3d569b90609f7bba13b39476b3a042aa9dad73ae66fd40508af4ee8a5f7bd31d3cf3e21161deb4f48054a51861eeee +MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-strategy/warmux/files/warmux-11.04.1-action.patch b/games-strategy/warmux/files/warmux-11.04.1-action.patch new file mode 100644 index 000000000000..e1530337a259 --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-action.patch @@ -0,0 +1,12 @@ +diff -uNr warmux-11.04.orig/lib/warmux/action/action.cpp warmux-11.04/lib/warmux/action/action.cpp
+--- warmux-11.04.orig/lib/warmux/action/action.cpp 2012-03-27 15:18:08.440709875 +0200
++++ warmux-11.04/lib/warmux/action/action.cpp 2012-03-27 15:17:44.871711354 +0200
+@@ -85,7 +85,7 @@
+ {
+ m_creator = _creator;
+
+- m_header.len = SDLNet_Read32(buffer);
++ m_header.len = SDLNet_Read32((void *)buffer);
+ ASSERT(m_header.len >= sizeof(Header));
+ buffer += 4;
+ // All of the following could be skipped for the actions we now,
\ No newline at end of file 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 000000000000..223ee47ab5a2 --- /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/files/warmux-11.04.1-gcc47.patch b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch new file mode 100644 index 000000000000..8460bcbd0b1c --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch @@ -0,0 +1,11 @@ +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> diff --git a/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch b/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch new file mode 100644 index 000000000000..62d22f84c82d --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch @@ -0,0 +1,40 @@ +diff -ru warmux-11.04.orig/configure.ac warmux-11.04/configure.ac +--- warmux-11.04.orig/configure.ac 2011-04-18 16:46:12.000000000 -0400 ++++ warmux-11.04/configure.ac 2011-04-19 11:17:27.380256500 -0400 +@@ -43,8 +43,6 @@ + AC_MSG_ERROR([*** No C++ compiler can be found!]) + fi + +-AX_CFLAGS_WARN_ALL([CXXFLAGS]) +- + # ========================================================================== + # == Set flags for various environments = + # ========================================================================== +@@ -348,14 +346,9 @@ + exit 1 + fi + +-dnl === Add Werror flag for gcc/g++ if debug mode is enabled, ============== +-dnl === but allow RTTI (ie dynamic_cast, typeid/typeinfo unavailable) ====== +-if test "x${debug}" = "xyes"; then ++if test "x${debug}" != "xyes"; then +- CFLAGS="$CFLAGS -Werror" +- CXXFLAGS="$CXXFLAGS -Werror" +-else + CXXFLAGS="$CXXFLAGS -fno-rtti" + fi + + dnl === Forbid exceptions (Android platform requirement) =================== + CXXFLAGS="$CXXFLAGS -fno-exceptions" +diff -ru warmux-11.04.orig/data/Makefile.am warmux-11.04/data/Makefile.am +--- warmux-11.04.orig/data/Makefile.am 2011-04-18 16:46:11.000000000 -0400 ++++ warmux-11.04/data/Makefile.am 2011-04-19 11:17:45.134724536 -0400 +@@ -1,8 +1,2 @@ +-xdg_appsdir = $(prefix)/share/applications +-xdg_apps_DATA = warmux.desktop warmux_files.desktop +-pixmapsdir = $(prefix)/share/pixmaps +-pixmaps_DATA = icon/warmux_128x128.png +- + nobase_dist_pkgdata_DATA = @DATA_FILES@ + pkgdatadir = @DATADIR@ +-EXTRA_DIST = $(pixmaps_DATA) diff --git a/games-strategy/warmux/files/warmux-11.04.1-stat.patch b/games-strategy/warmux/files/warmux-11.04.1-stat.patch new file mode 100644 index 000000000000..487b3805ba6f --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-stat.patch @@ -0,0 +1,61 @@ +diff -ur warmux-11.04.orig/lib/warmux/tools/file_tools.cpp warmux-11.04/lib/warmux/tools/file_tools.cpp +--- warmux-11.04.orig/lib/warmux/tools/file_tools.cpp 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04/lib/warmux/tools/file_tools.cpp 2013-03-05 16:58:42.040443845 +0100 +@@ -33,6 +33,8 @@ + # include <direct.h> + # undef DeleteFile // windows.h defines it I think + #else ++# include <sys/types.h> ++# include <sys/stat.h> + # include <stdlib.h> // getenv + # include <unistd.h> // not needed by mingw + #endif +@@ -275,18 +277,14 @@ + { + DIR *dir; + struct dirent *file; +-#ifdef __SYMBIAN32__ + std::string dname; +-#endif + }; + + FolderSearch* OpenFolder(const std::string& dirname) + { + FolderSearch *f = new FolderSearch; + f->dir = opendir(dirname.c_str()); +-#ifdef __SYMBIAN32__ + f->dname = dirname; +-#endif + + if (!f->dir) { + delete f; +@@ -300,11 +298,11 @@ + { + while ((f->file = readdir(f->dir)) != NULL) { + ++ if ( + #ifdef __SYMBIAN32__ +- if (f->file->d_namlen && DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) { +-#else +- if (f->file->d_type == DT_DIR) { ++ f->file->d_namlen && + #endif ++ DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) { + // If we are also looking for files, report it isn't one + if (file) + file = false; +@@ -316,11 +314,11 @@ + continue; + + // This is a file and we do search for file ++ if ( + #ifdef __SYMBIAN32__ +- if (f->file->d_namlen && DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) { +-#else +- if (f->file->d_type == DT_REG) { ++ f->file->d_namlen && + #endif ++ DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) { + file = true; + return f->file->d_name; + } diff --git a/games-strategy/warmux/files/warmux-11.04.1-zlib.patch b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch new file mode 100644 index 000000000000..c7e77aba11c8 --- /dev/null +++ b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch @@ -0,0 +1,11 @@ +diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp +--- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 ++++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 +@@ -25,6 +25,7 @@ + #include <SDL_image.h> + #include <SDL_rotozoom.h> + #include <png.h> ++#include <zlib.h> + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/games-strategy/warmux/metadata.xml b/games-strategy/warmux/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-strategy/warmux/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> +</maintainer> +</pkgmetadata> diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild new file mode 100644 index 000000000000..c62645eee128 --- /dev/null +++ b/games-strategy/warmux/warmux-11.04.1-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils + +DESCRIPTION="A free Worms clone" +HOMEPAGE="http://gna.org/projects/warmux/" +SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +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 )" + +S=${WORKDIR}/${PN}-11.04 + +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 +) + +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 +} |