Add patch from Debian to fix C/C++ linkage declaration collisions, bug

#167051.
Package-Manager: portage-2.1.2.3

diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 6b5007159645d0d3c8c408fe58df9e9bd5b657ee..57bbef578f0b6bcbaaca8283422220efad8bf60d 100644 (file)
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/firebird
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.50 2007/02/02 14:12:27 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.51 2007/04/07 20:23:57 dirtyepic Exp $
+
+  07 Apr 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/firebird-1.5.3-gcc412.patch, firebird-1.5.3-r1.ebuild:
+  Add patch from Debian to fix C/C++ linkage declaration collisions, bug
+  #167051.
 
   02 Feb 2007; Simon Stelling <blubb@gentoo.org> firebird-1.5.3-r1.ebuild:
   bumping back to ~amd64 because of known problems according to upstream; bug

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 49beeece5e7ae448090cb9479a684f0885fef40a..c119bd9e539593e47d353db1c7c1262f8fe1575d 100644 (file)
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -18,6 +18,10 @@ AUX firebird-1.5.1-gcc34.patch 5906 RMD160 7249ee6156044a20fd8b93b870b745587ef5b
 MD5 5bc644b4558c11069e2a946e029d70bb files/firebird-1.5.1-gcc34.patch 5906
 RMD160 7249ee6156044a20fd8b93b870b745587ef5b3ea files/firebird-1.5.1-gcc34.patch 5906
 SHA256 b05be878185ae46564994b700477882fd9a2217546a441099edd1016c8b694ac files/firebird-1.5.1-gcc34.patch 5906
+AUX firebird-1.5.3-gcc412.patch 1446 RMD160 2069b6baf60039ff724ee66201fa039f4be394bf SHA1 613badf3b8b51456e07929182a19077db704844d SHA256 8d3572cc9f9227672fb7c665faf5e720d959975f14b2c4479a20b0de0a8eb7b8
+MD5 b37cd6a2dfa0bd7ae6f67273474f3af0 files/firebird-1.5.3-gcc412.patch 1446
+RMD160 2069b6baf60039ff724ee66201fa039f4be394bf files/firebird-1.5.3-gcc412.patch 1446
+SHA256 8d3572cc9f9227672fb7c665faf5e720d959975f14b2c4479a20b0de0a8eb7b8 files/firebird-1.5.3-gcc412.patch 1446
 AUX firebird.conf.d 80 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 SHA1 9442726f3e59887ecc40333c0214045cd8f78d50 SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f
 MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 files/firebird.conf.d 80
@@ -44,18 +48,18 @@ EBUILD firebird-1.5.2.ebuild 6489 RMD160 dc2cb9d01d731fbfd36664682c02f835ade9fff
 MD5 832d55878091b0a63e348c45fee3715a firebird-1.5.2.ebuild 6489
 RMD160 dc2cb9d01d731fbfd36664682c02f835ade9fff8 firebird-1.5.2.ebuild 6489
 SHA256 444c0a9d9895d60f9d2ec4a710081cc49ada2150ca4be74b3859d4732332aea2 firebird-1.5.2.ebuild 6489
