Fix build with Boost 1.56, bug 522178

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 3f705343df644a2e05abf71c8924487afd72e373..973ae89b7bbae8f5be63414f4d16cab60d35f375 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.594 2014/12/21 21:57:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.595 2014/12/26 22:59:02 dilfridge Exp $
+
+  26 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.3.4.1.ebuild, libreoffice-4.3.9999.ebuild,
+  +files/libreoffice-4.3.4.1-boost-1.56.0.patch:
+  Fix build with Boost 1.56, bug 522178
 
   21 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-4.2.6.3.ebuild, libreoffice-4.2.9999.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index eb54aa649c83a04b46eaeca9118f47ba5cc1431c..7b0f437d040c8bfb2390fdb20e88f2ee1231a501 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -13,6 +13,7 @@ AUX libreoffice-4.3.1.2-handle-collada-libs-seperately.patch 7384 SHA256 6c37667
 AUX libreoffice-4.3.1.2-implement--with-system-coinmp.patch 2854 SHA256 5de29eb41dcd774379483a750f9eb55f44faebed929a7ed2e46f7493efecf8eb SHA512 900e4ecb148133f9cd8900b60d2b837d7ede09e1a0ce55fc3540783110fac4a8ff4f9c8ecab0deda9715478c3e56642644fc0f604a3295f531232a624cd3428c WHIRLPOOL ce4e85e48b669be73df12f237f326da3105bb54d75a127f73b58ded7583cf85cc60b4fbc019dbf536b6e1de4eb7691b71114684a8e19f11cce15f12066c927f1
 AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a6299555fe1ccc0f31263cd3b15b921bf844dacd1f09905ca60734f SHA512 af251ff2e10c3c6e096de4c866e05e22b8763a01cac1f66bcad597615f387daeba18348e45f49a8aacb2b0855e9d3240e373be59d33c821dbef6c79b2d047f40 WHIRLPOOL 4ac552215e634f5cc1bf2f3a253cff9f48032b3ad485942c49a2923c265d6fd0ae45050bc876c422ef95b74e699af182483b6b276319f26f0b35728eb4e05d77
 AUX libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch 15709 SHA256 22551358fa6e161c2ecdd267bae3de1245fb671eda8b592efa48e7939e9353f2 SHA512 c29b18c5d9b14f2d9a0c08618e274e1fa3bae540b68569fcd0ff216aef4942e7aa5fe89184cadbcb3d6ea04316a5ae9876f3fae085727b13247bb5e0499b10a8 WHIRLPOOL 2d3ee1e39a965cf28e6b633dd5f62dd7aca3dbf4a583aa48cade71cfb8814c93fdfa54099db7774d5db62e2b21d61017dd279fb2cdf1b0fc7633ad3323d2fceb
+AUX libreoffice-4.3.4.1-boost-1.56.0.patch 10696 SHA256 47700e383c40679809cf3577798fd9211458b0814b8b360f49847491c4bc9ca0 SHA512 d8d84a9106aabfb06f64b2101de9d9767828e6349f948732f017d7972d02bd6a64cad1b5dee44fa2fbcaa6b2dc9df9caf77070168091e0798911d07a21550b56 WHIRLPOOL edf37dbd8a6f5858fd3583551cbcdca590122436406a0f6016402c1b7423ed99c26d64a7116ff2575f112e3fdbf698f04357e33daba76016b3c4ef778d4cddef
 AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6
 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
@@ -30,27 +31,25 @@ DIST libreoffice-help-4.2.6.3.tar.xz 1855444 SHA256 892a78b667f5b1d771920c71bb01
 DIST libreoffice-help-4.3.4.1.tar.xz 1854700 SHA256 a9ab46e2f775a8914fd4377e4859da87344c05ad1ec928646cc40021717c71a3 SHA512 6f9572f785975c014ba6ce589a7f5274c7fe157e9950a7f5ab34d7df0b085737ca2dfa13715e8df93af758c256d7f5bc8b4f0a27dc6abd4421b79e7cca364416 WHIRLPOOL 688180f8d98e1355ac144b2c2565a58c9cbd1f599b043aeed4c217f38638260cc5a1f6856bbf2a2d7716968ace480df0a1db76e7d3794226fab5ee7830e6c8dd
 EBUILD libreoffice-4.2.6.3.ebuild 17881 SHA256 37dc7e0f6a05838c50e9ac5bcd491e14a18b502078d87f584de1911333b00537 SHA512 eaf8a4a36b266e4c91e1343e4dbab2eb149320259543389f41eedd1ffe3351b47a90a46945ec795909ff4a1548bf7c8accd64daf59b4089cf61f96c8eac354b2 WHIRLPOOL a25058ab52d41b6b82b3549d37cf9d4fef9dd94600635052231d4012532358f528ecd3e84c5634f3b37544f66e78f1c20f3dfe861daf9342ceecc3203fbef64a
 EBUILD libreoffice-4.2.9999.ebuild 17884 SHA256 409d0760b8383b1a9c31d5b100cb7b0ff7518003f7086b5d68985c554cb673a5 SHA512 b883e8854d42eddc3cb351f4301700c6062d27d332447a1ba5948ac1b574b357f3ec1247492795631b653011e21b96462056951191262165569c7ec4ad9cbc0c WHIRLPOOL 161ff8a28258eab39742623d389bc7ae2605eab99b5d8e64dd84dbac638ea7b6e728383d8ed204312a44201d835fb8b2c3652fac46b0b95b0be7b7d1030f8d0b
