diff options
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch | 11 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.4.2.ebuild | 7 |
3 files changed, 21 insertions, 3 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog index b642e2a3a395..fb7bd9de2bb4 100644 --- a/games-strategy/freeciv/ChangeLog +++ b/games-strategy/freeciv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/freeciv # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.150 2014/05/23 17:59:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.151 2014/05/24 15:16:41 hasufell Exp $ + + 24 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild, + +files/freeciv-2.4.2-as-needed.patch: + fix linking issues wrt #511128, patch by Andrei Slavoiu 23 May 2014; Julian Ospald <hasufell@gentoo.org> freeciv-2.4.2.ebuild: set readline slot diff --git a/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch new file mode 100644 index 000000000000..99212fd38e05 --- /dev/null +++ b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch @@ -0,0 +1,11 @@ +--- server/Makefile.am.old 2014-05-24 02:44:17.956898224 +0300 ++++ server/Makefile.am 2014-05-24 02:44:51.666659234 +0300 +@@ -133,7 +133,7 @@ + $(top_builddir)/server/scripting/libscripting_server.la + + libfreeciv_srv_la_LIBADD = \ +- $(srvlibs) ++ $(srvlibs) $(SERVER_LIBS) + + freeciv_server_LDFLAGS = $(GGZDMOD_LDFLAGS) + diff --git a/games-strategy/freeciv/freeciv-2.4.2.ebuild b/games-strategy/freeciv/freeciv-2.4.2.ebuild index f8b50f405959..67fa83782723 100644 --- a/games-strategy/freeciv/freeciv-2.4.2.ebuild +++ b/games-strategy/freeciv/freeciv-2.4.2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.2 2014/05/23 17:59:37 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.3 2014/05/24 15:16:41 hasufell Exp $ # FIXME: gtk3 support breaks ggz support EAPI=5 -inherit eutils gnome2-utils games-ggz games +inherit autotools eutils gnome2-utils games-ggz games DESCRIPTION="multiplayer strategy game (Civilization Clone)" HOMEPAGE="http://www.freeciv.org/" @@ -69,6 +69,9 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-as-needed.patch + eautoreconf + # install the .desktop in /usr/share/applications # install the icons in /usr/share/pixmaps sed -i \ |