diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-08-26 21:30:02 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-08-26 21:30:02 +0000 |
commit | 3e8533ab8d6128d63a1d0f01340e02a49804c0ae (patch) | |
tree | 20760c21497f95b37533e9b105ccd86ffdce3b37 /games-misc/xcowsay | |
parent | Clean up patch. (diff) | |
download | gentoo-2-3e8533ab8d6128d63a1d0f01340e02a49804c0ae.tar.gz gentoo-2-3e8533ab8d6128d63a1d0f01340e02a49804c0ae.tar.bz2 gentoo-2-3e8533ab8d6128d63a1d0f01340e02a49804c0ae.zip |
Apply patch from upstream which fixes compilation with -dbus. Bug #334533
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'games-misc/xcowsay')
-rw-r--r-- | games-misc/xcowsay/ChangeLog | 6 | ||||
-rw-r--r-- | games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch | 14 | ||||
-rw-r--r-- | games-misc/xcowsay/xcowsay-1.2.ebuild | 10 |
3 files changed, 27 insertions, 3 deletions
diff --git a/games-misc/xcowsay/ChangeLog b/games-misc/xcowsay/ChangeLog index e086265212c4..b295264b6c0b 100644 --- a/games-misc/xcowsay/ChangeLog +++ b/games-misc/xcowsay/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-misc/xcowsay # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/ChangeLog,v 1.1 2010/08/25 10:27:06 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/ChangeLog,v 1.2 2010/08/26 21:30:02 hwoarang Exp $ + + 26 Aug 2010; Markos Chandras <hwoarang@gentoo.org> xcowsay-1.2.ebuild, + +files/xcowsay-1.2-no-dbus.patch: + Apply patch from upstream which fixes compilation with -dbus. Bug #334533 *xcowsay-1.2 (25 Aug 2010) diff --git a/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch b/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch new file mode 100644 index 000000000000..a35f34984732 --- /dev/null +++ b/games-misc/xcowsay/files/xcowsay-1.2-no-dbus.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index 3554e67..b8b66c1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,8 +35,8 @@ AC_ARG_ENABLE(dbus, + [AS_HELP_STRING([--enable-dbus], [Build the DBus daemon.])], + [if test "$enableval" = "yes" ; then + modules="$xcowsayd_modules" ++ CFLAGS="$CFLAGS -DWITH_DBUS" + fi +- CFLAGS="$CFLAGS -DWITH_DBUS" + AC_FUNC_FORK]) + + PKG_CHECK_MODULES(XCOWSAY, $modules) diff --git a/games-misc/xcowsay/xcowsay-1.2.ebuild b/games-misc/xcowsay/xcowsay-1.2.ebuild index 66306e9de968..84e12873b717 100644 --- a/games-misc/xcowsay/xcowsay-1.2.ebuild +++ b/games-misc/xcowsay/xcowsay-1.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.2.ebuild,v 1.1 2010/08/25 10:27:06 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/xcowsay/xcowsay-1.2.ebuild,v 1.2 2010/08/26 21:30:02 hwoarang Exp $ EAPI="2" -inherit base +inherit base autotools DESCRIPTION="configurable talking graphical cow (inspired by cowsay)" HOMEPAGE="http://www.doof.me.uk/xcowsay/" @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="dbus" RDEPEND="dbus? ( sys-apps/dbus ) + dev-libs/dbus-glib games-misc/fortune-mod media-libs/freetype:2 media-libs/libpng @@ -23,6 +24,11 @@ RDEPEND="dbus? ( sys-apps/dbus ) DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-no-dbus.patch + eautoreconf +} + src_configure() { econf $(use_enable dbus) } |