From 8174c821d9ed428648765c50b74ea107efccf882 Mon Sep 17 00:00:00 2001 From: Karol Wojtaszek Date: Mon, 7 Aug 2006 07:51:37 +0000 Subject: [PATCH] Fixed compilation problem with gcc-4, bug #120867 Package-Manager: portage-2.1.1_pre3 --- dev-db/firebird/ChangeLog | 6 +- dev-db/firebird/Manifest | 78 +++++++++++++++++-- .../firebird/files/digest-firebird-1.5.3-r1 | 3 + dev-db/firebird/firebird-1.5.3-r1.ebuild | 10 ++- 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index a5ddb87b2a24..98e4c1661c3b 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/firebird # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.44 2006/03/23 14:57:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.45 2006/08/07 07:51:37 sekretarz Exp $ + + 07 Aug 2006; Karol Wojtaszek + firebird-1.5.3-r1.ebuild: + Fixed compilation problem with gcc-4, bug #120867 23 Mar 2006; Aron Griffis firebird-1.5.1.ebuild, firebird-1.5.2.ebuild, firebird-1.5.3.ebuild, firebird-1.5.3-r1.ebuild: diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index 85512a84191c..62462ad28017 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -1,18 +1,84 @@ -MD5 aac413f838c3a58a914d947c98c89114 ChangeLog 6872 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird 50 +RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird 50 +SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird 50 +AUX 70firebird-1.5.0 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50 -MD5 606e690fe61535cc02d7314616e263fb files/digest-firebird-1.5.1 73 -MD5 9019505bedbd32c5cec6700c075f3872 files/digest-firebird-1.5.2 73 -MD5 fb23d7c22e124f7bf16d2468d001a728 files/digest-firebird-1.5.3 265 -MD5 1247986c0efcccfa87c07e7b8837bd8e files/digest-firebird-1.5.3-r1 756 +RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 files/70firebird-1.5.0 50 +SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 files/70firebird-1.5.0 50 +AUX firebird-1.5-build.patch 2125 RMD160 8ca946aea594b5aff1c963cc1cf87a88e950d39b SHA1 a1ab6d8e5823b4af3ddccc66994f66ba7b1f2cb7 SHA256 d92063ce40ee359df1662dc4fbb079fa59ec30f0c9924a8942a0e0ceb806df11 MD5 51a8d891eaaaf720cf57d3d1686735f1 files/firebird-1.5-build.patch 2125 +RMD160 8ca946aea594b5aff1c963cc1cf87a88e950d39b files/firebird-1.5-build.patch 2125 +SHA256 d92063ce40ee359df1662dc4fbb079fa59ec30f0c9924a8942a0e0ceb806df11 files/firebird-1.5-build.patch 2125 +AUX firebird-1.5.0.xinetd 425 RMD160 df129f2e031ecd5ab885cb9a0c65a6c8d459a5f2 SHA1 c82ee25d92f89d0c2899a469cdda43851cafdddd SHA256 a8d918c64837a52d6a94650e9b39bc2279662adbad1e830767e5171a15efe6ce MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425 +RMD160 df129f2e031ecd5ab885cb9a0c65a6c8d459a5f2 files/firebird-1.5.0.xinetd 425 +SHA256 a8d918c64837a52d6a94650e9b39bc2279662adbad1e830767e5171a15efe6ce files/firebird-1.5.0.xinetd 425 +AUX firebird-1.5.1-gcc34.patch 5906 RMD160 7249ee6156044a20fd8b93b870b745587ef5b3ea SHA1 81b93c7480e6cb5c676e7fe9e877997a0bf1c5a4 SHA256 b05be878185ae46564994b700477882fd9a2217546a441099edd1016c8b694ac 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.conf.d 80 RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 SHA1 9442726f3e59887ecc40333c0214045cd8f78d50 SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80 +RMD160 bcee53ba9cde8822f3c4f980e274bc4958a6fc30 files/firebird.conf.d 80 +SHA256 ad4590c1fc81006759ae801086aa73567f82799bad8275c91d7ddb97c26f7f2f files/firebird.conf.d 80 +AUX firebird.init.d 697 RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 SHA1 f2684574fcb5960403ad1d65d5b2f13c694219c2 SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83 MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697 +RMD160 eb18c898dcb7d5e86906c7ad78f4ea9210b13b89 files/firebird.init.d 697 +SHA256 6585f1fba391fa49157975cf81ac7922648fc2749e326eac3b9ed571f6c43c83 files/firebird.init.d 697 +AUX firebird.xinetd 206 RMD160 982a38df26c870ba634576f6188683478d2a69da SHA1 c495d0f88e46dd3b9cc42f030bc1ab42b138e8fd SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494 MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206 +RMD160 982a38df26c870ba634576f6188683478d2a69da files/firebird.xinetd 206 +SHA256 b129b0653cacd81968986b5514ba78829deeab19972cec18271a6b354247e494 files/firebird.xinetd 206 +DIST Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f SHA1 fc64d475222257b269378451a69167ea53852ece SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe +DIST firebird-1.5-gcc4.patch.bz2 21974 RMD160 c7a348dd1fbd08813eebb9487716f4d1a5390576 SHA1 7588ee5db8325bc5330cbc244b7ceabaf85811cc SHA256 f48e1fbccae15b9367c432e46f06ea9a4b4059de5192386375733764c028776c +DIST firebird-1.5.1.4481.tar.bz2 4528253 +DIST firebird-1.5.2.4731.tar.bz2 4764015 +DIST firebird-1.5.3.4870.tar.bz2 5055973 RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 SHA1 6be1e2e46be6ebd16e5b9b10ad2b4f5aeb15f3d4 SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 +DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d +EBUILD firebird-1.5.1.ebuild 6508 RMD160 819d315b95d2be5bec25209ddba3793a0429b4d9 SHA1 5d946d2cd1a280ea2064863cfec14840fce06ef5 SHA256 aec26354b1f52c29883a88d4424f142f1eb014587ace44f8a4f4fa3b0b8c3fb9 MD5 42780db02965c27d4d0314fbb12ae173 firebird-1.5.1.ebuild 6508 +RMD160 819d315b95d2be5bec25209ddba3793a0429b4d9 firebird-1.5.1.ebuild 6508 +SHA256 aec26354b1f52c29883a88d4424f142f1eb014587ace44f8a4f4fa3b0b8c3fb9 firebird-1.5.1.ebuild 6508 +EBUILD firebird-1.5.2.ebuild 6515 RMD160 030ec174f15fb1ae5bec3e624bc2ef65fa3b7d17 SHA1 3814b77150fa0bcc3d0d7a7c277778500e97cd7c SHA256 db1c123cf748ff17c09da32199be0acfca17f3fccb1bf9b2bf18c4fc82b00a3d MD5 a872e85812a4baeada17c7f79a7316a9 firebird-1.5.2.ebuild 6515 -MD5 aaa6ce2cb8ff7ee81e4f9f9351f08611 firebird-1.5.3-r1.ebuild 6982 +RMD160 030ec174f15fb1ae5bec3e624bc2ef65fa3b7d17 firebird-1.5.2.ebuild 6515 +SHA256 db1c123cf748ff17c09da32199be0acfca17f3fccb1bf9b2bf18c4fc82b00a3d firebird-1.5.2.ebuild 6515 +EBUILD firebird-1.5.3-r1.ebuild 7171 RMD160 28f6934ae3385686aeab4fe84df18bc5c06a28a0 SHA1 6f562d3133a0eb020fca9796454f837aba2a13db SHA256 3d88aa8c17b6301106300f0e1750116e2739d32b8dfde8c17aafdb654ad9d62b +MD5 0e9f3e1a4ac050d957ec307183d52be8 firebird-1.5.3-r1.ebuild 7171 +RMD160 28f6934ae3385686aeab4fe84df18bc5c06a28a0 firebird-1.5.3-r1.ebuild 7171 +SHA256 3d88aa8c17b6301106300f0e1750116e2739d32b8dfde8c17aafdb654ad9d62b firebird-1.5.3-r1.ebuild 7171 +EBUILD firebird-1.5.3.ebuild 6512 RMD160 d95821fc100178983eef4e6ada0483fc827b2ed6 SHA1 3a6f4348180b151dfe391df33f373b377058ce4b SHA256 8815d90d0bbb3ebf0489344f037db5ad34df459349e5d16ab57248ce3f719951 MD5 4f95449330174aeeb405c1baac29d3a1 firebird-1.5.3.ebuild 6512 +RMD160 d95821fc100178983eef4e6ada0483fc827b2ed6 firebird-1.5.3.ebuild 6512 +SHA256 8815d90d0bbb3ebf0489344f037db5ad34df459349e5d16ab57248ce3f719951 firebird-1.5.3.ebuild 6512 +MISC ChangeLog 7008 RMD160 06164998dc6eb75e4cdaa653a2cd34f93bf4a5d1 SHA1 9b25f9b54e9b26114210f618c3823d21eda11133 SHA256 edec82854d0de05774a44d4aca0a2f386dad8dfa09146614dafba482fe5b6d79 +MD5 fa5a45cfc81c96326510f21ae149ce6f ChangeLog 7008 +RMD160 06164998dc6eb75e4cdaa653a2cd34f93bf4a5d1 ChangeLog 7008 +SHA256 edec82854d0de05774a44d4aca0a2f386dad8dfa09146614dafba482fe5b6d79 ChangeLog 7008 +MISC metadata.xml 225 RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 SHA1 edf45c54d43d4c80b949c49355fc530b4271338e SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c MD5 70eaf71c2018b87fe06aed9df3799509 metadata.xml 225 +RMD160 7c157805d934c18e77b4ed4ebd28870843ec0b81 metadata.xml 225 +SHA256 d16e8c5dfbf984681d500dad1063583ba0a21e0b73da359178bb87c09d951c9c metadata.xml 225 +MD5 606e690fe61535cc02d7314616e263fb files/digest-firebird-1.5.1 73 +RMD160 8a5c47f819c00653f9ee1afcd7918a5647857ae9 files/digest-firebird-1.5.1 73 +SHA256 290694b1e5f471875fd9a9f7c30467c9ff2b2074319ec914f188a9a454964fe1 files/digest-firebird-1.5.1 73 +MD5 9019505bedbd32c5cec6700c075f3872 files/digest-firebird-1.5.2 73 +RMD160 d7ad3637e5a90855c82358b43028ca2615a33137 files/digest-firebird-1.5.2 73 +SHA256 cc8d726347ba54cb5bbc2087f8131c9ba5ddb8f8910c6fa63305ba68ec558028 files/digest-firebird-1.5.2 73 +MD5 fb23d7c22e124f7bf16d2468d001a728 files/digest-firebird-1.5.3 265 +RMD160 e5148fe85121b2bf338958aaa8845861b9e0ff06 files/digest-firebird-1.5.3 265 +SHA256 c1f762c686652cb067fd1dbe20db0fda782c713a961b1f30da5e25ae37e9317c files/digest-firebird-1.5.3 265 +MD5 a52e967cf2d04fbbf7c6a8a2fc988105 files/digest-firebird-1.5.3-r1 1015 +RMD160 e71a88ad45cd1b43c6c69417a9d7b9e24bb9a1e6 files/digest-firebird-1.5.3-r1 1015 +SHA256 fce6d7adc88cb5cb9a444b74dc328c86dc9f6edfebfad4a9cd9f60eacaad225d files/digest-firebird-1.5.3-r1 1015 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.4 (GNU/Linux) + +iD8DBQFE12gBub4+zaPCR/oRAk8kAJwNHuDQEingzq+zQiTzoFe1xPzbVwCfZAJD +qq74o1px0FIuz9tbIcbyKTY= +=mPbc +-----END PGP SIGNATURE----- diff --git a/dev-db/firebird/files/digest-firebird-1.5.3-r1 b/dev-db/firebird/files/digest-firebird-1.5.3-r1 index 3f2503307191..98428bd941ef 100644 --- a/dev-db/firebird/files/digest-firebird-1.5.3-r1 +++ b/dev-db/firebird/files/digest-firebird-1.5.3-r1 @@ -1,6 +1,9 @@ MD5 3690d389b3b69883f4bbc258b6c81851 Firebird-1.5-QuickStart.pdf 193637 RMD160 c3d541701950a9b8ac0b353e5360af9235a3cf3f Firebird-1.5-QuickStart.pdf 193637 SHA256 3b6cbf86d9ee7deaeeae101edf6c124c694ca423c9f4d09da035eed9e2bb70fe Firebird-1.5-QuickStart.pdf 193637 +MD5 1100147a18b2127f6afd7083f829d62e firebird-1.5-gcc4.patch.bz2 21974 +RMD160 c7a348dd1fbd08813eebb9487716f4d1a5390576 firebird-1.5-gcc4.patch.bz2 21974 +SHA256 f48e1fbccae15b9367c432e46f06ea9a4b4059de5192386375733764c028776c firebird-1.5-gcc4.patch.bz2 21974 MD5 559d005ab6622274f9448687f930393c firebird-1.5.3.4870.tar.bz2 5055973 RMD160 3833574f8c2d996bfb06b346a5d22a88d9923425 firebird-1.5.3.4870.tar.bz2 5055973 SHA256 16880405d6e321a70e80c6e6fb4ed8429a692c43b8a7b59a676cf7d2162d2023 firebird-1.5.3.4870.tar.bz2 5055973 diff --git a/dev-db/firebird/firebird-1.5.3-r1.ebuild b/dev-db/firebird/firebird-1.5.3-r1.ebuild index 1a96763d5bf9..646cc4c8feee 100644 --- 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-2006 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.4 2006/03/23 14:57:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.3-r1.ebuild,v 1.5 2006/08/07 07:51:37 sekretarz Exp $ inherit flag-o-matic eutils @@ -8,7 +8,8 @@ extra_ver="4870" MY_P=${P}.${extra_ver} DESCRIPTION="A relational database offering many ANSI SQL-99 features" HOMEPAGE="http://firebird.sourceforge.net/" -SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2 +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.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 )" @@ -40,9 +41,14 @@ src_unpack() { fi unpack ${MY_P}.tar.bz2 + unpack ${PN}-1.5-gcc4.patch.bz2 cd ${S} epatch ${FILESDIR}/${PN}-1.5-build.patch + epatch ${WORKDIR}/${PN}-1.5-gcc4.patch + + # This file must be regenerated during build + rm ${S}/src/dsql/parse.cpp } src_compile() { -- 2.26.2