-EBUILD libreoffice-4.3.4.1.ebuild 18235 SHA256 2b95cbb3b474cf09e2c9ce4876d282ef3e195639bbcc636cb88ab8068731120d SHA512 3d65423f3dbb71b2dafcad7c51369074267ba1dab7a7739fdbc48f319515e133af37b11372284ba7ad1ac268d60c9258bcef471ae1da41b62a567f866cc15588 WHIRLPOOL a9004f899b537aa53e8453c13ca68b4a175ff20a5b6efb22741845f7d047af1d5019618601d626c9722773da9d56efeb44a0cbb42d5a2219a67b18a32c5d07fc
-EBUILD libreoffice-4.3.9999.ebuild 18241 SHA256 47063fc6e38946d3ba740b8f1b50b7aabf94e2392cff589fd42360e3c84da3e4 SHA512 d57dd074ab531dac9fd53763f173bfda185f03422d1641007a76405bd12c9a0599e94d30a46ea800ee9dcb554a3823cab965d92e6687d4d981bab4b8f4314389 WHIRLPOOL 3cb047dd964b38640fdbf76f9567f8299ac0c2a9d298de8a70bbeb7b6329b15dd45e0bbff4acb65c94be21d41014aa5764f698404d0e4f5489eacd19e97b897a
+EBUILD libreoffice-4.3.4.1.ebuild 18318 SHA256 00ba86c6cff001735edf8392e89d665c18ed79717eca266c22f6639af531548d SHA512 69482bc7df76a14ffe3954a9da6ef61f54f066b884fea6e48ebc3b138a41c8408746a6475c55d1edb5200c60901a726c29d10fcdfb8fdf62f9a327e6eae61c2f WHIRLPOOL 0a04ac5d02d7777846056be502555755bf42ecfe1ca835d279226ebe9992594905042a8a9e834dc2abbecc3e85971ac9ea2f24fef6f96e133f16fbec1e8a0e7c
+EBUILD libreoffice-4.3.9999.ebuild 18324 SHA256 851ac903f91d50243dca58b0f45907025fd7290851af5792025f9b18759b65c0 SHA512 daefcdcc838ff022c47fb5d28e57ab93af6b4a13d2869e05054a8c09427426d00a31b95de30828832e8cc66d4294ebf1f47145283bde2fa08095e28375b494a7 WHIRLPOOL 41a69f01d6217360075692e2e848b37cc5fdcb7d800032536a242993a74ebd563ab101fcf69d5bd5a06d782a6171ccd81cf77aa4aa76ffbe89b700191cda8914
 EBUILD libreoffice-9999-r2.ebuild 18311 SHA256 9f30f38345d1f3fa535d6a18dbf7416dd0efeca22b5eb1fa00fb0bbc45854b93 SHA512 77fa0a778c759d72cf0aa6c569a1a1430427feefe6c668cceeee9031447268f05e50e2d6aa451c76141eac15651c1aab7005447f413c8a39c296c94c79fa0870 WHIRLPOOL 5abff4cc4523baab0a0b2d86fac2fcad55c8ceccec74ce5e05d353063aab062d2e4b3fffd1694dbda285a597cf77c6b6dbad5a1a289c6eb6e85a26482fd4e10c
