diff options
author | Mamoru Komachi <usata@gentoo.org> | 2004-11-06 11:02:59 +0000 |
---|---|---|
committer | Mamoru Komachi <usata@gentoo.org> | 2004-11-06 11:02:59 +0000 |
commit | 58ca8822f59efc7a1b24b50e85b587543096e34c (patch) | |
tree | 3c83bd14ca60aae5645b21e1e10b826c52f3dc94 | |
parent | Version bump, bug 69857. (Manifest recommit) (diff) | |
download | gentoo-2-58ca8822f59efc7a1b24b50e85b587543096e34c.tar.gz gentoo-2-58ca8822f59efc7a1b24b50e85b587543096e34c.tar.bz2 gentoo-2-58ca8822f59efc7a1b24b50e85b587543096e34c.zip |
Fixed compile bug with gcc-3.4. Thanks to Chris Arepantis <ChrisArepantis@gmail.com>; bug #69482.
-rw-r--r-- | x11-misc/macopix/ChangeLog | 7 | ||||
-rw-r--r-- | x11-misc/macopix/files/macopix-1.2.1-gentoo.diff | 12 | ||||
-rw-r--r-- | x11-misc/macopix/macopix-1.2.1.ebuild | 10 |
3 files changed, 27 insertions, 2 deletions
diff --git a/x11-misc/macopix/ChangeLog b/x11-misc/macopix/ChangeLog index ae30fe04cd44..9f48eadb86dd 100644 --- a/x11-misc/macopix/ChangeLog +++ b/x11-misc/macopix/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/macopix # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.8 2004/10/30 10:11:57 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/ChangeLog,v 1.9 2004/11/06 11:02:59 usata Exp $ + + 06 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> + +files/macopix-1.2.1-gentoo.diff, macopix-1.2.1.ebuild: + Fixed compile bug with gcc-3.4. Thanks to Chris Arepantis + <ChrisArepantis@gmail.com>; bug #69482. 30 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -macopix-1.0.3.ebuild, macopix-1.0.4.ebuild, macopix-1.2.1.ebuild: diff --git a/x11-misc/macopix/files/macopix-1.2.1-gentoo.diff b/x11-misc/macopix/files/macopix-1.2.1-gentoo.diff new file mode 100644 index 000000000000..8cafdaf3559b --- /dev/null +++ b/x11-misc/macopix/files/macopix-1.2.1-gentoo.diff @@ -0,0 +1,12 @@ +diff -urN macopix-1.2.1/src/main.h macopix-1.2.1p/src/main.h +--- macopix-1.2.1/src/main.h 2004-09-08 03:31:59.000000000 +0300 ++++ macopix-1.2.1p/src/main.h 2004-10-30 07:29:55.723233988 +0300 +@@ -276,7 +276,7 @@ + #define PROCMAIL_LOG "/procmail.log" + + +-enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus; ++enum{ NO_MAIL, OLD_MAIL, NEW_MAIL, KEEP_NEW_MAIL } MailStatus0; + // mail status; array subscripts + + #define BIFF_WIN_WIDTH 400 // Default_Size of Biff Window diff --git a/x11-misc/macopix/macopix-1.2.1.ebuild b/x11-misc/macopix/macopix-1.2.1.ebuild index f8636b70eaae..5d6a8acb6670 100644 --- a/x11-misc/macopix/macopix-1.2.1.ebuild +++ b/x11-misc/macopix/macopix-1.2.1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.2.1.ebuild,v 1.2 2004/10/30 10:11:57 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/macopix/macopix-1.2.1.ebuild,v 1.3 2004/11/06 11:02:59 usata Exp $ + +inherit eutils DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application on UNIX / X Window system." HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html" @@ -32,6 +34,12 @@ DEPEND="gtk2? ( >=x11-libs/gtk+-2.0.0 nls? ( >=sys-devel/gettext-0.10 ) media-libs/libpng" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.diff +} + src_compile() { econf $(use_with gtk2) \ $(use_enable nls) || die |