diff options
author | Yuri Vasilevski <yvasilev@gentoo.org> | 2006-06-23 17:08:56 +0000 |
---|---|---|
committer | Yuri Vasilevski <yvasilev@gentoo.org> | 2006-06-23 17:08:56 +0000 |
commit | 0ed06e50439f5ea79eac93209d292e493389c968 (patch) | |
tree | 8ebc4924e11a510c9eab266081e19d1df9c909ea /x11-plugins | |
parent | ~amd64 (diff) | |
download | gentoo-2-0ed06e50439f5ea79eac93209d292e493389c968.tar.gz gentoo-2-0ed06e50439f5ea79eac93209d292e493389c968.tar.bz2 gentoo-2-0ed06e50439f5ea79eac93209d292e493389c968.zip |
Now build if x11-libs/libmatchbox was compiled w/o jpeg support, and then, does not provide FALSE/TRUE definitions.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'x11-plugins')
3 files changed, 34 insertions, 3 deletions
diff --git a/x11-plugins/matchbox-applet-startup-monitor/ChangeLog b/x11-plugins/matchbox-applet-startup-monitor/ChangeLog index cdf7d5420dca..a27105c3d759 100644 --- a/x11-plugins/matchbox-applet-startup-monitor/ChangeLog +++ b/x11-plugins/matchbox-applet-startup-monitor/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/matchbox-applet-startup-monitor # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/ChangeLog,v 1.2 2006/04/27 08:57:00 antarus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/ChangeLog,v 1.3 2006/06/23 17:08:56 yvasilev Exp $ + + 23 Jun 2006; <yvasilev@gentoo.org> + +files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch, + matchbox-applet-startup-monitor-0.1.ebuild: + Now build if x11-libs/libmatchbox was compiled w/o jpeg support, and then, + does not provide FALSE/TRUE definitions. 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest: Fixing duff SHA256 digests: Bug # 131293 diff --git a/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch b/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch new file mode 100644 index 000000000000..1c8530497313 --- /dev/null +++ b/x11-plugins/matchbox-applet-startup-monitor/files/matchbox-applet-startup-monitor-0.1-false-true-fix.patch @@ -0,0 +1,18 @@ +diff -Naurp mb-applet-startup-monitor-0.1.orig/mbmonitor.c mb-applet-startup-monitor-0.1/mbmonitor.c +--- mb-applet-startup-monitor-0.1.orig/mbmonitor.c 2004-12-21 11:00:24.000000000 -0500 ++++ mb-applet-startup-monitor-0.1/mbmonitor.c 2006-06-23 12:33:38.000000000 -0400 +@@ -39,6 +39,14 @@ + + #include <libmb/mb.h> + ++/* libmb inherits FALSE/TRUE definitions only if compiled with jpeg support. */ ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif ++ + #define TIMEOUT 20 + #define POLLTIME 10 + #define HOURGLASS_N_FRAMES 8 diff --git a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild b/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild index ef9e1a5dd32d..82a77bf2e534 100644 --- a/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild +++ b/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild @@ -1,8 +1,8 @@ # Copyright 2006-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild,v 1.1 2006/03/13 00:26:46 yvasilev Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor-0.1.ebuild,v 1.2 2006/06/23 17:08:56 yvasilev Exp $ -inherit versionator +inherit eutils versionator MY_PN=${PN/matchbox/mb} MY_P=${MY_PN}-${PV} @@ -24,6 +24,13 @@ RDEPEND="${DEPEND} S="${WORKDIR}/${MY_P}" +src_unpack () { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}/${P}-false-true-fix.patch" +} + src_compile() { econf || die "Configuration failed" |