-MISC ChangeLog 107961 SHA256 41db60367dc4e0c1cb7b12109c9fa55427b0bfd69abc90e6cd5b7718538a5cac SHA512 f34f262cc67806d176c87770140523990033bde72cdb89e60d0db4b779cdf5ea10be28cebd0d5a931b0451bba35538b564654faae18da06d8b8ac4abad7c2f7a WHIRLPOOL b1a4512e315fcd89e54be55fe0557f49e0405d1d5f7c59a550487d9795d0ceffd0d862064850b7372becc8f78bb67c9396186a8cef53c46eb314ea32915ff98a
+MISC ChangeLog 108167 SHA256 70d5c63fb302ad94d0282005be9044eacf346729597c92909425e434c9629487 SHA512 62760ff3f8182c1496c5fd0dbc08a67ab2ea407e0069c9e164884ef34b376ecd8594aa779de8b1390f736aad30e1230b129b8722cb625372bd4db95c0a3eb72c WHIRLPOOL 844556d833d6a920f9eaca20c1be444dffd35aad0509b6040e62156a6cbb8df58f4f236a25816d4044d0b699c8ed09edcb06101fc4faa1e972eb11f1c7e0f4ad
 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUl0I0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOccykQAMsv0arS+aMU08g9AGcs7D5v
