Added a patch to solve GCC3.3 compilation issues. Closes bug #45147.

5 files changed, 70 insertions, 12 deletions

diff --git a/sys-fs/ext2resize/ChangeLog b/sys-fs/ext2resize/ChangeLog
index 635b4946773f..695131ff64c6 100644
--- a/sys-fs/ext2resize/ChangeLog
+++ b/sys-fs/ext2resize/ChangeLog
@@ -1,18 +1,22 @@
 # ChangeLog for sys-fs/ext2resize
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ChangeLog,v 1.3 2004/01/23 15:32:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ChangeLog,v 1.4 2004/03/20 13:56:31 plasmaroo Exp $
+
+  20 Mar 2004; <plasmaroo@gentoo.org> ext2resize-1.1.17-r1.ebuild,
+  files/ext2resize-1.1.17-gcc3.3.patch:
+  Added a patch to solve GCC3.3 compilation issues. Closes bug #45147.
 
   23 Jan 2004; <gustavoz@gentoo.org> ext2resize-1.1.17-r1.ebuild:
-  stable on sparc
+  Stable on sparc.
 
   12 Jan 2004; Aron Griffis <agriffis@gentoo.org> ext2resize-1.1.17-r1.ebuild:
-  stable on alpha
+  Stable on alpha.
 
 *ext2resize-1.1.17 (15 Sep 2003)
 
   15 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
   ext2resize-1.1.17-r1.ebuild, ext2resize-1.1.17.ebuild:
-  moved to sys-fs
+  Moved to sys-fs.
 
 *ext2resize-1.1.17-r1 (24 Apr 2003)
 
diff --git a/sys-fs/ext2resize/Manifest b/sys-fs/ext2resize/Manifest
index 4c4002361ebd..df3e2df2eee9 100644
--- a/sys-fs/ext2resize/Manifest
+++ b/sys-fs/ext2resize/Manifest
@@ -1,6 +1,7 @@
-MD5 75af4253ae028e056fbb08f99850ff37 ext2resize-1.1.17.ebuild 669
-MD5 ec054fd31ca35ec4b176805af5ce6c63 ext2resize-1.1.17-r1.ebuild 890
-MD5 28ef33c71036116cf1430af4be4e7772 ChangeLog 1263
+MD5 5c1223a8d858884e65ec0f871a751d1c ChangeLog 1446
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 47b7f77e01a5ed768f6456a7e85f3962 files/digest-ext2resize-1.1.17-r1 70
+MD5 4d1c60711f8cb8cfa59927425ee608fd ext2resize-1.1.17-r1.ebuild 1072
+MD5 69749b99f3186e56e0802f4691cae6ee ext2resize-1.1.17.ebuild 671
 MD5 47b7f77e01a5ed768f6456a7e85f3962 files/digest-ext2resize-1.1.17 70
+MD5 fc7c47e46247f9329e3b79edbb76d986 files/ext2resize-1.1.17-gcc3.3.patch 1621
+MD5 47b7f77e01a5ed768f6456a7e85f3962 files/digest-ext2resize-1.1.17-r1 70
diff --git a/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild b/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild
index c3ac257c0d4f..92cb71a0748a 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.3 2004/01/23 15:32:58 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17-r1.ebuild,v 1.4 2004/03/20 13:56:31 plasmaroo Exp $
 
 IUSE="static"
 
@@ -20,6 +20,10 @@ src_compile() {
 
 	econf --exec-prefix="${D}/"|| die "Configure failed"
 
+	# Fix broken source for non-''old'' GCCs
+	sed -e 's/printf(__FUNCTION__ \"\\n\");/printf(\"%s\\n\", __FUNCTION__);/g' -i src/*.c
+	epatch ${FILESDIR}/ext2resize-1.1.17-gcc3.3.patch
+
 	emake LDFLAGS="${LDFLAGS}"|| die "Make failed"
 }
 
@@ -29,5 +33,4 @@ src_install() {
 	dosym /sbin/ext2online /usr/sbin/ext2online
 	dosym /sbin/ext2prepare /usr/sbin/ext2prepare
 	dosym /sbin/ext2resize /usr/sbin/ext2resize
-
 }
diff --git a/sys-fs/ext2resize/ext2resize-1.1.17.ebuild b/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
index a4bb7e82d57b..52164f854e0d 100644
--- a/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
+++ b/sys-fs/ext2resize/ext2resize-1.1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17.ebuild,v 1.1 2003/09/15 17:46:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext2resize/ext2resize-1.1.17.ebuild,v 1.2 2004/03/20 13:56:31 plasmaroo Exp $
 
 DESCRIPTION="EXT2 and EXT3 filesystem resizing utilities"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
diff --git a/sys-fs/ext2resize/files/ext2resize-1.1.17-gcc3.3.patch b/sys-fs/ext2resize/files/ext2resize-1.1.17-gcc3.3.patch
new file mode 100644
index 000000000000..e1d1287ec876
--- /dev/null
+++ b/sys-fs/ext2resize/files/ext2resize-1.1.17-gcc3.3.patch
@@ -0,0 +1,50 @@
+diff -ur ext2resize-1.1.17/src/ext2_block_relocator.c ext2resize-1.1.17.plasmaroo/src/ext2_block_relocator.c
+--- ext2resize-1.1.17/src/ext2_block_relocator.c	2004-03-20 13:48:21.244439888 +0000
++++ ext2resize-1.1.17.plasmaroo/src/ext2_block_relocator.c	2004-03-20 13:46:00.144890280 +0000
+@@ -854,9 +854,9 @@
+ 			if (j >= it && j < itend) {
+ 				if (delgrp)
+ 					continue;
+-				fprintf(stderr, __FUNCTION__
+-					"trying to move block %d in itable!\n",
+-					j + start);
++				fprintf(stderr, 
++					"%s: trying to move block %d in itable!\n",
++					__FUNCTION__, j + start);
+ 				return 0;
+ 			}
+ 
+diff -ur ext2resize-1.1.17/src/ext2_resize.c ext2resize-1.1.17.plasmaroo/src/ext2_resize.c
+--- ext2resize-1.1.17/src/ext2_resize.c	2004-03-20 13:48:21.267436392 +0000
++++ ext2resize-1.1.17.plasmaroo/src/ext2_resize.c	2004-03-20 13:46:00.143890432 +0000
+@@ -41,7 +41,7 @@
+ 	int   i;
+ 
+ 	if (fs->flags & FL_DEBUG)
+-		printf(__FUNCTION__ " %d\n", group);
++		printf("%s: %d\n", __FUNCTION__, group);
+ 
+ 	if (fs->sb.s_blocks_count !=
+ 	    fs->sb.s_first_data_block + group * fs->sb.s_blocks_per_group) {
+@@ -165,7 +165,7 @@
+ 	int   has_sb;
+ 
+ 	if (fs->flags & FL_DEBUG)
+-		printf(__FUNCTION__ " %d\n", group);
++		printf("%s: %d\n", __FUNCTION__, group);
+ 
+ 	has_sb = ext2_bg_has_super(fs, group);
+ 
+@@ -318,9 +318,9 @@
+ 	bpg = fs->sb.s_blocks_count - start;
+ 
+ 	if (newsize < itend + (fs->stride ? 2 : 0)) {
+-		fprintf(stderr, __FUNCTION__
+-			"can't shrink group %d to %d blocks\n",
+-			group, newsize);
++		fprintf(stderr,
++			"%s: can't shrink group %d to %d blocks\n",
++			__FUNCTION__, group, newsize);
+ 		return 0;
+ 	}
+