summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-07-21 16:53:49 +0000
committerPacho Ramos <pacho@gentoo.org>2012-07-21 16:53:49 +0000
commit0a2a6a47d2eb612ded0b21890b484d69e262f7f0 (patch)
tree49989f5545e96e9bbc92c71a3341aba66fa125aa /games-emulation
parentVersion bump. (diff)
downloadgentoo-2-0a2a6a47d2eb612ded0b21890b484d69e262f7f0.tar.gz
gentoo-2-0a2a6a47d2eb612ded0b21890b484d69e262f7f0.tar.bz2
gentoo-2-0a2a6a47d2eb612ded0b21890b484d69e262f7f0.zip
Let it compile against glib-2.32
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/gxmame/ChangeLog7
-rw-r--r--games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch13
-rw-r--r--games-emulation/gxmame/gxmame-0.35_beta2.ebuild7
3 files changed, 22 insertions, 5 deletions
diff --git a/games-emulation/gxmame/ChangeLog b/games-emulation/gxmame/ChangeLog
index ef79f966eb11..c5bbb9590120 100644
--- a/games-emulation/gxmame/ChangeLog
+++ b/games-emulation/gxmame/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/gxmame
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.22 2012/05/04 04:38:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/ChangeLog,v 1.23 2012/07/21 16:53:49 pacho Exp $
+
+ 21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+ +files/gxmame-0.35_beta2-glib-single-include.patch, gxmame-0.35_beta2.ebuild:
+ Let it compile against glib-2.32
04 May 2012; Jeff Horelick <jdhore@gentoo.org> gxmame-0.35_beta2.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
@@ -105,4 +109,3 @@
13 Jan 2003; Ryan Phillips <rphillips@gentoo.org> gxmame-0.31.ebuild:
Official version
-
diff --git a/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch b/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
new file mode 100644
index 000000000000..83ef4aa075e5
--- /dev/null
+++ b/games-emulation/gxmame/files/gxmame-0.35_beta2-glib-single-include.patch
@@ -0,0 +1,13 @@
+Index: gxmame-0.35beta2/src/gxmame.c
+===================================================================
+--- gxmame-0.35beta2.orig/src/gxmame.c
++++ gxmame-0.35beta2/src/gxmame.c
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <glib/gprintf.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <gtk/gtkmain.h>
+ #include <gtk/gtkfilesel.h>
+
diff --git a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
index c1a02f5292fc..9b75c876625f 100644
--- a/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
+++ b/games-emulation/gxmame/gxmame-0.35_beta2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.35_beta2.ebuild,v 1.12 2012/05/04 04:38:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gxmame/gxmame-0.35_beta2.ebuild,v 1.13 2012/07/21 16:53:49 pacho Exp $
-EAPI=2
+EAPI=4
inherit eutils games
MY_P="${PN}-${PV/_beta/beta}"
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-glib-single-include.patch
epatch "${FILESDIR}"/${P}-ovflfix.patch
sed -i \
-e "s:-O2 -fomit-frame-pointer -ffast-math:${CFLAGS}:" \
@@ -60,7 +61,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
dodoc AUTHORS BUGS ChangeLog NEWS README TODO
prepgamesdirs
}