From bd121df26e486f156898bcb330129b7204ddeb96 Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 7 Aug 2009 11:55:32 +0000 Subject: [PATCH] dev-db/firebird: Bump and add icu and gcc 4.4 patch git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1451 6952d904-891a-0410-993b-d76249ca496b --- dev-db/firebird/ChangeLog | 6 ++++- dev-db/firebird/Manifest | 5 ++-- .../files/firebird-gcc-icu-declare-new.patch | 27 +++++++++++++++++++ dev-db/firebird/firebird-2.1.2.18118.0.ebuild | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 dev-db/firebird/files/firebird-gcc-icu-declare-new.patch diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index 20402a01..ef3ba82a 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-db/firebird -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.97 2009/01/18 22:03:05 jsbronder Exp $ + 07 Aug 2009; Mario Fetka + firebird-2.1.2.18118.0.ebuild, +files/firebird-gcc-icu-declare-new.patch: + Bump and add icu and gcc 4.4 patch + 18 Jan 2009; Justin Bronder firebird-2.0.3.12981.0-r6.ebuild, firebird-2.0.3.12981.0-r7.ebuild, firebird-2.0.4.13130.1.ebuild, firebird-2.1.1.17910.0.ebuild: diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index f846f273..49931096 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -1,11 +1,12 @@ AUX 70firebird 50 RMD160 ebfc2e7a38dbd95b3df0dc4c8a757bd089f69807 SHA1 71b414835ed7c66f94b2908b7793da817d3c4438 SHA256 ca3ca56c53490ac6f849ce78cd1240fc52334f25c8d3841eef1560bed2a80d03 AUX firebird-2.1.2.18118.0-deps-flags-libs.patch 4509 RMD160 0f391b8bb34e18af79949b0880c71607ee4b0259 SHA1 b1bda417c38f7d2574c2fef119ae84ba4cc58c83 SHA256 1b56b6aa8e10c1126fe1c4218fc1f079dd3708551926e6fb4be7b43f44b5a003 +AUX firebird-gcc-icu-declare-new.patch 537 RMD160 2464b9328098ec7db82a4a84aa31cf0fe1e6e521 SHA1 604dc760fcd056c8376548233d1043f8229b11bb SHA256 877d3a5eeb5a98d0ca06de5ca39fac892abd3eae8296bdbc88b15eb8a42fd339 AUX firebird.conf.d 73 RMD160 3ed3f866ee37d8e99b5dd32132ae78889ddeef66 SHA1 a5f9ef1b7c1186feecdf7574cacca6b589c8029f SHA256 7c430ddf7aa8fdf6b68ef88e44ad0d7d546469f6fdc156bdc340fffefa85408c AUX firebird.conf.d.2 105 RMD160 a047ffded75ed5f055949993fd794941eee8fe25 SHA1 d10907676a706bdecae27321861ccd0e89bc7993 SHA256 032e26a957572718c3fb9ffbb1a83fac16a00cd41a027732e8cfbbe0f1a2ab61 AUX firebird.init.d 692 RMD160 fd32d3ca38f149df1c6c46697a9c043b22bf25dd SHA1 379f3dd8e768e958ab3faff203d0d7a502c8f120 SHA256 7602d5030abaa7414cbe10f3223c38861742807bbe92f9af5693d28520398f6e AUX firebird.xinetd.2 199 RMD160 97baaf905714cdfe2c062a05869ed7bf02ab0e08 SHA1 1186bbc61ecd17adeb598442d78abfaa3ac54194 SHA256 c0ea0c66e17c41633c19f7bed8cc8f818a3e1afad796d8d493c3b532b498da48 DIST Firebird-2.1.2.18118-0.tar.bz2 13485341 RMD160 37a35600092758715b4d1f82d728fa2e87f8c2de SHA1 1f2528af1804eb09f06f8cfa1d97b9643af181ef SHA256 91cb30a744c6d1e05a259ca97acc1f24d20e478ac37b7130e0675f209b3ec6e3 DIST ib_b60_doc.zip 10530848 RMD160 c64b4b6bc9125929928517ba072558a58ddf577d SHA1 5e94fb89e15f738aa8605c913e75ec212fa163ef SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d -EBUILD firebird-2.1.2.18118.0.ebuild 10072 RMD160 6417d8bd3da1b3b19a2cde9ec9e18c8e4d2aa602 SHA1 d8a12f9ec9872dfea085744ee94514c75c92be78 SHA256 66e67adb67664ba8b0643f76e3ce93301b7ac45f3223b7a6086944d5d0563798 -MISC ChangeLog 21209 RMD160 28067f324fd62a0522d23d3580568c21e609f962 SHA1 fddd3df44f7dd98981a5fc4f98da277140320ba9 SHA256 5630bb0c13e54a43d910596cb61e6077a9b3b302f6c1401d0ae150e524615ac9 +EBUILD firebird-2.1.2.18118.0.ebuild 10126 RMD160 43d52d00da3a3ae0a57c37ba0c05dd24ca4021f3 SHA1 5840df4c69f5ec6fab2a4bc46838536195f91baf SHA256 c1d7417a633da5e3536294a4e5b4608f2c0ed2eb4359d963499256d511feffda +MISC ChangeLog 21374 RMD160 c71bdf2f66411117502b7daa914a8ee9db609d56 SHA1 58e0ad95beaf9827e97a6215ae92da4bb2364636 SHA256 fe5227a00180d555fb0ce25cdd137a150842b18ed0515ea2d32e0ccfed6e17e2 MISC metadata.xml 619 RMD160 098761b0ad299b3c7bf0d3b59b9ebe2cf01cc145 SHA1 ef2a0fbd0a8b21692ae1a2a12e8b0ce7222fff9f SHA256 6b01dc565960c0345d81dafc9775196f4bc719eb925ea94c6b0a0c20e195e9e8 diff --git a/dev-db/firebird/files/firebird-gcc-icu-declare-new.patch b/dev-db/firebird/files/firebird-gcc-icu-declare-new.patch new file mode 100644 index 00000000..1e0fc093 --- /dev/null +++ b/dev-db/firebird/files/firebird-gcc-icu-declare-new.patch @@ -0,0 +1,27 @@ +--- src/common/classes/alloc.h.old 2009-07-09 13:04:14.000000000 +0200 ++++ src/common/classes/alloc.h 2009-07-09 13:05:37.000000000 +0200 +@@ -48,6 +48,8 @@ + stdlib.h (EKU) */ + #endif + ++#include ++ + #ifdef _MSC_VER + #define THROW_BAD_ALLOC + #else +@@ -448,15 +450,6 @@ + ); + } + +-inline void* operator new(size_t, void* ptr) throw() +-{ +- return ptr; +-} +-inline void* operator new[](size_t, void* ptr) throw() +-{ +- return ptr; +-} +- + inline void operator delete(void* mem) throw() + { + Firebird::MemoryPool::globalFree(mem); diff --git a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild index 7a1e47a4..0869a11d 100644 --- a/dev-db/firebird/firebird-2.1.2.18118.0.ebuild +++ b/dev-db/firebird/firebird-2.1.2.18118.0.ebuild @@ -61,6 +61,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}/${P}-deps-flags-libs.patch" + epatch "${FILESDIR}/${PN}-gcc-icu-declare-new.patch" einfo "Split up Firebird via relative path hacks" # sed vs patch for portability and addtional location changes