-8d7w4N3/KusdVtHjqHX2RAesa6bGmsKA+A1Xa9Yc3y5626BM2TAeRcTEIKWRq4QE
-t0vl48fpiftOxAebOov6oTcYQrccgyeiJt0PcJLhjC46V2JSR3nHDI+rByv81+3O
-8TBUhFObsJ9jgetauFGGuNPnCoeP6rx16TQ65thVcT1VM7XeqciX8AQPS8P7kLdY
-0IaNBT+015odjjfTT7BW4gF4zWhxjAOOC46Fdzx+7C5v+3YTV/abGdfFQiUMlHiF
-nMTVT+7X2RLRWiyMlYQrJml+F1vxHXvXB0ojcm4OzQGX1WppU4yX1b19uMg9Kx6t
-Q5tuAcCx+XU4HU6U5gfLEApehJizUHjzKePyKDNMHgUGq5BXfg9h76zFRFrfPLm2
-THxBatUbblRlXETAQ0wDMzHCBSWnfnl7olEay9G+vok0X17eGaTNKQpiZExRmLiI
-mrFZwxCCirN1gCfBediPiidviYdXuWB/Q26dK4nSr0gFR05rxzZrunUqDX02qURg
-hFpxX11ECna9YUn/DXOAquNmyTWc4MhIY5AdC8vLmIjFXFcKwla4CI4p8dWyjywx
-5qFKmI+dgxQ1H4iEEd24XGYC8fK+0Sl8bWDQ0mHucb62jPyp3dPTdAdcM23LHrUe
-Cp4ZOiqiraF7PrBgtav2
-=B0mn
+iQIcBAEBCAAGBQJUneiRAAoJEJS/30SErRQvI9UP/16KgnIer3GIqSLjWRjkcENx
+8BZjrf2hnhgd7oR5DD1bN9yUk9u8dfrSZZdgCNOuU9pTIRW7tSatrfq1dkk+5br7
+61ebPPIbX+293cm8XyUUVuID15lc2WuXIgA57MhoYYIzgcGH7bEUOUWHQpSV//Jm
+EG3IQYa2EXdWvLqWJfO/1d1TUTe0oYzcNSfGeOElEG7JKFjJOuId+K1mryG2+y/D
+9PT9O27wAldi0hC31Mcezs7UAm23BnjHaG7R5uQVHflrHJIWgcqdZgsNLdimAxem
+LwLV96xI7718jqXIiT2sn+KB909dfOYDeTCMvOdQyejht1Sz5DXQGs3ifUGnLlOy
+pI52bMvVJkCV5ZbSu2IN+9QmTx/dQeO0WnykGNm7UMXWsfVWrLfmeF3P7TO1NNAd
+CFLKeU4AUvJk29h65bKW9hOvK1db/e4WUjqTNN8px4XgeRVpa+6sEi9HYleJrFHm
+AHo8e5G+VoIQtsWVlh9ezR8W52xEHqslfPr2tYEyeWJ4XVQ9Z+3H/QN8pbtjTYeg
+tdG785qTm+3HZENATUkWUrZcuy0hA0Kp6QGx/V81EmIG81PzLZj8V+SmHk+ilnKw
+JK97kJWTGdS0RIC4dJisv8x7vG/drdnLjQRVIphLo3QKENNYn3e70w1yog9FSWVM
+YGp4YZMkTGOB48UUfjom
+=1aZS
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch b/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch
new file mode 100644 (file)
index 0000000..1926a34
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.4.1-boost-1.56.0.patch
@@ -0,0 +1,187 @@
+Backport of 45dfbdca6a9afba1a6aef21623ec025ded635a4d from LO master 
+by Mark Wright, gienah@gentoo.org
+
+
+--- libreoffice-4.3.1.2-orig/canvas/source/cairo/cairo_spritecanvashelper.cxx  2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/canvas/source/cairo/cairo_spritecanvashelper.cxx       2014-09-20 15:09:49.269841950 +1000
+@@ -402,11 +402,12 @@
+         ::basegfx::computeSetDifference( aUncoveredAreas,
+                                          rUpdateArea.maTotalBounds,
+                                          ::basegfx::B2DRange( rDestRect ) );
++        SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
+         ::std::for_each( aUncoveredAreas.begin(),
+                          aUncoveredAreas.end(),
+                          ::boost::bind( &repaintBackground,
+                                         boost::cref(pCompositingCairo),
+-                                        boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
++                                        boost::cref(surface),
+                                         _1 ) );
+ 
+         cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
+--- libreoffice-4.3.1.2-orig/canvas/source/vcl/spritecanvashelper.cxx  2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/canvas/source/vcl/spritecanvashelper.cxx       2014-09-20 15:09:49.270404983 +1000
+@@ -573,12 +573,12 @@
+ 
+         // repaint all affected sprites on top of background into
+         // VDev.
++        ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
+         ::std::for_each( rSortedUpdateSprites.begin(),
+                          rSortedUpdateSprites.end(),
+                          ::boost::bind( &spriteRedrawStub2,
+                                         ::boost::ref( maVDev.get() ),
+-                                        ::boost::cref(
+-                                            ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
++                                        ::boost::cref( outPos ),
+                                         _1 ) );
+ 
+         // flush to screen
+--- libreoffice-4.3.1.2-orig/dbaccess/source/ui/tabledesign/TableController.cxx        2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/dbaccess/source/ui/tabledesign/TableController.cxx     2014-09-20 15:12:36.829360633 +1000
+@@ -1392,7 +1392,8 @@
+                     setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
+                     if(!isEditable())
+                     {
+-                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
++                        sal_Bool t( sal_True );
++                        ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
+                     }
+                     m_bNew = false;
+                     // be notified when the table is in disposing
+--- libreoffice-4.3.1.2-orig/oox/source/drawingml/table/tablecell.cxx  2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/oox/source/drawingml/table/tablecell.cxx       2014-09-20 15:09:49.272005355 +1000
+@@ -117,9 +117,9 @@
+     if (rTableStylePart.getTextColor().isUsed())
+         aTextCharProps.maCharColor = rTableStylePart.getTextColor();
+     if( rTableStylePart.getTextBoldStyle().is_initialized() )
+-        aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
++        aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
+     if( rTableStylePart.getTextItalicStyle().is_initialized() )
+-        aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
++        aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
+ }
+ 
+ void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
+--- libreoffice-4.3.1.2-orig/reportdesign/source/core/api/ReportDefinition.cxx 2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/reportdesign/source/core/api/ReportDefinition.cxx      2014-09-20 15:09:49.273376564 +1000
+@@ -1612,8 +1612,9 @@
+         m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
+     }
+     // notify our container listeners
++    OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
+     m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
+-            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
++            ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
+ }
+ 
+ uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage(  ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/activities/activitybase.hxx       2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/activities/activitybase.hxx    2014-09-20 15:09:49.273965661 +1000
+@@ -111,7 +111,7 @@
+     ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
+         { return mpAttributeLayer; }
+ 
+-    bool isRepeatCountValid() const { return maRepeats; }
++    bool isRepeatCountValid() const { return bool(maRepeats); }
+     double getRepeatCount() const { return *maRepeats; }
+     bool isAutoReverse() const { return mbAutoReverse; }
+ 
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/rehearsetimingsactivity.cxx       2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/rehearsetimingsactivity.cxx    2014-09-20 15:09:49.274529920 +1000
+@@ -400,11 +400,12 @@
+     {
+         // new sprite pos, transformation might have changed:
+         maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
++        ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
+ 
+         // reposition sprites
+         for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
+                                       _1,
+-                                      boost::cref(maSpriteRectangle.getMinimum())) );
++                                      boost::cref( rectMin )) );
+ 
+         // sprites changed, need screen update
+         mrScreenUpdater.notifyUpdate();
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/appletshape.cxx    2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/appletshape.cxx 2014-09-20 15:09:49.275052955 +1000
+@@ -148,12 +148,13 @@
+         void AppletShape::implViewsChanged()
+         {
+             // resize all ViewShapes
++            ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
+             ::std::for_each( maViewAppletShapes.begin(),
+                              maViewAppletShapes.end(),
+                              ::boost::bind(
+                                  &ViewAppletShape::resize,
+                                  _1,
+-                                 ::boost::cref( AppletShape::getBounds())) );
++                                 ::boost::cref( bounds )) );
+         }
+ 
+ 
+@@ -252,11 +253,12 @@
+ 
+         bool AppletShape::implStartIntrinsicAnimation()
+         {
++            ::basegfx::B2DRectangle bounds( getBounds() );
+             ::std::for_each( maViewAppletShapes.begin(),
+                              maViewAppletShapes.end(),
+                              ::boost::bind( &ViewAppletShape::startApplet,
+                                             _1,
+-                                            ::boost::cref( getBounds() )));
++                                            ::boost::cref( bounds )));
+             mbIsPlaying = true;
+ 
+             return true;
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/drawshape.cxx      2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/drawshape.cxx   2014-09-20 15:09:49.275701062 +1000
+@@ -168,6 +168,7 @@
+             }
+ 
+             // redraw all view shapes, by calling their update() method
++            ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
+             if( ::std::count_if( maViewShapes.begin(),
+                                  maViewShapes.end(),
+                                  ::boost::bind<bool>(
+@@ -178,8 +179,7 @@
+                                                                              // the extra mem_fn. WTF.
+                                      _1,
+                                      ::boost::cref( mpCurrMtf ),
+-                                     ::boost::cref(
+-                                         getViewRenderArgs() ),
++                                     ::boost::cref( renderArgs ),
+                                      nUpdateFlags,
+                                      isVisible() ) )
+                 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/shapes/mediashape.cxx     2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/shapes/mediashape.cxx  2014-09-20 15:09:49.276133048 +1000
+@@ -125,12 +125,13 @@
+         void MediaShape::implViewsChanged()
+         {
+             // resize all ViewShapes
++            ::basegfx::B2DRectangle bounds( getBounds() );
+             ::std::for_each( maViewMediaShapes.begin(),
+                              maViewMediaShapes.end(),
+                              ::boost::bind(
+                                  &ViewMediaShape::resize,
+                                  _1,
+-                                 ::boost::cref( getBounds())) );
++                                 ::boost::cref( bounds )) );
+         }
+ 
+ 
+--- libreoffice-4.3.1.2-orig/slideshow/source/engine/unoviewcontainer.cxx      2014-08-26 14:07:49.000000000 +1000
++++ libreoffice-4.3.1.2/slideshow/source/engine/unoviewcontainer.cxx   2014-09-20 15:09:49.276489737 +1000
+@@ -45,11 +45,12 @@
+             const UnoViewVector::iterator aEnd( maViews.end() );
+ 
+             // already added?
++            uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
+             if( ::std::find_if( maViews.begin(),
+                                 aEnd,
+                                 ::boost::bind(
+                                     ::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
+-                                    ::boost::cref( rView->getUnoView() ),
++                                    ::boost::cref( xView ),
+                                     ::boost::bind(
+                                         &UnoView::getUnoView,
+                                         _1 ) ) ) != aEnd )

