gcc4 compile fix, thanks to Dario Birtic <dariobirtic@gmx.net> in bug #112122

Package-Manager: portage-1.589-cvs

diff --git a/sys-fs/udftools/ChangeLog b/sys-fs/udftools/ChangeLog
index 2094fab439d666e457cbf940131a0f8cd65ada82..2f50ae5786550408ba51a47289839606d0edd655 100644 (file)
--- 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/Manifest b/sys-fs/udftools/Manifest
index dd69c46601345927116ec9b3877b67e7d7d018ac..aa229c2b92f6eaaf0ec81753457c30270b3761d8 100644 (file)
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2de13e03f9ac2193390232ed2fd1bb7 udftools-1.0.0b-r5.ebuild 933
+MD5 9ede2c25e133633a1fa5d855314bec1d udftools-1.0.0b-r5.ebuild 998
 MD5 5985be441863596e59cc8b64f5fa6855 udftools-1.0.0b-r4.ebuild 892
-MD5 0cf18ff9c523d3e3d63e6c07a64bd0d6 ChangeLog 2157
+MD5 dcdcdf5cb276f0b44a0650859c44a3a7 ChangeLog 2347
 MD5 0cf47a30a6ac05387d56c265d786ade1 metadata.xml 249
 MD5 72f421d199c391071d3271f025f9ef4f files/pktcdvd.init 1313
 MD5 3e4db84bced51283c2de39869e96e554 files/cdrwtool-linux2.6-fix-v2.patch 876
 MD5 d52ea5d393bd61a45f983ebc01703d93 files/digest-udftools-1.0.0b-r4 137
 MD5 d52ea5d393bd61a45f983ebc01703d93 files/digest-udftools-1.0.0b-r5 137
+MD5 966bd7ff249b4fd8e8b6aec16ace1fb9 files/udftools-1.0.0b-gcc4.patch 478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXpDKTOXg++0VvJQRArRjAKCnAgMCo+ftOKnWy0B1H53jQWLEWQCeIyXC
-IEcy1dw3e94X4FefI5EZIEU=
-=488q
+iD8DBQFDiMykTOXg++0VvJQRAvpBAJ9xfG566sHw//17cFqoHdD9D+HUXQCdEaHb
+Mqp04BzQ2MN5F+DbcWNWvJw=
+=mGQL
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..4ffa518
--- /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 9658df14a996bc89c53fb50ebb9caece94a2e586..b4b4b4ed6bd7aedb5eed4b6833ba5cb8ce1ecf79 100644 (file)
--- 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
 }