-EBUILD firebird-1.5.3-r1.ebuild 7142 RMD160 d248c98fbf532d4caef518bad53a1e7c5ab9f031 SHA1 d48e3eeb76ad20a5906491c326dcfdca7b3f5f05 SHA256 f9599e589176b5f8947517e88a0858fd2a58f3bc9435c6153739c96fdc0e2d91
-MD5 f5c9169598070316c54cd69355138be9 firebird-1.5.3-r1.ebuild 7142
-RMD160 d248c98fbf532d4caef518bad53a1e7c5ab9f031 firebird-1.5.3-r1.ebuild 7142
-SHA256 f9599e589176b5f8947517e88a0858fd2a58f3bc9435c6153739c96fdc0e2d91 firebird-1.5.3-r1.ebuild 7142
+EBUILD firebird-1.5.3-r1.ebuild 7176 RMD160 a5338e3a7fe91988258166394233a3546f018afa SHA1 4b4582977d8f7515c1c1ceaec31c43a9d2867b73 SHA256 a38e4bda4776a323170cf19d279b0d5adcdbce73185accd2ceaac4ed9fad896f
+MD5 91b740e077c7a9e6d515e65ec71375ce firebird-1.5.3-r1.ebuild 7176
+RMD160 a5338e3a7fe91988258166394233a3546f018afa firebird-1.5.3-r1.ebuild 7176
+SHA256 a38e4bda4776a323170cf19d279b0d5adcdbce73185accd2ceaac4ed9fad896f firebird-1.5.3-r1.ebuild 7176
 EBUILD firebird-1.5.3.ebuild 6486 RMD160 5dc0440bbea1b7d8f9578fbed59c0aa75b32d553 SHA1 112a1cefbaa5f31ff9ad83d29f3c8d2ba1ab2e71 SHA256 dca64fae93f1c41ec3d1b4929c421406bd7e813f3af37e0142233436ad49fbfc
 MD5 1e1a468b795c5e172fa1ca5e52e71e21 firebird-1.5.3.ebuild 6486
 RMD160 5dc0440bbea1b7d8f9578fbed59c0aa75b32d553 firebird-1.5.3.ebuild 6486
 SHA256 dca64fae93f1c41ec3d1b4929c421406bd7e813f3af37e0142233436ad49fbfc firebird-1.5.3.ebuild 6486
-MISC ChangeLog 7636 RMD160 2e5939847ded05874c738c92dbbe7c8e7bbdf395 SHA1 0a5a5b17da341dbc228243ebe21ef5cbb1fb7f99 SHA256 415e32071d68bf2fb912b149586acbeedb07027984227b93ded92748b1bada44
-MD5 d9675b082975acc4c8d99d42c68f6473 ChangeLog 7636
-RMD160 2e5939847ded05874c738c92dbbe7c8e7bbdf395 ChangeLog 7636
-SHA256 415e32071d68bf2fb912b149586acbeedb07027984227b93ded92748b1bada44 ChangeLog 7636
+MISC ChangeLog 7837 RMD160 dd05c21e844189afd2bb5d725bb1e8be366899d4 SHA1 50051832713a7516c8cf782410e93413a835179f SHA256 8429ae3ecb3f6ad0822630f020037b949756b9ce4ecb21a0cf013dc522a1697a
+MD5 8de94cda4722a307d84b5192891b75c3 ChangeLog 7837
+RMD160 dd05c21e844189afd2bb5d725bb1e8be366899d4 ChangeLog 7837
+SHA256 8429ae3ecb3f6ad0822630f020037b949756b9ce4ecb21a0cf013dc522a1697a ChangeLog 7837
 MISC metadata.xml 225 RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 SHA1 edf45c54d43d4c80b949c49355fc530b4271338e SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c
 MD5 70eaf71c2018b87fe06aed9df3799509 metadata.xml 225
 RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 metadata.xml 225

