Updating for gcc-3.3 compat

4 files changed, 47 insertions, 18 deletions

diff --git a/sys-apps/grub/ChangeLog b/sys-apps/grub/ChangeLog
index 82cd28c4dfc3..182e5d8b5ce4 100644
--- a/sys-apps/grub/ChangeLog
+++ b/sys-apps/grub/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/grub
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.24 2003/09/06 22:45:53 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.25 2003/09/14 17:58:31 johnm Exp $
 
   07 Sep 2003; Alexander Gabert <pappy@gentoo.org> grub-0.93.20030118.ebuild:
   added hardened-gcc excludes
 
+  14 Sep 2003; John Mylchreest <johnm@gentoo.org>; grub-0.93.20030118.ebuild,
+  files/grub-0.93-gcc3.3.diff:
+  Updating for gcc 3.3 compat
+
   27 Jul 2003; Olivier Crete <tester@gentoo.org> grub-0.93.20030118.ebuild:
   Added support for static building
 
diff --git a/sys-apps/grub/Manifest b/sys-apps/grub/Manifest
index 4dec2706760e..446e059adacd 100644
--- a/sys-apps/grub/Manifest
+++ b/sys-apps/grub/Manifest
@@ -1,23 +1,24 @@
-MD5 534bcce7128949e2b6b2d6d00cfa0fcc ChangeLog 4590
 MD5 8381f5e187ea676de5cc11968c0e409d grub-0.92-r1.ebuild 3207
-MD5 e30272d5ac8997c94d9ad5aad05f0d0a grub-0.93.20030118.ebuild 2205
-MD5 ca87163749e014bc3424d53c6bd76dce files/digest-grub-0.92-r1 1680
-MD5 b302edf756d9f8996d9e1ae6d3a49768 files/digest-grub-0.93.20030118 1764
+MD5 925d9bb55bcfd34b6ce407e4ea138bf3 ChangeLog 4730
+MD5 0928fa57dd3635f4e28937680a416972 grub-0.93.20030118.ebuild 2348
 MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856
-MD5 f31b7278a8a83d245c4ca27382cf54b3 files/grub-0.92/grub-0.5.96.1-special-raid-devices.patch 632
-MD5 d4ac36a6a292a66b276ebc8a4ce2a41d files/grub-0.92/grub-0.90-addsyncs.patch 2071
-MD5 59c9235025c9048d6165d68562dbc0ec files/grub-0.92/grub-0.90-append.patch 2893
+MD5 b302edf756d9f8996d9e1ae6d3a49768 files/digest-grub-0.93.20030118 1764
+MD5 ca87163749e014bc3424d53c6bd76dce files/digest-grub-0.92-r1 1680
+MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639
+MD5 03404170b492e04031b0da877991efd2 files/grub-0.92/grub-0.90-symlinkmenulst.patch 518
 MD5 aa18890ce9d1679091e382aeb8294194 files/grub-0.92/grub-0.90-configfile.patch 3833
+MD5 f31b7278a8a83d245c4ca27382cf54b3 files/grub-0.92/grub-0.5.96.1-special-raid-devices.patch 632
+MD5 f105856e2fedfdb0cb5982e6ef8294fd files/grub-0.92/grub-0.92-usbfix.patch 2072
+MD5 3086a3674abb6c7e59a2627f25b3cca3 files/grub-0.92/grub-0.92-automake16.patch 5956
 MD5 4d871cd43370b130057788f07db38cc3 files/grub-0.92/grub-0.90-install.in.patch 1079
-MD5 f3aa6906e6a340e3b38536b1fd0571f5 files/grub-0.92/grub-0.90-installcopyonly.patch 2017
+MD5 82efba51ac305b8381d3122996eb3136 files/grub-0.92/grub-0.92-vga16.patch 43815
 MD5 bd8b83027e46c01ee7b67cbccd06fa08 files/grub-0.92/grub-0.90-passwordprompt.patch 3612
-MD5 75011272c27e8d9926633851e29a9a22 files/grub-0.92/grub-0.90-staticcurses.patch 600
-MD5 03404170b492e04031b0da877991efd2 files/grub-0.92/grub-0.90-symlinkmenulst.patch 518
-MD5 e1afae6eadfc123e08920e3f78e0b38b files/grub-0.92/grub-0.90-vga16-keypressclear.patch 920
-MD5 e4f6b75eb4518eaad834f177ad98a25a files/grub-0.92/grub-0.91-bootonce.patch 6748
 MD5 bb016a75234fb52358a2f5412afc2e58 files/grub-0.92/grub-0.91-splashimagehelp.patch 944
 MD5 6ad20fdf6c7c5d16bf3ac56ff8fd704d files/grub-0.92/grub-0.91-vga16-serial.patch 1628