diff --git a/app-office/libreoffice/libreoffice-4.3.4.1.ebuild b/app-office/libreoffice/libreoffice-4.3.4.1.ebuild
index ea0a24bf4ed572a7637d16923237faff751de9c8..951b48b8d098646148aeac48f47f483b29eeabc8 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.3.4.1.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.4.1.ebuild,v 1.3 2014/11/18 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.4.1.ebuild,v 1.4 2014/12/26 22:59:02 dilfridge Exp $
 
 EAPI=5
 
@@ -246,6 +246,7 @@ PATCHES=(
 
        # from master branch
        "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+       "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch"                  # bug 522178
 )
 
 REQUIRED_USE="

diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
index c6319d34f8380e0d96c659f49c95f08cba0f1815..7b935d84ac8e9ad4fc18565719be69eb4a1081d5 100644 (file)
--- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.6 2014/11/18 10:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.7 2014/12/26 22:59:02 dilfridge Exp $
 
 EAPI=5
 
@@ -246,6 +246,7 @@ PATCHES=(
 
        # from master branch
        "${FILESDIR}/${PN}-4.3.1.2-implement--with-system-coinmp.patch"
+       "${FILESDIR}/${PN}-4.3.4.1-boost-1.56.0.patch"                  # bug 522178
 )
 
 REQUIRED_USE="