diff --git a/dev-db/firebird/files/firebird-1.5.3-gcc412.patch b/dev-db/firebird/files/firebird-1.5.3-gcc412.patch
new file mode 100644 (file)
index 0000000..4b5e901
--- /dev/null
+++ b/dev-db/firebird/files/firebird-1.5.3-gcc412.patch
@@ -0,0 +1,73 @@
+diff -urNad stable~/src/jrd/jrd.cpp stable/src/jrd/jrd.cpp
+--- stable~/src/jrd/jrd.cpp    2006-10-18 21:47:43.000000000 +0300
++++ stable/src/jrd/jrd.cpp     2006-10-18 21:47:43.000000000 +0300
+@@ -135,14 +135,14 @@
+ #endif
+ 
+ #ifdef SERVER_SHUTDOWN
+-extern "C" {
++//extern "C" {
+ typedef struct dbf {
+       struct dbf *dbf_next;
+       USHORT dbf_length;
+       TEXT dbf_data[2];
+ } *DBF;
+ 
+-} // extern "C"
++//} // extern "C"
+ 
+ #include "../jrd/sort.h"
+ #endif /* SERVER_SHUTDOWN */
+@@ -159,9 +159,9 @@
+ /*TMN: fwd. decl. SHOULD BE IN A HEADER FILE*/
+ void ALL_print_memory_pool_info(IB_FILE * fptr, DBB databases);
+ void ALLD_print_memory_pool_info(IB_FILE * fptr);
+-extern "C" {
++//extern "C" {
+ void gds_print_delta_counters(IB_FILE *);
+-} // extern "C"
++//} // extern "C"
+ 
+ #endif /* SUPERSERVER */
+ 
+@@ -201,10 +201,10 @@
+ 
+ #ifdef SUPERSERVER
+ 
+-extern "C" {
++//extern "C" {
+ extern SLONG trace_pools;
+ static REC_MUTX_T databases_rec_mutex;
+-} // extern "C"
++//} // extern "C"
+ 
+ // BRS. 03/23/2003
+ // Those empty defines was substituted with #if defined(V4_THREADING) && !defined(SUPERSERVER)
+@@ -289,7 +289,7 @@
+       return TRUE;
+ }
+ 
+-extern "C" {
++//extern "C" {
+ 
+ 
+ #ifdef WIN_NT
+@@ -592,10 +592,10 @@
+ 
+ 
+ #ifdef SHLIB_DEFS
+-} // extern "C"
++//} // extern "C"
+ /**  Use shdef.h which has all shared lib defs **/
+ #include "shdef.h"
+-extern "C" {
++//extern "C" {
+ #endif
+ 
+ 
+@@ -6620,4 +6620,4 @@
+       return true;
+ }
+ 
+-} // extern "C"
++//} // extern "C"

diff --git a/dev-db/firebird/firebird-1.5.3-r1.ebuild b/dev-db/firebird/firebird-1.5.3-r1.ebuild
index 0d13c674fe5e3d019f7fdcd5b08bf3f46d78d4d0..3b6f5e2fc773f55ba1d3e0339f6b9200ef3e3cf0 100644 (file)
--- a/dev-db/firebird/firebird-1.5.3-r1.ebuild
+++ b/dev-db/firebird/firebird-1.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.10 2007/02/02 14:12:27 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.11 2007/04/07 20:23:57 dirtyepic Exp $
 
 inherit flag-o-matic eutils
 
@@ -9,7 +9,7 @@ MY_P=${P}.${extra_ver}
 DESCRIPTION="A relational database offering many ANSI SQL-99 features"
 HOMEPAGE="http://firebird.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-        mirror://gentoo/${PN}-1.5-gcc4.patch.bz2
+       mirror://gentoo/${PN}-1.5-gcc4.patch.bz2
                doc? (  http://firebird.sourceforge.net/pdfmanual/Firebird-1.5-QuickStart.pdf
                                ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
@@ -23,7 +23,6 @@ RDEPEND="xinetd? ( virtual/inetd )"
 DEPEND="${RDEPEND}
        doc? ( app-arch/unzip )"
 
-
 S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
@@ -33,11 +32,11 @@ pkg_setup() {
 
 src_unpack() {
        if use doc; then
-           # Unpack docs
-           mkdir ${WORKDIR}/manuals
-           cd ${WORKDIR}/manuals
-           unpack ib_b60_doc.zip
-           cd ${WORKDIR}
+               # Unpack docs
+               mkdir ${WORKDIR}/manuals
+               cd ${WORKDIR}/manuals
+               unpack ib_b60_doc.zip
+               cd ${WORKDIR}
        fi
 
        unpack ${MY_P}.tar.bz2
@@ -46,6 +45,8 @@ src_unpack() {
 
        epatch ${FILESDIR}/${PN}-1.5-build.patch
        epatch ${WORKDIR}/${PN}-1.5-gcc4.patch
+       # Bug #167051
+       epatch ${FILESDIR}/${P}-gcc412.patch
 
        # This file must be regenerated during build
        rm ${S}/src/dsql/parse.cpp
@@ -132,8 +133,8 @@ src_install() {
 
        # Install docs
        if use doc; then
-           dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf
-           dodoc ${WORKDIR}/manuals/*
+               dodoc ${DISTDIR}/Firebird-1.5-QuickStart.pdf
+               dodoc ${WORKDIR}/manuals/*
        fi
 }