gcc-3.3 fix

4 files changed, 61 insertions, 4 deletions

diff --git a/sys-apps/parted/ChangeLog b/sys-apps/parted/ChangeLog
index 16c0151c356e..33f6ba654a8e 100644
--- a/sys-apps/parted/ChangeLog
+++ b/sys-apps/parted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/parted
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.16 2003/05/29 16:39:18 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/ChangeLog,v 1.17 2003/06/27 16:35:09 lu_zero Exp $
+
+  27 Jun 2003; lu_zero <lu_zero@gentoo.org> parted-1.6.5-r1.ebuild,
+  files/parted-1.6.5-gcc-3.3.patch:
+  gcc-3.3 related fixes
 
 *parted-1.6.5-r1 (29 May 2003)
 
diff --git a/sys-apps/parted/Manifest b/sys-apps/parted/Manifest
index d60020e8f840..d3705bfd4d7b 100644
--- a/sys-apps/parted/Manifest
+++ b/sys-apps/parted/Manifest
@@ -1,8 +1,9 @@
-MD5 9832343bb8127e14f1b17f95097da74f ChangeLog 2672
+MD5 d0f623fa3337dd11487f5d69d3e703c0 ChangeLog 2800
 MD5 0fc0ece46bcc330af67e2d14e3c8900c parted-1.6.4.ebuild 1211
-MD5 844bdcf30735dc2718c53408b6843f8d parted-1.6.5-r1.ebuild 1310
 MD5 ac61df011766f63e0b4abf2da42be11f parted-1.6.5.ebuild 1235
+MD5 23f410a40ffd3322d102b6b01a3bd95d parted-1.6.5-r1.ebuild 1356
 MD5 17af4d8fa0f278ea445c6b1f2dc1b922 files/digest-parted-1.6.4 65
 MD5 c4eb5801edd996be57aabfd201b96711 files/digest-parted-1.6.5 65
 MD5 c4eb5801edd996be57aabfd201b96711 files/digest-parted-1.6.5-r1 65
 MD5 ca37d240601c525a3c9c4e2ce86a85b8 files/parted-1.6.5-hfs-8.patch 110746
+MD5 98aebf81c63f7c31f615c6c7b57c4eb2 files/parted-1.6.5-gcc-3.3.patch 2221
diff --git a/sys-apps/parted/files/parted-1.6.5-gcc-3.3.patch b/sys-apps/parted/files/parted-1.6.5-gcc-3.3.patch
new file mode 100644
index 000000000000..86c6c5d1060e
--- /dev/null
+++ b/sys-apps/parted/files/parted-1.6.5-gcc-3.3.patch
@@ -0,0 +1,51 @@
+diff -ruN parted-1.6.5.orig/libparted/disk_gpt.c parted-1.6.5/libparted/disk_gpt.c
+--- parted-1.6.5.orig/libparted/disk_gpt.c	2003-06-27 18:11:23.000000000 +0200
++++ parted-1.6.5/libparted/disk_gpt.c	2003-06-27 17:15:53.000000000 +0200
+@@ -51,9 +51,9 @@
+ #define EFI_PMBR_OSTYPE_EFI 0xEE
+ #define MSDOS_MBR_SIGNATURE 0xaa55
+ 
+-#define GPT_HEADER_SIGNATURE 0x5452415020494645
+-#define GPT_HEADER_REVISION_V1_00 0x00010000
+-#define GPT_HEADER_REVISION_V0_99 0x00009900
++#define GPT_HEADER_SIGNATURE 0x5452415020494645LL
++#define GPT_HEADER_REVISION_V1_00 0x00010000LL
++#define GPT_HEADER_REVISION_V0_99 0x00009900LL
+ 
+ typedef uint16_t efi_char16_t;	/* UNICODE character */
+ 
+diff -ruN parted-1.6.5.orig/libparted/disk_sun.c parted-1.6.5/libparted/disk_sun.c
+--- parted-1.6.5.orig/libparted/disk_sun.c	2003-06-27 18:11:23.000000000 +0200
++++ parted-1.6.5/libparted/disk_sun.c	2003-06-27 17:28:14.000000000 +0200
+@@ -38,7 +38,7 @@
+ /* Most of this came from util-linux's sun support, which was mostly done
+    by Jakub Jelinek.  */
+ 
+-#define SUN_DISK_MAGIC		0xDABE	/* Disk magic number */
++#define SUN_DISK_MAGIC		0xDABE /* Disk magic number */
+ #define SUN_DISK_MAXPARTITIONS	8
+ 
+ #define WHOLE_DISK_ID		0x05
+@@ -354,7 +354,7 @@
+ 	if (!ped_device_read (disk->dev, &old_label, 0, 1))
+ 		return;
+ 	if (old_label.info [0]
+-	    && old_label.magic == PED_CPU_TO_LE32 (SUN_DISK_MAGIC))
++	    && old_label.magic == PED_CPU_TO_LE16 (SUN_DISK_MAGIC))
+ 		memcpy (&sun_specific->raw_label, &old_label, 512);
+ }
+ 
+diff -ruN parted-1.6.5.orig/libparted/fs_ext2/ext2.c parted-1.6.5/libparted/fs_ext2/ext2.c
+--- parted-1.6.5.orig/libparted/fs_ext2/ext2.c	2003-06-27 18:11:23.000000000 +0200
++++ parted-1.6.5/libparted/fs_ext2/ext2.c	2003-06-27 18:14:52.000000000 +0200
+@@ -355,8 +355,8 @@
+ 	inode->i_blocks = PED_CPU_TO_LE32(EXT2_INODE_BLOCKS(*inode)
+ 		       			  + delta * i512perblock);
+ 	size = EXT2_INODE_SIZE(*inode) + delta * fs->blocksize;
+-	inode->i_size = PED_CPU_TO_LE32(size % 0x100000000);
+-	inode->i_size_high = PED_CPU_TO_LE32(size / 0x100000000);
++	inode->i_size = PED_CPU_TO_LE32(size % 0x100000000LL);
++	inode->i_size_high = PED_CPU_TO_LE32(size / 0x100000000LL);
+ 	inode->i_mtime = PED_CPU_TO_LE32(time(NULL));
+ }
+ 
diff --git a/sys-apps/parted/parted-1.6.5-r1.ebuild b/sys-apps/parted/parted-1.6.5-r1.ebuild
index 02d1270d6447..db1b18dc5c74 100644
--- a/sys-apps/parted/parted-1.6.5-r1.ebuild
+++ b/sys-apps/parted/parted-1.6.5-r1.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/parted/parted-1.6.5-r1.ebuild,v 1.1 2003/05/29 16:37:23 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/parted/parted-1.6.5-r1.ebuild,v 1.2 2003/06/27 16:35:09 lu_zero Exp $
 
 IUSE="nls static readline"
 
@@ -26,6 +26,7 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/parted-1.6.5-hfs-8.patch
+	epatch ${FILESDIR}/parted-1.6.5-gcc-3.3.patch
 }
 
 src_compile() {