editors/libreoffice4: unbreak build with boost 1.62

workdir/LinkTarget/StaticLibrary/libpdfimport_s.a(pdfparse.o): In function `_GLOBAL__sub_I_pdfparse.cxx':
sdext/source/pdfimport/pdfparse/pdfparse.cxx:(.text+0x2f8): undefined reference to `boost::system::generic_category()'
sdext/source/pdfimport/pdfparse/pdfparse.cxx:(.text+0x303): undefined reference to `boost::system::generic_category()'
sdext/source/pdfimport/pdfparse/pdfparse.cxx:(.text+0x30e): undefined reference to `boost::system::system_category()'
c++: error: linker command failed with exit code 1 (use -v to see invocation)

In file included from canvas/source/cairo/cairo_spritecanvashelper.cxx:35:
In file included from canvas/source/cairo/cairo_canvascustomsprite.hxx:37:
include/canvas/base/canvascustomspritebase.hxx:257:24: warning: 'getPriority' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual double getPriority() const
                       ^
include/canvas/base/sprite.hxx:92:37: note: overridden virtual function is here
        virtual double              getPriority() const = 0;
                                    ^
canvas/source/cairo/cairo_spritecanvashelper.cxx:409:41: error: call to deleted function 'cref'
                                        boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
                                        ^~~~~~~~~~~
/usr/local/include/boost/core/ref.hpp:179:24: note: candidate function [with T = boost::shared_ptr<cairo::Surface>] has been explicitly deleted
template<class T> void cref(T const&&) BOOST_REF_DELETE;
                       ^
/usr/local/include/boost/core/ref.hpp:150:80: note: candidate function [with T = boost::shared_ptr<cairo::Surface>]
template<class T> BOOST_FORCEINLINE reference_wrapper<T const> BOOST_REF_CONST cref( T const & t )
                                                                               ^
canvas/source/cairo/cairo_spritecanvashelper.cxx:407:26: error: no matching function for call to 'bind'
                         ::boost::bind( &repaintBackground,
                         ^~~~~~~~~~~~~
/usr/local/include/boost/bind/bind.hpp:1899:5: note: candidate template ignored: couldn't infer template argument 'R'
    BOOST_BIND(F f, A1 a1, A2 a2, A3 a3)
    ^
/usr/local/include/boost/bind/bind.hpp:1868:20: note: expanded from macro 'BOOST_BIND'
 #define BOOST_BIND bind
                    ^
[...]

PR:		207697
Submitted by:	truckman
Obtained from:	upstream
Exp-run by:	antoine

2 files changed, 194 insertions, 0 deletions

diff --git a/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d b/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d
new file mode 100644
index 000000000000..fb05313a6578
--- /dev/null
+++ b/editors/libreoffice4/files/patch-45dfbdca6a9afba1a6aef21623ec025ded635a4d
@@ -0,0 +1,183 @@
+--- canvas/source/cairo/cairo_spritecanvashelper.cxx.orig	2015-04-20 19:36:29 UTC
++++ canvas/source/cairo/cairo_spritecanvashelper.cxx
+@@ -402,11 +402,12 @@ namespace cairocanvas
+         ::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() );
+--- canvas/source/vcl/spritecanvashelper.cxx.orig	2015-04-20 19:36:29 UTC
++++ canvas/source/vcl/spritecanvashelper.cxx
+@@ -573,12 +573,12 @@ namespace vclcanvas
+ 
+         // 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
+--- dbaccess/source/ui/tabledesign/TableController.cxx.orig	2015-04-20 19:36:29 UTC
++++ dbaccess/source/ui/tabledesign/TableController.cxx
+@@ -1392,7 +1392,8 @@ void OTableController::assignTable()
+                     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
+--- oox/source/drawingml/table/tablecell.cxx.orig	2015-04-20 19:36:29 UTC
++++ oox/source/drawingml/table/tablecell.cxx
+@@ -142,9 +142,9 @@ void applyTableStylePart( const ::oox::c
+     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 )
+--- reportdesign/source/core/api/ReportDefinition.cxx.orig	2015-04-20 19:36:29 UTC
++++ reportdesign/source/core/api/ReportDefinition.cxx
+@@ -1612,8 +1612,9 @@ void SAL_CALL OReportDefinition::switchT
+         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)
+--- slideshow/source/engine/activities/activitybase.hxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/activities/activitybase.hxx
+@@ -111,7 +111,7 @@ protected:
+     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; }
+ 
+--- slideshow/source/engine/rehearsetimingsactivity.cxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/rehearsetimingsactivity.cxx
+@@ -400,11 +400,12 @@ void RehearseTimingsActivity::viewsChang
+     {
+         // 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();
+--- slideshow/source/engine/shapes/appletshape.cxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/shapes/appletshape.cxx
+@@ -148,12 +148,13 @@ namespace slideshow
+         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 @@ namespace slideshow
+ 
+         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;
+--- slideshow/source/engine/shapes/drawshape.cxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/shapes/drawshape.cxx
+@@ -168,6 +168,7 @@ namespace slideshow
+             }
+ 
+             // 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 @@ namespace slideshow
+                                                                              // the extra mem_fn. WTF.
+                                      _1,
+                                      ::boost::cref( mpCurrMtf ),
+-                                     ::boost::cref(
+-                                         getViewRenderArgs() ),
++                                     ::boost::cref( renderArgs ),
+                                      nUpdateFlags,
+                                      isVisible() ) )
+                 != static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
+--- slideshow/source/engine/shapes/mediashape.cxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/shapes/mediashape.cxx
+@@ -125,12 +125,13 @@ namespace slideshow
+         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 )) );
+         }
+ 
+ 
+--- slideshow/source/engine/unoviewcontainer.cxx.orig	2015-04-20 19:36:29 UTC
++++ slideshow/source/engine/unoviewcontainer.cxx
+@@ -45,11 +45,12 @@ namespace slideshow
+             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/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk b/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk
new file mode 100644
index 000000000000..c834b8323fa3
--- /dev/null
+++ b/editors/libreoffice4/files/patch-solenv_gbuild_platform_com__GCC__defs.mk
@@ -0,0 +1,11 @@
+--- solenv/gbuild/platform/com_GCC_defs.mk.orig	2015-04-20 19:36:29 UTC
++++ solenv/gbuild/platform/com_GCC_defs.mk
+@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3
+ gb_AFLAGS := $(AFLAGS)
+ 
+ gb_COMPILERDEFS := \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_SYSTEM_NO_DEPRECATED \
+ 	-DCPPU_ENV=$(gb_CPPU_ENV) \
+ 
+ gb_CFLAGS_COMMON := \