Fixed compile bug with gcc-3.4. Thanks to Chris Arepantis <ChrisArepantis@gmail.com...

diff --git a/x11-misc/macopix/ChangeLog b/x11-misc/macopix/ChangeLog
index ae30fe04cd443faacf997ee2f7f30bd3cb0460da..9f48eadb86dd9add2a25221ec1dc0d5de3f9d2df 100644 (file)
--- 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/Manifest b/x11-misc/macopix/Manifest
index c95e5c9508bd5bf2f9d51826a923f9446264dd0c..2eaa22c7e0611d093dd28dd65fbc464d203c5f23 100644 (file)
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,6 +1,7 @@
 MD5 76b00c6b759e2f6a382474f4876df943 macopix-1.0.4.ebuild 1656
-MD5 987d8bac524057caf005d290d6f750a2 ChangeLog 1159
-MD5 b3ff861da39f4fd24a94443b24ef9bad macopix-1.2.1.ebuild 1694
+MD5 44e644a514e2ffe4b2095add041bab10 ChangeLog 1369
+MD5 b2cff4cd1f9c86b821737b4fdb782aad macopix-1.2.1.ebuild 1787
 MD5 3ff31b5479b2a0244f5711fff3155aed metadata.xml 221
 MD5 be15bd2a955689d7d9b76a8bb3ccb4d5 files/digest-macopix-1.0.4 807
 MD5 b0a721eeda3f2435d25879a0cbab63f3 files/digest-macopix-1.2.1 811
+MD5 6e587c290c184e6e8b620cf42123d5c7 files/macopix-1.2.1-gentoo.diff 480

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 (file)
index 0000000..8cafdaf
--- /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 f8636b70eaaecf4799c4728d0fe6ee4a39f1ebc9..5d6a8acb667034830cbd644e28e4a65acdea9b7d 100644 (file)
--- 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