diff options
author | 2013-02-16 13:18:23 +0000 | |
---|---|---|
committer | 2013-02-16 13:18:23 +0000 | |
commit | de2e84b2bf04dc117638a2885f34d3327831135d (patch) | |
tree | e739821016ba75478b551bd6cfd2f43dcdb8b882 /app-office/libreoffice | |
parent | Mask 'unstable' flag for leechraft-full on stable keywords (diff) | |
download | historical-de2e84b2bf04dc117638a2885f34d3327831135d.tar.gz historical-de2e84b2bf04dc117638a2885f34d3327831135d.tar.bz2 historical-de2e84b2bf04dc117638a2885f34d3327831135d.zip |
Fix bug 454274 app-office/libreoffice-4.0.0.3: fails to build with dev-libs/boost-1.53.0. Tested with gcc 4.7.2. Add patch libreoffice-3.6.4.3-boost-1.53.0.patch for Bug 456162 - app-office/libreoffice-3.4.6.3: fails to build with dev-libs/boost-1.53.0 - not applied in the libreoffice-3.6.4.3.ebuild though as libreoffice-3.6.4.3 is stable and boost 1.53.0 is package masked.
Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r-- | app-office/libreoffice/ChangeLog | 12 | ||||
-rw-r--r-- | app-office/libreoffice/Manifest | 22 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-3.6.4.3-boost-1.53.0.patch | 168 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch | 146 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-4.0.0.3.ebuild | 4 |
5 files changed, 335 insertions, 17 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 274b224eeec7..66cb0ae1d377 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.441 2013/02/07 14:50:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.442 2013/02/16 13:18:10 gienah Exp $ + + 16 Feb 2013; Mark Wright <gienah@gentoo.org> + +files/libreoffice-3.6.4.3-boost-1.53.0.patch, + +files/libreoffice-4.0.0.3-boost-1.53.0.patch, libreoffice-4.0.0.3.ebuild: + Fix bug 454274 app-office/libreoffice-4.0.0.3: fails to build with dev- + libs/boost-1.53.0. Tested with gcc 4.7.2. Add patch + libreoffice-3.6.4.3-boost-1.53.0.patch for Bug 456162 - app- + office/libreoffice-3.4.6.3: fails to build with dev-libs/boost-1.53.0 - not + applied in the libreoffice-3.6.4.3.ebuild though as libreoffice-3.6.4.3 is + stable and boost 1.53.0 is package masked. *libreoffice-4.0.0.3 (07 Feb 2013) diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index c86d2425cd2d..ad613acdd8d2 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -4,8 +4,10 @@ Hash: SHA256 AUX generate_libreoffice_package.sh 5213 SHA256 293f8cc120f9342a46017caf792e5aeddfaca412e5fc77acb4553d01c4500048 SHA512 dc3d93326c30abaa975bb93eb760041e1cd01569d0ed28a041b11fce46e5e8494757133950af422e402a456e9116078e866be49880f1b0e356a670c3d0742498 WHIRLPOOL 5d8d5445bb69ab8e7443b83479786aced4386806fc065761141d0b2bf7e960cfeffd61bf47aa9ee9f661cd8a0122d14b0d56b7bfec2fe7d00c551d1ea149b097 AUX libreoffice-3.6-separate-checks.patch 2366 SHA256 0fa6bdba2a176f3cdbfc8f87f5fc69b8790b6464cb607153e807df758066a3fb SHA512 8c79eb6bb60f04c6877bf7f1aff8f93ff56e069ca00f2982123b6187aba77e23eb8287bf668ef419e0277e3f51a872a2cf11431465a1a35560ae86d4ff4794cf WHIRLPOOL 9c4e8eba379d4c8e51ff6a24438fb3a8f7d3d64132854c8e5cdfd082c2e1c4ae38c501ec199990e3d505466898199b32595045d7e9a456858c63b663d4ad5d2c AUX libreoffice-3.6-system-pyuno.patch 1628 SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b SHA512 e7eb2c26932dd3fdff22c0c72a28542a42c26fc04a0fcc2a813e7b4d7fe642f211a395d41042cfc735670127a81104fcc2a4b845a59235a4d7924db2659916b0 WHIRLPOOL 09863ef7c67e8ed5d3edfd758fcdebd3ad785d3f82de47b9f1cc60d41cc18a56973515088abe9a4584311b551073b0db8bdd7e74fb72a81576a5a0d71c900998 +AUX libreoffice-3.6.4.3-boost-1.53.0.patch 7892 SHA256 d41e3dfc0fbb465c6ddafc5c1b19aa943c00ab9cd53d2b0c1d3ba982e9ad4d54 SHA512 cc4b369a3647bc7a920e90896ffb90e766fef8a9d04d377df81effd93f2abc1b7039ef08f556f7cde2d5d6f7c815de41f0f0cc9a3328603ad353dc80afb7c9a4 WHIRLPOOL fc9ee01e3395bab591bda1f3cff515268c37ff573ef5389eb0d67461e56357178fba89749fd2891dcea496b45113fd114cd162febfd5515cede2b80b183fd656 AUX libreoffice-3.7-separate-checks.patch 1554 SHA256 d1128006f0e49cd0262a3c8e5f5251160929282cf65a5b560cde637346f7b724 SHA512 23f2d9587f5fdcfb1b59e9629d373b870a838003265cd48d88d1c6450e6d7e7bbb40df2b2ffc01efbe3cf14b9c5702174782797cfda152b7fcaa89eac7606314 WHIRLPOOL 0a3fe76cc8034a705a55886ac65242f3aa03a27d6905b7b1599295b97720321760884c2d2dedd6749d87dea9c769e34ade5f686e3c7e7d89900bec358f46ca04 AUX libreoffice-3.7-system-pyuno.patch 1642 SHA256 191d2462c13947d63a3f2758ec26b4b5b7765d06f0454add1c471e9dccfa9016 SHA512 76d0b836f2b26c9cd3a0ad2b471d033c863ffc1eb593f28f1ebecaae30f205adb97b4b0a63483f93d2f32d5934480f580776e1ce83baf77e5bedee759112fb8d WHIRLPOOL efada275cfa123b2f3fd96a20057fab5a8f83c50e0d401df1af76d1eb017e5c7ceb74d0a5d8fd77352379be4a69b67f22d99a072213b5644012094a31f353da0 +AUX libreoffice-4.0.0.3-boost-1.53.0.patch 6875 SHA256 6c0c9c6dfb076c9fd67a8c10b9a23253b98bea1510cfeb6ce1c02c74ac79ec07 SHA512 12d2c1b4a7b4bc262742de351c052700c9085ed6bd69deba4325f843bb8d07d9e2d27831ca5a4b435930f34e32647c273a1c878d9933ff3bb00360156f327efa WHIRLPOOL 827be287fd4798b76aec4b9550545361d6f20c3c85d2b694b319decbdec1aaa0985c497e1692b4804079bc1df6e783121b31b06df2098bcfce16d3f54715351b DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca @@ -23,25 +25,15 @@ DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a95 DIST libreoffice-help-4.0.0.3.tar.xz 1856212 SHA256 33b1ed4594044e3470bdba605d4faacf7f1a8326ee2d95c13aa3a0aada8a472b SHA512 1182207cc50f0cea37eb3e4cdb820f026fc542a45906cf5718841e91424ae8339c44d21d8f87042dfca0f4c764adccda61d7fa98287e778f0ebe4e4211b469ba WHIRLPOOL 6eb3ef108db12e2b2ce42c79da673556328c210fe19ab416613eafd329ff0d55725ce7e666488a58b028c2490e89fd7be41c915b80e75876e6251f04fca8ad8f EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f378b79eb7fa297ead8f4741a39ce162 SHA512 2e540b456c2eaa2624cded3fe929678c5641797f0c8fbf044b760ce44c53b8008b9b70b0aa41350510fa671cf7f595acf355d8a804fdba2c7b0b3015db886858 WHIRLPOOL 5ffd405228caa4f36c7897db21ff10964b545b2180bd65854d2a9ce7e09f9b70228a294a2645c6bcb94f8635e08b9215a6a9943a54d745a927d5ce546b09fd1c EBUILD libreoffice-3.6.9999.ebuild 17504 SHA256 63590679442804681a97aeb2a575da274b6da92761f61df81eda0a38352a5411 SHA512 90b2c48c1e9f9bf2b543eb09d8a5d9fda7f26291adfc7f3a3a6da8502259542a0bb87503f093e8383ec2c3f4cc15be67a0d87a5045518833eab2842f93193195 WHIRLPOOL d7f48a6495f6901e5e7989d63dd23b242488b040cc128374c96816ff647fb3f263ebdffe8a8d32eb5e9913c8d97f83ce9a39ed83926d106bf6f83a3c416880e6 -EBUILD libreoffice-4.0.0.3.ebuild 17428 SHA256 3c286611c90f37b31ac60f27c4c28a29cb115193fefe28e5b47f9eca6543e3d0 SHA512 54aa8d5ffde512dace0efe53fe404976410dc446989c537c696ea8d0026896387c3f5ef92e074d2a967c8c0942518034feb3b782faa966eb48b8e3ae5bff9dce WHIRLPOOL 710a8ea0985de3662c3d2c9e03325fdeb4fe3ae25c869b0489548c567516806dfac23bc89819db2834f848e2373da48d5a2e6dfd29b823b6fd9899d2209502e6 +EBUILD libreoffice-4.0.0.3.ebuild 17487 SHA256 2698936104aab1b46a99ce2cb9aad1b82897ed8db060e3abe1733cc336c18014 SHA512 86e7a8b45e2a2fa0eac54fba59c6a92aa6e2455f1425d0e100a55fdc7e94f06c695199b720be21ba677c808a76e528e766d6212ef47e1f4ae8e228a458e94965 WHIRLPOOL 779b4c530d659911cabd5c4cc64f3932eaf992bb4407ddf8d04436c75a53f3740d2cb8308911b849fa21e0f86f891b5d1b4a431c81b6ce68335e1bfb23981ccc EBUILD libreoffice-4.0.9999.ebuild 17435 SHA256 cb6921bfa2d8b744cfc8a0115510ef44daa0e0a2b25bc10073d19da48eb8b5e8 SHA512 2ec9e50c9d04b5664dbf501f7b526e963102693d7f90c57518ef07ada11aacf93ede0df9b1598012604fd295055cc9c4b8d69ea12f4d7d2a1be84a275d20e72d WHIRLPOOL 6fd8994b66346ce330bfa5ee4d02966a9505c494006cec7cb537d44ba12782af2507aaef5f2967a09e807b47ba698f173a93851c66fa96a7ac1b5d03b206ff12 EBUILD libreoffice-9999-r2.ebuild 17248 SHA256 91e6f6150d9807259614f4b42608b42b34856dde88132eca5b5f039a0256132c SHA512 a14c639c5c9870bd0e690800ccbcb45f2ae0f49639860e678bdb6016da8527bbed94a3eb3345d9529f8b13ae7147dcef9603bd0b9be89e6a455c7c3de2191996 WHIRLPOOL 2e3851f7c893a8c4daa4f2635bf575bcdeb671a1ed1a1305307f6f39d32e0228fd3b472a8053dc9c70b4b6e32d5748c326af004c588e1f38c730a05219ef1a5e -MISC ChangeLog 79976 SHA256 1b7fe728685d5f565d24f215cab3f1c14fbb2acb49aa2c266dd3900d52af5949 SHA512 93d6a5c9928c44a45e6ee8c5caa02619cf4d401cff91f2eb4078d0a097f3d6feac7f0411f56d82fdb1058fffe89c2b85f291c154a2c1696aa29b50d76132fa10 WHIRLPOOL 4630f3944dc23001b1304f2eefd417b2fb7e660e980108dd2bc15bd0536a4918add720c654a9f27b5daf0771fd90995b6c62c7544d9128b48e9ec8e7369e9a51 +MISC ChangeLog 80538 SHA256 714a0077e7f84bb19e8d74d0992d558705aa003a4db07aa22279c4f0ddbe763e SHA512 5f1f11e42670215280f1e4da3ab2ef9efbf302b1ce067c87e2e4cf21bfd76cc22315a4e3672caa307f872846ac73f7323fbe4a8614a67df63b85da348530361d WHIRLPOOL a2eb9dc3ad5e2688479a50efc185a784068b9aa88b56a55f4df1bf7d755ee7d18807b75645a9bce64b849a4f474386b8dd14098df67c5916922831a1913dfd5b MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJRE79HAAoJEOSiRoyO7jvolrkQALCwPkC9cZ/vEGXJJ7NIeqEZ -YTOV00Yjyb8GfVimaFqhWJGeslZOi57TgaJ7nB0/ZINiJaCg5/P8gt3ykFBVFnzv -ApkQwahz3et2k2HMxDsq1U2iLtpY7EGZF9YE9tbfvfVAkyZe6l6QZkUomZ5yxfjP -OJNmmuW59qrFBCcYbhafDHvhC9tykqiEDtyIwTjTBk5TlJjEcKLqLLGH1mtAIdGp -GAHDp0Qz+kboN/PNv0FZqVvWZI0kuLoVqj0BHNAqivMnEF6DP8kVdWwMVKQR/CtH -Y4RpEfn0ADbZkfa4enDZmtgyXi5s2Zqea8/c7zf9hCYigeZEH1FSGm2e0hL46gBk -MoA+fSjWhOg925orojHx8z0AgPXmzXRQLsfZ3ElY9l8KcFs+OroPl6In6zmdLWxr -6wONrWz7n6pEW8n/dJpuDRbZnqotwHQf5alSdZcuFPwpWJOfIeI5Biel6zjpaz4T -BuJLrEaldV/jypxEvDLfx50W1MORUX2/A8HSGLy4Rj4SJdCOOWT1hZgwNwBgxXEr -Vla8UTaa0G6Yvj+E0v8ace6gCbGAQsD5sdu5DbCfMRx8XqM/yVXOUUd19kByCRQ8 -CV2ClQqvnBqjl/UaxjkoZVCNwbSRA5YlZLuUCXZVxSf03O3t+Qddx5FpkcB8Q8hG -QD31iFGFH6vwZ2p2Ooif -=9U// +iF4EAREIAAYFAlEfhx0ACgkQoBEVQmGOlx+E5AD/W2ouTslGxX29MBFSL8zBRy4Z +G1vKVAYDJAapokE6eq8BAMGg8f+n80OrrT8pVd9p2qugtERuCCsKYfpRIWKodEWQ +=csrn -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/files/libreoffice-3.6.4.3-boost-1.53.0.patch b/app-office/libreoffice/files/libreoffice-3.6.4.3-boost-1.53.0.patch new file mode 100644 index 000000000000..ca8c7cf13be7 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.6.4.3-boost-1.53.0.patch @@ -0,0 +1,168 @@ +--- libreoffice-core-3.6.4.3-orig/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-02-09 00:09:13.608271375 +1100 +@@ -78,7 +78,7 @@ + + operator bool () const + { +- return m_aItem; ++ return static_cast< bool >(m_aItem); + } + + virtual ~scoped_disposing_ptr() +--- libreoffice-core-3.6.4.3-orig/slideshow/source/engine/animatedsprite.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/engine/animatedsprite.cxx 2013-02-09 00:09:13.610271414 +1100 +@@ -160,7 +160,7 @@ + } + } + +- return mpSprite; ++ return static_cast< bool >(mpSprite); + } + + void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) +--- libreoffice-core-3.6.4.3-orig/slideshow/source/inc/shapeattributelayer.hxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/inc/shapeattributelayer.hxx 2013-02-09 00:09:13.613271472 +1100 +@@ -476,7 +476,7 @@ + // ShapeAttributeLayer(const ShapeAttributeLayer&); + // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); + +- bool haveChild() const { return mpChild; } ++ bool haveChild() const { return static_cast< bool >(mpChild); } + void updateStateIds(); + + template< typename T > T calcValue( const T& rCurrValue, +--- libreoffice-core-3.6.4.3-orig/slideshow/source/inc/shapeattributelayerholder.hxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/inc/shapeattributelayerholder.hxx 2013-02-09 00:09:13.615271511 +1100 +@@ -92,7 +92,7 @@ + if( mpShape ) + mpAttributeLayer = mpShape->createAttributeLayer(); + +- return mpAttributeLayer; ++ return static_cast< bool >(mpAttributeLayer); + } + + ShapeAttributeLayerSharedPtr get() const +--- libreoffice-core-3.6.4.3-orig/slideshow/source/engine/shapesubset.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/engine/shapesubset.cxx 2013-02-09 00:09:13.617271550 +1100 +@@ -113,7 +113,7 @@ + maTreeNode ); + } + +- return mpSubsetShape; ++ return static_cast< bool >(mpSubsetShape); + } + + void ShapeSubset::disableSubsetShape() +--- libreoffice-core-3.6.4.3-orig/slideshow/source/engine/shapes/viewshape.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/engine/shapes/viewshape.cxx 2013-02-09 00:09:13.621271628 +1100 +@@ -187,7 +187,7 @@ + } + } + +- return io_rCacheEntry.mpRenderer; ++ return static_cast< bool >(io_rCacheEntry.mpRenderer); + } + + bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, +--- libreoffice-core-3.6.4.3-orig/slideshow/source/engine/slide/slideanimations.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/slideshow/source/engine/slide/slideanimations.cxx 2013-02-09 00:09:13.623271666 +1100 +@@ -83,7 +83,7 @@ + + SHOW_NODE_TREE( mpRootNode ); + +- return mpRootNode; ++ return static_cast< bool >(mpRootNode); + } + + bool SlideAnimations::isAnimated() const +--- libreoffice-core-3.6.4.3-orig/sc/source/core/data/colorscale.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sc/source/core/data/colorscale.cxx 2013-02-09 00:09:13.627271744 +1100 +@@ -219,7 +219,7 @@ + + bool ScColorScaleEntry::HasFormula() const + { +- return mpCell; ++ return static_cast< bool >(mpCell); + } + + void ScColorScaleEntry::SetMin(bool bMin) +--- libreoffice-core-3.6.4.3-orig/sw/source/core/inc/bookmrk.hxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sw/source/core/inc/bookmrk.hxx 2013-02-09 00:09:13.629271783 +1100 +@@ -84,7 +84,7 @@ + + virtual bool IsCoveringPosition(const SwPosition& rPos) const; + virtual bool IsExpanded() const +- { return m_pPos2; } ++ { return static_cast< bool >(m_pPos2); } + + virtual void SetName(const ::rtl::OUString& rName) + { m_aName = rName; } +--- libreoffice-core-3.6.4.3-orig/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sd/source/ui/slidesorter/view/SlsButtonBar.cxx 2013-02-09 00:09:13.632271841 +1100 +@@ -401,7 +401,7 @@ + + bool ButtonBar::IsMouseOverButton (void) const + { +- return mpButtonUnderMouse; ++ return static_cast< bool >(mpButtonUnderMouse); + } + + +--- libreoffice-core-3.6.4.3-orig/writerfilter/source/dmapper/StyleSheetTable.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/writerfilter/source/dmapper/StyleSheetTable.cxx 2013-02-09 00:10:20.949580346 +1100 +@@ -169,7 +169,7 @@ + pStack->push_back(pEntry); + + TableStyleSheetEntry* pParent = static_cast<TableStyleSheetEntry *>( pEntry.get( ) ); +- pProps->insert( pParent->GetProperties( nMask ), pStack ); ++ pProps->insert( pParent->GetProperties( nMask ), static_cast< bool >(pStack) ); + + pStack->pop_back(); + } +--- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xechart.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xechart.cxx 2013-02-09 00:09:13.645272093 +1100 +@@ -691,7 +691,7 @@ + + bool XclExpChEscherFormat::IsValid() const + { +- return maData.mxEscherSet; ++ return static_cast< bool >(maData.mxEscherSet); + } + + void XclExpChEscherFormat::Save( XclExpStream& rStrm ) +--- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xehelper.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xehelper.cxx 2013-02-09 00:09:13.648272151 +1100 +@@ -312,7 +312,7 @@ + if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 + { + // there was/is already a HLINK record +- mbMultipleUrls = mxLinkRec; ++ mbMultipleUrls = static_cast< bool >(mxLinkRec); + + mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); + +--- libreoffice-core-3.6.4.3-orig/sc/source/filter/excel/xichart.cxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sc/source/filter/excel/xichart.cxx 2013-02-09 00:09:13.656272306 +1100 +@@ -2698,7 +2698,7 @@ + maType.Finalize( bStockChart ); + + // extended type info +- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); ++ maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false ); + + // reverse series order for some unstacked 2D chart types + if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) +--- libreoffice-core-3.6.4.3-orig/sc/source/filter/inc/xichart.hxx 2012-11-28 19:29:53.000000000 +1100 ++++ libreoffice-core-3.6.4.3/sc/source/filter/inc/xichart.hxx 2013-02-09 00:09:13.661272403 +1100 +@@ -1240,9 +1240,9 @@ + /** Returns true, if the axis contains caption labels. */ + inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } + /** Returns true, if the axis shows its major grid lines. */ +- inline bool HasMajorGrid() const { return mxMajorGrid; } ++ inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); } + /** Returns true, if the axis shows its minor grid lines. */ +- inline bool HasMinorGrid() const { return mxMinorGrid; } ++ inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } + + /** Creates an API axis object. */ + XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; diff --git a/app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch b/app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch new file mode 100644 index 000000000000..aa50d655f71d --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.0.0.3-boost-1.53.0.patch @@ -0,0 +1,146 @@ +--- libreoffice-4.0.0.3-orig/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/comphelper/inc/comphelper/scoped_disposing_ptr.hxx 2013-02-16 00:09:02.325443592 +1100 +@@ -78,7 +78,7 @@ + + operator bool () const + { +- return m_aItem; ++ return static_cast< bool >(m_aItem); + } + + virtual ~scoped_disposing_ptr() +--- libreoffice-4.0.0.3-orig/slideshow/source/engine/animatedsprite.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/engine/animatedsprite.cxx 2013-02-16 00:09:02.356444129 +1100 +@@ -151,7 +151,7 @@ + } + } + +- return mpSprite; ++ return static_cast< bool >(mpSprite); + } + + void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) +--- libreoffice-4.0.0.3-orig/slideshow/source/inc/shapeattributelayer.hxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/inc/shapeattributelayer.hxx 2013-02-16 00:09:02.372444407 +1100 +@@ -467,7 +467,7 @@ + // ShapeAttributeLayer(const ShapeAttributeLayer&); + // ShapeAttributeLayer& operator=( const ShapeAttributeLayer& ); + +- bool haveChild() const { return mpChild; } ++ bool haveChild() const { return static_cast< bool >(mpChild); } + void updateStateIds(); + + template< typename T > T calcValue( const T& rCurrValue, +--- libreoffice-4.0.0.3-orig/slideshow/source/inc/shapeattributelayerholder.hxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/inc/shapeattributelayerholder.hxx 2013-02-16 00:09:02.374444442 +1100 +@@ -83,7 +83,7 @@ + if( mpShape ) + mpAttributeLayer = mpShape->createAttributeLayer(); + +- return mpAttributeLayer; ++ return static_cast< bool >(mpAttributeLayer); + } + + ShapeAttributeLayerSharedPtr get() const +--- libreoffice-4.0.0.3-orig/slideshow/source/engine/shapesubset.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/engine/shapesubset.cxx 2013-02-16 00:09:02.366444303 +1100 +@@ -104,7 +104,7 @@ + maTreeNode ); + } + +- return mpSubsetShape; ++ return static_cast< bool >(mpSubsetShape); + } + + void ShapeSubset::disableSubsetShape() +--- libreoffice-4.0.0.3-orig/slideshow/source/engine/shapes/viewshape.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/engine/shapes/viewshape.cxx 2013-02-16 00:09:02.363444251 +1100 +@@ -178,7 +178,7 @@ + } + } + +- return io_rCacheEntry.mpRenderer; ++ return static_cast< bool >(io_rCacheEntry.mpRenderer); + } + + bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, +--- libreoffice-4.0.0.3-orig/slideshow/source/engine/slide/slideanimations.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/slideshow/source/engine/slide/slideanimations.cxx 2013-02-16 00:09:02.369444355 +1100 +@@ -74,7 +74,7 @@ + + SHOW_NODE_TREE( mpRootNode ); + +- return mpRootNode; ++ return static_cast< bool >(mpRootNode); + } + + bool SlideAnimations::isAnimated() const +--- libreoffice-4.0.0.3-orig/sw/source/core/inc/bookmrk.hxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/sw/source/core/inc/bookmrk.hxx 2013-02-16 00:09:02.377444493 +1100 +@@ -75,7 +75,7 @@ + + virtual bool IsCoveringPosition(const SwPosition& rPos) const; + virtual bool IsExpanded() const +- { return m_pPos2; } ++ { return static_cast< bool >(m_pPos2); } + + virtual void SetName(const ::rtl::OUString& rName) + { m_aName = rName; } +--- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xechart.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/sc/source/filter/excel/xechart.cxx 2013-02-16 00:09:02.336443783 +1100 +@@ -682,7 +682,7 @@ + + bool XclExpChEscherFormat::IsValid() const + { +- return maData.mxEscherSet; ++ return static_cast< bool >(maData.mxEscherSet); + } + + void XclExpChEscherFormat::Save( XclExpStream& rStrm ) +--- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xehelper.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/sc/source/filter/excel/xehelper.cxx 2013-02-16 00:09:02.341443869 +1100 +@@ -303,7 +303,7 @@ + if( GetBiff() == EXC_BIFF8 ) // no HLINK records in BIFF2-BIFF7 + { + // there was/is already a HLINK record +- mbMultipleUrls = mxLinkRec; ++ mbMultipleUrls = static_cast< bool >(mxLinkRec); + + mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos ) ); + +--- libreoffice-4.0.0.3-orig/sc/source/filter/excel/xichart.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/sc/source/filter/excel/xichart.cxx 2013-02-16 00:09:02.348443991 +1100 +@@ -2688,7 +2688,7 @@ + maType.Finalize( bStockChart ); + + // extended type info +- maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false ); ++ maTypeInfo.Set( maType.GetTypeInfo(), static_cast< bool >(mxChart3d), false ); + + // reverse series order for some unstacked 2D chart types + if( maTypeInfo.mbReverseSeries && !Is3dChart() && !maType.IsStacked() && !maType.IsPercent() ) +--- libreoffice-4.0.0.3-orig/sc/source/filter/inc/xichart.hxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/sc/source/filter/inc/xichart.hxx 2013-02-16 00:09:02.353444077 +1100 +@@ -1230,9 +1230,9 @@ + /** Returns true, if the axis contains caption labels. */ + inline bool HasLabels() const { return !mxTick || mxTick->HasLabels(); } + /** Returns true, if the axis shows its major grid lines. */ +- inline bool HasMajorGrid() const { return mxMajorGrid; } ++ inline bool HasMajorGrid() const { return static_cast< bool >(mxMajorGrid); } + /** Returns true, if the axis shows its minor grid lines. */ +- inline bool HasMinorGrid() const { return mxMinorGrid; } ++ inline bool HasMinorGrid() const { return static_cast< bool >(mxMinorGrid); } + + /** Creates an API axis object. */ + XAxisRef CreateAxis( const XclImpChTypeGroup& rTypeGroup, const XclImpChAxis* pCrossingAxis ) const; +--- libreoffice-4.0.0.3-orig/vcl/source/gdi/svgdata.cxx 2013-01-31 21:54:53.000000000 +1100 ++++ libreoffice-4.0.0.3/vcl/source/gdi/svgdata.cxx 2013-02-16 00:07:00.382345866 +1100 +@@ -166,7 +166,7 @@ + + ////////////////////////////////////////////////////////////////////////////// + SvgData::SvgData(const OUString& rPath): +- maSvgDataArray(NULL), ++ maSvgDataArray(static_cast< unsigned char * >(NULL)), + mnSvgDataArrayLength(0), + maPath(rPath), + maRange(), diff --git a/app-office/libreoffice/libreoffice-4.0.0.3.ebuild b/app-office/libreoffice/libreoffice-4.0.0.3.ebuild index c3e2d081b9cd..7be8d578df12 100644 --- a/app-office/libreoffice/libreoffice-4.0.0.3.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.3.ebuild,v 1.1 2013/02/07 14:50:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.0.3.ebuild,v 1.2 2013/02/16 13:18:10 gienah Exp $ EAPI=5 @@ -229,6 +229,8 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-3.7-system-pyuno.patch" "${FILESDIR}/${PN}-3.7-separate-checks.patch" + # bug 454274 + "${FILESDIR}/${PN}-4.0.0.3-boost-1.53.0.patch" ) REQUIRED_USE=" |