Add patch to fix compilation with gcc-4.1; bug #134524

Package-Manager: portage-2.1_rc2-r2

5 files changed, 56 insertions, 11 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index df1a324360c7..ab8b3afc5029 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.19 2006/05/24 23:39:28 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.20 2006/05/28 22:21:14 halcy0n Exp $
+
+  28 May 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/mdbtools-0.6_pre1-gcc41.patch, mdbtools-0.6_pre1.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #134524
 
   24 May 2006; Cory Visi <visi@gentoo.org> :
   Removed mdbtools-0.4 from the tree (outdated and not maintained)
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 2099d1d80cf6..71a5088562cb 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,17 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8681cecb1f16c1af60e414688c1b8b76 ChangeLog 2077
-MD5 402da6348fabe50879d699674f8239ea files/digest-mdbtools-0.5 64
-MD5 c914c548d600b31e1df77d482ed39822 files/digest-mdbtools-0.6_pre1 68
+AUX mdbtools-0.5-gcc34.patch 1682 RMD160 b8e28cafa5f891db2d084ebee0cc32634414e9b4 SHA1 63c023ba54a9b5ad0adcf9b893fcfb7db8efe68e SHA256 3e78debfa1406801bfa9db920989b69acbc5dd3e653598acfe7f799bff720c9e
 MD5 96e88f8e3b0a2ffc9628083a8b924d71 files/mdbtools-0.5-gcc34.patch 1682
+RMD160 b8e28cafa5f891db2d084ebee0cc32634414e9b4 files/mdbtools-0.5-gcc34.patch 1682
+SHA256 3e78debfa1406801bfa9db920989b69acbc5dd3e653598acfe7f799bff720c9e files/mdbtools-0.5-gcc34.patch 1682
+AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
 MD5 7899f05ce1ebcdf1517ea62a21409da8 files/mdbtools-0.6_pre1-gcc34.patch 1571
+RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e files/mdbtools-0.6_pre1-gcc34.patch 1571
+SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633 files/mdbtools-0.6_pre1-gcc34.patch 1571
+AUX mdbtools-0.6_pre1-gcc41.patch 498 RMD160 3c4c39b3c17066c09e7e3a5fa052d195eb3f6740 SHA1 b137104183f56f2a155a83036613c25b3deef15e SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63
+MD5 f7c20d702ee6b96522a4fe54d442c809 files/mdbtools-0.6_pre1-gcc41.patch 498
+RMD160 3c4c39b3c17066c09e7e3a5fa052d195eb3f6740 files/mdbtools-0.6_pre1-gcc41.patch 498
+SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63 files/mdbtools-0.6_pre1-gcc41.patch 498
+DIST mdbtools-0.5.tar.gz 396485
+DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
+EBUILD mdbtools-0.5.ebuild 1181 RMD160 fdf993562baa95ec3f786fb91a5bde81b3c5b8f0 SHA1 93dac6dfc3ca30a527c681e0eb06c8c6810fcd56 SHA256 8398ed525831e99ac392d0a46401f6c9bc53851314231e0e9ac0ac83a6ee0947
 MD5 74e2feb6cc446de6d11236d50f0fed73 mdbtools-0.5.ebuild 1181
