On Sun, Mar 10, 2013 at 02:57:45PM -0000, BLFS Trac wrote:
> #3826: libreoffice-4.0.1.2
>
> Procedure was the same for me. Only md5sum were changed. I didn't try
> building with system Boost, but now you confirm it's broken.
>
I've not long built 4.0.0.3, with system boost (1.53.0). For
liborcus I used a lo upstream patch, apparently it is
faf72664d11deaa570a0f8c7e702ff07bf5914c8 (dunno if that is before or
after 4.0.1.2 - the date of September 2001 is obviously bogus).
For everything else I used a patch from gentoo (for some reason they
think liborcus is worth building separately, so they don't the
liborcus patch in lo).
Attaching them, in case useful.
ĸen
--
das eine Mal als Tragödie, das andere Mal als Farce
>From faf72664d11deaa570a0f8c7e702ff07bf5914c8 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <[email protected]>
Date: Sun, 17 Feb 2013 10:49:34 +0000
Subject: Missing include in liborcus when building against Boost 1.53.0
Change-Id: Ie6c944d53d6e2fcdd161f674e32c9fbfd761d844
---
diff --git a/liborcus/UnpackedTarball_orcus.mk
b/liborcus/UnpackedTarball_orcus.mk
index ca5232d..de0788a 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -18,6 +18,10 @@ orcus_patches :=
orcus_patches += liborcus_0.1.0-configure.patch
# disable boost "auto lib" in MSVC build
orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
+# <https://gitorious.org/orcus/orcus/merge_requests/2#
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8-
+# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
+orcus_patches += liborcus_0.1.0-boost-include.patch.1
$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
diff --git a/liborcus/liborcus_0.1.0-boost-include.patch.1
b/liborcus/liborcus_0.1.0-boost-include.patch.1
new file mode 100644
index 0000000..07558b0
--- a/dev/null
+++ b/liborcus/liborcus_0.1.0-boost-include.patch.1
@@ -0,0 +1,26 @@
+From f60d6eecee72349993a392a9a63ddf3383d3b8c8 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <[email protected]>
+Date: Sat, 16 Feb 2013 13:25:44 +0100
+Subject: [PATCH] Missing include <boost/noncopyable.hpp>
+
+(at least when compiling against Boost 1.53.0)
+---
+ src/liborcus/dom_tree.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/liborcus/dom_tree.cpp b/src/liborcus/dom_tree.cpp
+index ecf7beb..14725ad 100644
+--- a/src/liborcus/dom_tree.cpp
++++ b/src/liborcus/dom_tree.cpp
+@@ -34,6 +34,8 @@
+ #include <iostream>
+ #include <sstream>
+
++#include <boost/noncopyable.hpp>
++
+ using namespace std;
+
+ namespace orcus {
+--
+1.8.1.2
+
--
cgit v0.9.0.2-2-gbebe
--- 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(),
--
http://linuxfromscratch.org/mailman/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
