Add patch to fix compilation with gcc-4.1 and doxygen doc generation; bug #125196

(Portage version: 2.1_pre7-r3)

5 files changed, 55 insertions, 13 deletions

diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index 716bbe329b2e..0103103eb710 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libodbc++
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.7 2006/01/15 22:34:36 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.8 2006/04/14 00:07:27 halcy0n Exp $
+
+  14 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/libodbc++-0.2.3-doxygen.patch, +files/libodbc++-0.2.3-gcc41.patch,
+  libodbc++-0.2.3-r1.ebuild:
+  Add patch to fix compilation with gcc-4.1 and doxygen doc generation; bug
+  #125196
 
   15 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/libodbc++-0.2.3-std-streamsize.patch, libodbc++-0.2.3-r1.ebuild:
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 4a78b701d274..56ce650434db 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -1,17 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fe0f38624f7d70f3db19e389b96d4b6a ChangeLog 1113
+RMD160 ead79a639e0bdb461c8484252c34cbf4154894d3 ChangeLog 1113
+SHA256 30f5bae7e560127f5f2b32184432496c0a2d9d36aa1e6dc839c8e559587aa27f ChangeLog 1113
 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3 67
+RMD160 3e3d0fa0b4171f342ea017368612061a01e4c34a files/digest-libodbc++-0.2.3 67
+SHA256 52378aae79196166c84e1847d71392ba357bad2daa24de7c0c1caee6af053ad6 files/digest-libodbc++-0.2.3 67
 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r1 67
+RMD160 3e3d0fa0b4171f342ea017368612061a01e4c34a files/digest-libodbc++-0.2.3-r1 67
+SHA256 52378aae79196166c84e1847d71392ba357bad2daa24de7c0c1caee6af053ad6 files/digest-libodbc++-0.2.3-r1 67
+MD5 eccd0bcfb5758a5768fc689a152da572 files/libodbc++-0.2.3-doxygen.patch 561
+RMD160 644cf99e74ae874ae3c3dc287c751adb1d5e1d68 files/libodbc++-0.2.3-doxygen.patch 561
+SHA256 2642d896e705ab56fc378547ae9eb27e1db136bd54d6ac6656463de24d79f825 files/libodbc++-0.2.3-doxygen.patch 561
+MD5 67661c17e8f970de320f0f3bb9d42ca9 files/libodbc++-0.2.3-gcc41.patch 456
+RMD160 b944a42fdd6dc3069244b40f8a294afb73a66c36 files/libodbc++-0.2.3-gcc41.patch 456
+SHA256 ad380ec268435405146431e47a9a9bd354be8c0edc1229b315f31c60990a3c43 files/libodbc++-0.2.3-gcc41.patch 456
 MD5 a99a6a9bdf9dffba15a2aeeb1d2bcecb files/libodbc++-0.2.3-std-streamsize.patch 358
-MD5 ec335ee1e74b97bfc82a7b995a76b098 libodbc++-0.2.3-r1.ebuild 2089
+RMD160 0ca0ef123943fa4e80e3a8d4edc6b6f5a115322f files/libodbc++-0.2.3-std-streamsize.patch 358
+SHA256 0ee73b37752273016a2b18ceb8c301412128883e86d61d61a4f43a39811681b9 files/libodbc++-0.2.3-std-streamsize.patch 358
+MD5 725bd87b74db7a5cae546d133a1db436 libodbc++-0.2.3-r1.ebuild 2169
+RMD160 3d3d55b57e8c667ff47129b6eadfc70a2283f613 libodbc++-0.2.3-r1.ebuild 2169
+SHA256 3c6a1de92958ecd996ee8e039de9bbce45364178992a7402466fda2b3cfbae22 libodbc++-0.2.3-r1.ebuild 2169
 MD5 c0d850ab79376dbc9aef722e2f88b242 libodbc++-0.2.3.ebuild 1393
+RMD160 f8726cb71a869e13b26f633e9abf928a84b6d128 libodbc++-0.2.3.ebuild 1393
+SHA256 26572b7ee774bef04c7e698212387119af722323773233dbe5cc028882e1244f libodbc++-0.2.3.ebuild 1393
 MD5 514696112b44a9f879fd54be4de53dc5 metadata.xml 219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDys4GCRZPokWLroQRAigOAJ441MuG6+XN7pbkUZEgsUqBsYxDjgCfWV6d
-5v7bfOpBBejiLWwhLCCKEGE=
-=abhn
------END PGP SIGNATURE-----
+RMD160 38db0f8e5f44d75870709f7d3c98f081451875ef metadata.xml 219
+SHA256 3335b69d39a6e311a24d996131a068c8846b17ea832eac15a646e25a6a73c5d7 metadata.xml 219
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch
new file mode 100644
index 000000000000..e750c198123f
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-doxygen.patch
@@ -0,0 +1,12 @@
+diff -ur libodbc++-0.2.3-orig/doc/progref/Doxyfile libodbc++-0.2.3/doc/progref/Doxyfile
+--- libodbc++-0.2.3-orig/doc/progref/Doxyfile	2006-04-08 01:03:20.000000000 -0400
++++ libodbc++-0.2.3/doc/progref/Doxyfile	2006-04-08 01:06:03.000000000 -0400
+@@ -256,7 +256,7 @@
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER          = footer
++HTML_FOOTER          =
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user defined cascading
+ # style sheet that is used by each HTML page. It can be used to 
diff --git a/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch
new file mode 100644
index 000000000000..089277fbd722
--- /dev/null
+++ b/dev-db/libodbc++/files/libodbc++-0.2.3-gcc41.patch
@@ -0,0 +1,12 @@
+diff -ur libodbc++-0.2.3-orig/include/odbc++/drivermanager.h libodbc++-0.2.3/include/odbc++/drivermanager.h
+--- libodbc++-0.2.3-orig/include/odbc++/drivermanager.h	2006-04-08 00:54:19.000000000 -0400
++++ libodbc++-0.2.3/include/odbc++/drivermanager.h	2006-04-08 00:56:15.000000000 -0400
+@@ -26,6 +26,8 @@
+ 
+ #include <odbc++/types.h>
+ 
++#include <odbc++/errorhandler.h>
++
+ /** The namespace where all <b>libodbc++</b> classes reside */
+ namespace odbc {
+ 
diff --git a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild b/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
index a76d0892dab0..d367508f27f7 100644
--- a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.3-r1.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/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.2 2006/01/15 22:34:36 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.3 2006/04/14 00:07:27 halcy0n Exp $
 
 inherit eutils
 
@@ -22,6 +22,8 @@ SB_QT_MT="${S}-build_qt-mt"
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-std-streamsize.patch
+	epatch "${FILESDIR}"/${P}-doxygen.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {