Fix build with boost 1.56.0.

13 files changed, 221 insertions, 8 deletions

diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 213f1929327..53b3cbe39c1 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2014/08/22 11:24:39 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2014/08/26 20:58:43 joerg Exp $
 
 VERREL=		4.2.5
 VERRC=		2
@@ -165,10 +165,7 @@ CONFIGURE_ARGS+=	--with-lang="ALL"
 CONFIGURE_ARGS+=	--with-myspell-dicts
 CONFIGURE_ARGS+=	--with-parallelism=${MAKE_JOBS:Q}
 # needs fixes for boost-1.56.0
-#CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
-CONFIGURE_ARGS+=	--without-system-boost
-# also pulls in boost
-CONFIGURE_ARGS+=        --without-system-mdds
+CONFIGURE_ARGS+=	--with-boost-libdir=${BUILDLINK_PREFIX.boost-libs}/lib
 CONFIGURE_ARGS+=	--with-system-libs
 CONFIGURE_ARGS+=	--with-system-dicts
 # internal vigra should be used because only header files are used.
@@ -261,12 +258,12 @@ post-install:
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
-#.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/liblangtag/buildlink3.mk"
-#.include "../../devel/mdds/buildlink3.mk"
+.include "../../devel/mdds/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/misc/libreoffice4/distinfo b/misc/libreoffice4/distinfo
index 0f2eed93ec4..e90820766d6 100644
--- a/misc/libreoffice4/distinfo
+++ b/misc/libreoffice4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/08/16 12:05:45 wiz Exp $
+$NetBSD: distinfo,v 1.23 2014/08/26 20:58:43 joerg Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -179,9 +179,20 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = 5e02fb3bf5b4
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_uno2cpp.cxx) = b01d697451973a873247a370ebec2cd5c3a8029d
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = de4e7978cd364d3aff5d1495199f60759c53380e
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17
+SHA1 (patch-canvas_source_cairo_cairo__spritecanvashelper.cxx) = dd31184f13b01588bf53c9a06df22fd2948e72e9
+SHA1 (patch-canvas_source_vcl_spritecanvashelper.cxx) = d46efb0df78b310eed9672176c562450a01a59f8
 SHA1 (patch-configure.ac) = 181d1b37eebe892cb0999d55c0d0de0ce286a332
 SHA1 (patch-connectivity_source_parse_sqlbison.y) = 2dd006e2a039a4dddaca4357466bb45f3a1e0cd1
+SHA1 (patch-dbaccess_source_ui_tabledesign_TableController.cxx) = dd759160380f7ada9fa09e186ff2390aa194b377
 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
+SHA1 (patch-oox_source_drawingml_table_tablecell.cxx) = b235d90cbc19e3ba87fa52e675f82931c510a611
+SHA1 (patch-reportdesign_source_core_api_ReportDefinition.cxx) = 50402661d55cb7bb4e35e7a850d5957107121de2
+SHA1 (patch-slideshow_source_engine_activities_activitybase.hxx) = 7a729ad62893af07cbabb64056f074b169f6b654
+SHA1 (patch-slideshow_source_engine_rehearsetimingsactivity.cxx) = 254a7ae558543a636bf4bf18339442979f2c9e52
+SHA1 (patch-slideshow_source_engine_shapes_appletshape.cxx) = 082a00d69b9280fc22707c0827270acb7692c67d
+SHA1 (patch-slideshow_source_engine_shapes_drawshape.cxx) = 51e210a3abc2c4ae88fe12d10472ad550aea599d
+SHA1 (patch-slideshow_source_engine_shapes_mediashape.cxx) = bd0dc47c05c52c9cb54eaea41ffdd5b71304be67
+SHA1 (patch-slideshow_source_engine_unoviewcontainer.cxx) = 5f177e4f2457f46a9e3da532e8ddc711cf48ea3e
 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
 SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb
 SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678
diff --git a/misc/libreoffice4/patches/patch-canvas_source_cairo_cairo__spritecanvashelper.cxx b/misc/libreoffice4/patches/patch-canvas_source_cairo_cairo__spritecanvashelper.cxx
new file mode 100644
index 00000000000..f16fce2d479
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-canvas_source_cairo_cairo__spritecanvashelper.cxx
@@ -0,0 +1,18 @@
+$NetBSD: patch-canvas_source_cairo_cairo__spritecanvashelper.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- canvas/source/cairo/cairo_spritecanvashelper.cxx.orig	2014-08-24 18:35:48.000000000 +0000
++++ 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() );
diff --git a/misc/libreoffice4/patches/patch-canvas_source_vcl_spritecanvashelper.cxx b/misc/libreoffice4/patches/patch-canvas_source_vcl_spritecanvashelper.cxx
new file mode 100644
index 00000000000..a14c5e59d87
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-canvas_source_vcl_spritecanvashelper.cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-canvas_source_vcl_spritecanvashelper.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- canvas/source/vcl/spritecanvashelper.cxx.orig	2014-08-24 18:44:02.000000000 +0000
++++ 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
diff --git a/misc/libreoffice4/patches/patch-dbaccess_source_ui_tabledesign_TableController.cxx b/misc/libreoffice4/patches/patch-dbaccess_source_ui_tabledesign_TableController.cxx
new file mode 100644
index 00000000000..eaa3c460a01
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-dbaccess_source_ui_tabledesign_TableController.cxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-dbaccess_source_ui_tabledesign_TableController.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- dbaccess/source/ui/tabledesign/TableController.cxx.orig	2014-08-24 19:40:15.000000000 +0000
++++ dbaccess/source/ui/tabledesign/TableController.cxx
+@@ -1393,7 +1393,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 = sal_False;
+                 // be notified when the table is in disposing
diff --git a/misc/libreoffice4/patches/patch-oox_source_drawingml_table_tablecell.cxx b/misc/libreoffice4/patches/patch-oox_source_drawingml_table_tablecell.cxx
new file mode 100644
index 00000000000..e37ae005406
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-oox_source_drawingml_table_tablecell.cxx
@@ -0,0 +1,16 @@
+$NetBSD: patch-oox_source_drawingml_table_tablecell.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- oox/source/drawingml/table/tablecell.cxx.orig	2014-08-24 19:21:08.000000000 +0000
++++ oox/source/drawingml/table/tablecell.cxx
+@@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml
+     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 )
diff --git a/misc/libreoffice4/patches/patch-reportdesign_source_core_api_ReportDefinition.cxx b/misc/libreoffice4/patches/patch-reportdesign_source_core_api_ReportDefinition.cxx
new file mode 100644
index 00000000000..84119977107
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-reportdesign_source_core_api_ReportDefinition.cxx
@@ -0,0 +1,15 @@
+$NetBSD: patch-reportdesign_source_core_api_ReportDefinition.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- reportdesign/source/core/api/ReportDefinition.cxx.orig	2014-08-24 21:06:11.000000000 +0000
++++ reportdesign/source/core/api/ReportDefinition.cxx
+@@ -1623,8 +1623,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)
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_activities_activitybase.hxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_activities_activitybase.hxx
new file mode 100644
index 00000000000..23652d6b03b
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_activities_activitybase.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-slideshow_source_engine_activities_activitybase.hxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/activities/activitybase.hxx.orig	2014-08-24 19:11:37.000000000 +0000
++++ 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; }
+ 
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_rehearsetimingsactivity.cxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_rehearsetimingsactivity.cxx
new file mode 100644
index 00000000000..2d2fdf55f1c
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_rehearsetimingsactivity.cxx
@@ -0,0 +1,18 @@
+$NetBSD: patch-slideshow_source_engine_rehearsetimingsactivity.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/rehearsetimingsactivity.cxx.orig	2014-08-24 19:55:39.000000000 +0000
++++ slideshow/source/engine/rehearsetimingsactivity.cxx
+@@ -398,11 +398,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();
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_appletshape.cxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_appletshape.cxx
new file mode 100644
index 00000000000..efe61dbb17e
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_appletshape.cxx
@@ -0,0 +1,33 @@
+$NetBSD: patch-slideshow_source_engine_shapes_appletshape.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/shapes/appletshape.cxx.orig	2014-08-24 20:31:18.000000000 +0000
++++ 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;
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_drawshape.cxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_drawshape.cxx
new file mode 100644
index 00000000000..bb35f7dedc0
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_drawshape.cxx
@@ -0,0 +1,22 @@
+$NetBSD: patch-slideshow_source_engine_shapes_drawshape.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/shapes/drawshape.cxx.orig	2014-08-24 20:46:29.000000000 +0000
++++ 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()) )
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_mediashape.cxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_mediashape.cxx
new file mode 100644
index 00000000000..169ffaff947
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_shapes_mediashape.cxx
@@ -0,0 +1,19 @@
+$NetBSD: patch-slideshow_source_engine_shapes_mediashape.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/shapes/mediashape.cxx.orig	2014-08-24 20:55:41.000000000 +0000
++++ 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 )) );
+         }
+ 
+         // ---------------------------------------------------------------------
diff --git a/misc/libreoffice4/patches/patch-slideshow_source_engine_unoviewcontainer.cxx b/misc/libreoffice4/patches/patch-slideshow_source_engine_unoviewcontainer.cxx
new file mode 100644
index 00000000000..6f3c3e7b34c
--- /dev/null
+++ b/misc/libreoffice4/patches/patch-slideshow_source_engine_unoviewcontainer.cxx
@@ -0,0 +1,18 @@
+$NetBSD: patch-slideshow_source_engine_unoviewcontainer.cxx,v 1.1 2014/08/26 20:58:43 joerg Exp $
+
+--- slideshow/source/engine/unoviewcontainer.cxx.orig	2014-08-24 20:59:43.000000000 +0000
++++ 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 )