diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-12 16:49:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-12 16:49:02 +0000 |
| commit | 519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (patch) | |
| tree | 7e99d88a777fe8c9d3ec6310bf7eea639b0e66b4 /dev-db/firebird | |
| parent | a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (diff) | |
gentoo resync : 12.11.2017
Diffstat (limited to 'dev-db/firebird')
| -rw-r--r-- | dev-db/firebird/Manifest | 3 | ||||
| -rw-r--r-- | dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch | 35 | ||||
| -rw-r--r-- | dev-db/firebird/firebird-2.5.7.27050.0.ebuild | 5 |
3 files changed, 41 insertions, 2 deletions
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index 19c48cad8f1d..234c8fb24626 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -1,5 +1,6 @@ AUX firebird-2.5.1.26351.0-superclassic.patch 713 SHA256 dbf9b28a50772ec5c158ab8dfc6a06da5c72b179117ef5b6c6e1645d796f13bf SHA512 b1c0e253f25616ae6522f693e4a1202bcf290eab3d3cfc06f29e6822f8e55d1d316f0e45b89ebca2b4cd5c97bba07997a7e3aa7e5870ffaca28295d1f3d449cb WHIRLPOOL eef1837adac86b7bc21f8e240b753398a787e4e108243004ca34b6015c842e7ca91ce584ffa4e85e1f2e908b5b2d5a3af5fa04125c110b13ffe43b5dca63c5d6 AUX firebird-2.5.3.26780.0-deps-flags.patch 3054 SHA256 cfc32092e041dc8fd0997ca40332c21d1e05e847467ccb39bb389d328117f47e SHA512 c786daaec706223c67c74448a317b5dcebcabeba17c244ebbf474763fd3d61e9ee5613241b94194a14816c2bd90dfff8a649bee9ab59eb78e085cb9f812ec9e8 WHIRLPOOL e2a39f825cd6b5ba5f4123243daa48cc703ceddb7a48baa5a6594f24ba5148a2ed38561427acc8a6b6e61b1c5dc7b0cc517c4378b1575f3dc3d0196b96606a8a +AUX firebird-2.5.7.27050.0-gcc6.patch 997 SHA256 ba0469399cc2c3f4060fc17b1bf43d81ba8110cbec49c1368d5f47e43cc5faaf SHA512 73634cf7cc34497116591094bafd48e4959562d0b6ed91be4d35f6931af5ebaa566d3c5d3785135f75c3b78a19f7a149a1aa9617eccc6ea0c6ee794e46500fd6 WHIRLPOOL 15b333b56b2ad0899da1f43615139011b4e8b3fc068b29defdbbff6d77f87f4e8d702b4c43efe76737f242d2639b227b99b5b81563993c9d7bb0fc0b50b5ad9c AUX firebird-3.0.2.32703.0-cloop-compiler.patch 349 SHA256 3e44dddd3984559f513c8b228e2d6adbc9874491d50dd8ebe66040d73d381338 SHA512 1d57f26ada2023d8bd04d73dd0f55951cef6b373710c8cf73b6bea0b4d54f879d689644d26541b2366bd1071b08eda2e1b531f3779a88b8fb52d3c9312f0c091 WHIRLPOOL 18eb967ab07416122dd6c03f271be11ee30cf32b94fc18f0df5f6385819ca95bbd6fa0a2ee970068efba84c67dab56f6b2dbe37d1e770f6068b25c94c2b0f042 AUX firebird-3.0.2.32703.0-gcc6.patch 806 SHA256 a7da9356fda910e75b15b9d2cceb135a5eb1837687ded1d55ee711569078b59a SHA512 184f754c4c23b7917acfabf1a5024069b8f35f58e667112a203a02e906560f2f5fea711b12975dafb3adcbe5159999e40fa459898a41d88e6de9b3499d8eaa67 WHIRLPOOL 93f802f9af6491cb6512c5eb8cffbda5256ca23cc79dfca98b1774b539c4ee9fed7ce5d36314c275f696307d60c680aaa79524eb3eaefa3b19273b07fe1fd9f6 AUX firebird-3.0.2.32703.0-unbundle.patch 1786 SHA256 44b06fb13209d8d1659caa0489804306a7e5ac7fd09c8c600d801e6cf611efe1 SHA512 bb0f8cb283ee230f9128a9da16da21933a1709615b34bbfac117a0563e2451a07381b52ffc1fed665e74688ff8e2c2548f86c1413427665914cb3df8500543c5 WHIRLPOOL c52c2c6ec8ad72534995ab6a5a26495390a24ce153f6752d93d3e4336ce0165319f8f84aa171a372f6e0ebf0fe6a08fa725450244efe3fb51dabe9fad6278bc1 @@ -12,7 +13,7 @@ AUX firebird.xinetd.3.0 193 SHA256 db3f4d91ca0790c5737efbfab10d2b7798e12d25529c2 DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327 WHIRLPOOL d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6 WHIRLPOOL 2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f -EBUILD firebird-2.5.7.27050.0.ebuild 7941 SHA256 9ef2b613d8a772f05a0f5128f7f95c4398a2f60e492eaf79b9e344c43ea37eec SHA512 1dd73505254f928424ed267f7d568e825125feb0b4eb1e95b7d751897011f60f516ef811144fdb50c8db928c9533a19f41e5c5eed781f18250417b93c208e0b5 WHIRLPOOL 5efab77c3fd5cdebeec0257a8a27b324d8fe1813c5b249945c3d6af9ef9237f86d79da9e08bb3eadebc0fe13d2611eb13c9f707f27d2f7ff1bd6a496fcbedf5d +EBUILD firebird-2.5.7.27050.0.ebuild 7973 SHA256 2d70f47a395e3f745e805a2e9e9403c6b8bd18e25ea2798944fdfc5ba230af1d SHA512 fd067c67bcd747a7392cb28aceb50066dee54d22c349e93992305d91691167b14ea5cf3bc34d36451b6bc66c8d944026c6508664326206526bff84d29741f7be WHIRLPOOL e0a962de997ed9d5d3c3f2524a96f31fdeb7f1a69e4cdc873dc9d035bbca211cacbc3875e601ca966fd4adfbba48305f81332a1e059c21649cd8ceb15fbac964 EBUILD firebird-3.0.2.32703.0-r2.ebuild 6157 SHA256 3317033811b4d30578e8a0179912fe79256d164487f3df680d58eab4c1fd635a SHA512 cf722eda8754fdf53bbb566c694f56107430bafc057ff10f86fba8ef17d15c7c02f693f29a9c0161a6c63aaa156ecdbf82fa59c18b122f9ae500128677ee2197 WHIRLPOOL 7159e819ea8057e3a7d770976dd96cee851db88d1caa71dac1f278b46912da0e2438426f5dba75469cb24aedbe1e463c7f9ad05f503dd387fadafe60d4252957 MISC ChangeLog 4609 SHA256 dcd2323ad938a371b7e79a19127f7a9a0883eec3f8eba9533486737bf71e43b0 SHA512 a9cab5764dd9d25f0a12652afc7ab81754c165f56d9fd89befc1ec318d3cab8b7654e7c117a0e567940d9ca6b72888529a7c219c77d6a7a04a4bd3486483c637 WHIRLPOOL 0b52d2a7a41167ffd2e747a05d3bd16fa887b1aa740fa551fd0cea413ddf82602a0305f49a89f1ff7058fef14422a1f1d0153edd67edc202d36ddabe474b48aa MISC ChangeLog-2015 27643 SHA256 90f3ca67c90972e18ca65eb008f8c67d5b3648a396802236ed47f9c38e96aa4b SHA512 7f93124a70de0d5c577723b218ce6e852fb422c8980d06cca1869d7beaa5007b847e4b9d5d3baa5cf3dc62a7127e50e6da19f5f736f932eb3ea92bbeaf182690 WHIRLPOOL f79f0c1ca9f54784d0e3853b00ae34c17864e037696541eb0e318fb0316af8ad09c79f10e34c86a586730bc1cc3cbc1d85b7cae665fabfe6bbed038f90d467d4 diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch new file mode 100644 index 000000000000..f051ea02b4ce --- /dev/null +++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch @@ -0,0 +1,35 @@ +Bug: https://bugs.gentoo.org/608294 +PR: https://github.com/FirebirdSQL/firebird/pull/104 + +--- a/src/common/classes/alloc.h ++++ b/src/common/classes/alloc.h +@@ -498,10 +498,14 @@ using Firebird::MemoryPool; + + inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; } + ++#if (( ! __GNUC__ ) || ( __GNUC__ < 6 )) ++ + // Global versions of operators new and delete + void* operator new(size_t s) THROW_BAD_ALLOC; + void* operator new[](size_t s) THROW_BAD_ALLOC; + ++#endif ++ + void operator delete(void* mem) throw(); + void operator delete[](void* mem) throw(); + +--- a/src/dudley/exe.epp ++++ b/src/dudley/exe.epp +@@ -2884,9 +2884,9 @@ static USHORT get_prot_mask( const TEXT * relation, TEXT * field) + blr_parameter, 0, 0, 0, + blr_parameter, 0, 1, 0, + blr_parameter, 1, 0, 0, +- blr_end, +- blr_end, +- blr_end, ++ static_cast<SCHAR>(blr_end), ++ static_cast<SCHAR>(blr_end), ++ static_cast<SCHAR>(blr_end), + blr_eoc + }; + static FB_API_HANDLE req_handle;
\ No newline at end of file diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild index b118e34f5f20..b6e56990fd82 100644 --- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild +++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild @@ -35,7 +35,10 @@ RDEPEND="${CDEPEND} RESTRICT="userpriv" -PATCHES=( "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch + "${FILESDIR}"/${P}-gcc6.patch +) S="${WORKDIR}/${MY_P}" |