summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2005-11-26 20:58:56 +0000
committerDaniel Drake <dsd@gentoo.org>2005-11-26 20:58:56 +0000
commit2daa2a6473a9bd4083259dc1346b2d3a3cc56d31 (patch)
treed4635ff41d570fc8cfd1f3e51a691001a78e3580
parentFix some minor stuff to be consistent with other PHP packages. (diff)
downloadgentoo-2-2daa2a6473a9bd4083259dc1346b2d3a3cc56d31.tar.gz
gentoo-2-2daa2a6473a9bd4083259dc1346b2d3a3cc56d31.tar.bz2
gentoo-2-2daa2a6473a9bd4083259dc1346b2d3a3cc56d31.zip
gcc4 compile fix, thanks to Dario Birtic <dariobirtic@gmx.net> in bug #112122
(Portage version: 1.589-cvs)
-rw-r--r--sys-fs/udftools/ChangeLog6
-rw-r--r--sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch12
-rw-r--r--sys-fs/udftools/udftools-1.0.0b-r5.ebuild5
3 files changed, 21 insertions, 2 deletions
diff --git a/sys-fs/udftools/ChangeLog b/sys-fs/udftools/ChangeLog
index 2094fab439d6..2f50ae578655 100644
--- a/sys-fs/udftools/ChangeLog
+++ b/sys-fs/udftools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/udftools
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.11 2005/10/25 20:07:44 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.12 2005/11/26 20:58:56 dsd Exp $
+
+ 26 Nov 2005; Daniel Drake <dsd@gentoo.org>
+ +files/udftools-1.0.0b-gcc4.patch, udftools-1.0.0b-r5.ebuild:
+ gcc4 compile fix, thanks to Dario Birtic <dariobirtic@gmx.net> in bug #112122
25 Oct 2005; Daniel Drake <dsd@gentoo.org> udftools-1.0.0b-r5.ebuild:
Stable on x86
diff --git a/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
new file mode 100644
index 000000000000..4ffa51826490
--- /dev/null
+++ b/sys-fs/udftools/files/udftools-1.0.0b-gcc4.patch
@@ -0,0 +1,12 @@
+diff -urN ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c ./wrudf/wrudf.c
+--- ../tmp-orig/udftools-1.0.0b3/wrudf/wrudf.c 2002-11-26 08:18:51.000000000 +0100
++++ ./wrudf/wrudf.c 2005-01-04 16:56:49.394078200 +0100
+@@ -245,7 +245,7 @@
+ } else if( strncmp( spm->partIdent.ident, UDF_ID_VIRTUAL, strlen(UDF_ID_VIRTUAL)) == 0 )
+ virtualPartitionNum = i;
+ }
+- (char*)spm += spm->partitionMapLength;
++ spm = (char*)spm + spm->partitionMapLength;
+ }
+
+ if( medium == CDR ) {
diff --git a/sys-fs/udftools/udftools-1.0.0b-r5.ebuild b/sys-fs/udftools/udftools-1.0.0b-r5.ebuild
index 9658df14a996..b4b4b4ed6bd7 100644
--- a/sys-fs/udftools/udftools-1.0.0b-r5.ebuild
+++ b/sys-fs/udftools/udftools-1.0.0b-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r5.ebuild,v 1.2 2005/10/25 20:07:44 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r5.ebuild,v 1.3 2005/11/26 20:58:56 dsd Exp $
inherit eutils
@@ -27,6 +27,9 @@ src_unpack() {
# Fix CD blanking for 2.6.8 and newer
epatch ${FILESDIR}/cdrwtool-linux2.6-fix-v2.patch
+
+ # gcc4 compat, bug #112122
+ epatch ${FILESDIR}/${P}-gcc4.patch
}