-MD5 3086a3674abb6c7e59a2627f25b3cca3 files/grub-0.92/grub-0.92-automake16.patch 5956
+MD5 e4f6b75eb4518eaad834f177ad98a25a files/grub-0.92/grub-0.91-bootonce.patch 6748
+MD5 75011272c27e8d9926633851e29a9a22 files/grub-0.92/grub-0.90-staticcurses.patch 600
+MD5 e1afae6eadfc123e08920e3f78e0b38b files/grub-0.92/grub-0.90-vga16-keypressclear.patch 920
+MD5 f3aa6906e6a340e3b38536b1fd0571f5 files/grub-0.92/grub-0.90-installcopyonly.patch 2017
+MD5 59c9235025c9048d6165d68562dbc0ec files/grub-0.92/grub-0.90-append.patch 2893
 MD5 93c92f5020925b376742d2ad8022160b files/grub-0.92/grub-0.92-nodeprecatedflags.patch 375
-MD5 f105856e2fedfdb0cb5982e6ef8294fd files/grub-0.92/grub-0.92-usbfix.patch 2072
-MD5 82efba51ac305b8381d3122996eb3136 files/grub-0.92/grub-0.92-vga16.patch 43815
+MD5 d4ac36a6a292a66b276ebc8a4ce2a41d files/grub-0.92/grub-0.90-addsyncs.patch 2071
diff --git a/sys-apps/grub/files/grub-0.93-gcc3.3.diff b/sys-apps/grub/files/grub-0.93-gcc3.3.diff
new file mode 100644
index 000000000000..a32eb8093d46
--- /dev/null
+++ b/sys-apps/grub/files/grub-0.93-gcc3.3.diff
@@ -0,0 +1,17 @@
+Submitter: Jim Gifford (patches at jg555 dot com)
+Origin: Grub CVS
+Date: 08-16-2003
+Description: Fixes GCC 3.3 Compile Errors
+
+diff -Naur grub-0.93.orig/stage2/fsys_reiserfs.c grub-0.93/stage2/fsys_reiserfs.c
+--- grub-0.93.orig/stage2/fsys_reiserfs.c	2002-11-29 17:46:01.000000000 +0000
++++ grub-0.93/stage2/fsys_reiserfs.c	2003-08-16 21:15:34.000000000 +0000
+@@ -112,7 +112,7 @@
+   /* offset in the log of where to start replay after a crash */
+   __u32 j_first_unflushed_offset;
+   /* mount id to detect very old transactions */
+-  __u32 long j_mount_id;
++  __u32 j_mount_id;
+ };
+ 
+ /* magic string to find desc blocks in the journal */
diff --git a/sys-apps/grub/grub-0.93.20030118.ebuild b/sys-apps/grub/grub-0.93.20030118.ebuild
index 7ca0511c08f7..9bd87c2d1967 100644
--- a/sys-apps/grub/grub-0.93.20030118.ebuild
+++ b/sys-apps/grub/grub-0.93.20030118.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.12 2003/09/06 22:45:53 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.13 2003/09/14 17:58:31 johnm Exp $
 
 inherit mount-boot eutils flag-o-matic
 
@@ -8,9 +8,11 @@ filter-flags "-fstack-protector"
 
 NEWP=${PN}-${PV%.*}
 S=${WORKDIR}/${NEWP}
-DESCRIPTION="GNU GRUB boot loader"
+
 SRC_URI="ftp://alpha.gnu.org/gnu/grub/${NEWP}.tar.gz
 	mirror://gentoo/${P}-gentoo.diff.bz2"
+
+DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 KEYWORDS="x86 -amd64 -ppc -sparc -alpha -mips"
 SLOT="0"
@@ -31,6 +33,11 @@ src_unpack() {
 	# -configfile.patch
 	# -installcopyonly.patch
 	epatch ${DISTDIR}/${P}-gentoo.diff.bz2
+
+	# grub-0.93-gcc3.3.diff <johnm@gentoo.org> (14 Sep 2003)
+	# -fixes compile error with >=gcc-3.3
+	epatch ${FILESDIR}/grub-0.93-gcc3.3.diff
+
 	WANT_AUTOCONF_2_5=1 autoconf || die
 }