-MD5 032abe97e58152d9c0c2c73739252a74 mdbtools-0.6_pre1.ebuild 1239
+RMD160 fdf993562baa95ec3f786fb91a5bde81b3c5b8f0 mdbtools-0.5.ebuild 1181
+SHA256 8398ed525831e99ac392d0a46401f6c9bc53851314231e0e9ac0ac83a6ee0947 mdbtools-0.5.ebuild 1181
+EBUILD mdbtools-0.6_pre1.ebuild 1281 RMD160 15d114d7398e45ebadcb52cb450636028fe4fd55 SHA1 5947ec3832799a7edf3cd5ce7d0ac45dcbbbe0ce SHA256 6b946955f26daebbd7b8c44115419b5bee5344b1958d24eb3bdc4e5a1cdda118
+MD5 52fa4b5a6511189b89fd58a217df7b43 mdbtools-0.6_pre1.ebuild 1281
+RMD160 15d114d7398e45ebadcb52cb450636028fe4fd55 mdbtools-0.6_pre1.ebuild 1281
+SHA256 6b946955f26daebbd7b8c44115419b5bee5344b1958d24eb3bdc4e5a1cdda118 mdbtools-0.6_pre1.ebuild 1281
+MISC ChangeLog 2250 RMD160 9db78f4e19af062eed9f33eab5ed606fc0cee580 SHA1 a3786be3b4ba4c84429058f262bf8e097e4cebfd SHA256 4661f74773043fa5afefc339e81314db9218ed472b1cfde6c60a7a54f58af715
+MD5 a1dc4ba5ac92c20a7bdbd48a29b012f7 ChangeLog 2250
+RMD160 9db78f4e19af062eed9f33eab5ed606fc0cee580 ChangeLog 2250
+SHA256 4661f74773043fa5afefc339e81314db9218ed472b1cfde6c60a7a54f58af715 ChangeLog 2250
+MD5 402da6348fabe50879d699674f8239ea files/digest-mdbtools-0.5 64
+RMD160 72e60faf07e6729b4f59839e2ee931420876a4df files/digest-mdbtools-0.5 64
+SHA256 0b42964ea7703dbd2d6e95706841fe59c42e0571841b297baf467c6ee896043b files/digest-mdbtools-0.5 64
+MD5 db0056c5d327a3e1a20ceb358053c96f files/digest-mdbtools-0.6_pre1 250
+RMD160 04b71f886306c4ddead97fac1184ebe1ac6449cc files/digest-mdbtools-0.6_pre1 250
+SHA256 fcbe22d0740ccdc87a7f24d0d4c358912f7a6193e505ace4773437a736047682 files/digest-mdbtools-0.6_pre1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdO7BK3VlI3Kj19sRAlc9AKCdSqkIKvlAfXSA4xJNfM3nTtgDZwCeJDTU
-SyiO1ttZRcCeUC6QvKM7A2E=
-=w+pp
+iD8DBQFEeiJiCRZPokWLroQRAv/7AKCxIVC1DQHorW6zpbrhzdyIdTO0iwCeJ/I8
+6fQkDtYBxdNWSeiVIf8tXwY=
+=ToXn
 -----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/files/digest-mdbtools-0.6_pre1 b/app-office/mdbtools/files/digest-mdbtools-0.6_pre1
index 39d150ab3f9f..ef46c82b4cd6 100644
--- a/app-office/mdbtools/files/digest-mdbtools-0.6_pre1
+++ b/app-office/mdbtools/files/digest-mdbtools-0.6_pre1
@@ -1 +1,3 @@
 MD5 246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz 611756
+RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 mdbtools-0.6pre1.tar.gz 611756
+SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3 mdbtools-0.6pre1.tar.gz 611756
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch
new file mode 100644
index 000000000000..786028a36426
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc41.patch
@@ -0,0 +1,13 @@
+diff -ur mdbtools-0.6pre1-orig/include/mdbtools.h mdbtools-0.6pre1/include/mdbtools.h
+--- mdbtools-0.6pre1-orig/include/mdbtools.h	2006-05-28 18:01:32.000000000 -0400
++++ mdbtools-0.6pre1/include/mdbtools.h	2006-05-28 18:04:33.000000000 -0400
+@@ -147,7 +147,7 @@
+ #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+ 
+ /* hash to store registered backends */
+-extern GHashTable	*mdb_backends;
++static GHashTable	*mdb_backends;
+ 
+ /* forward declarations */
+ typedef struct mdbindex MdbIndex;
+
diff --git a/app-office/mdbtools/mdbtools-0.6_pre1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre1.ebuild
index 25e7f1b67c4f..8893e19b41c8 100644
--- a/app-office/mdbtools/mdbtools-0.6_pre1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.6_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1.ebuild,v 1.1 2006/05/24 23:35:05 merlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1.ebuild,v 1.2 2006/05/28 22:21:14 halcy0n Exp $
 
 inherit eutils
 
@@ -28,7 +28,8 @@ DEPEND=">=dev-libs/glib-2
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {