Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2013-06-05 13:28:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- libreoffice-help-en-US.changes: same change libreoffice-help-group1.changes: same change libreoffice-help-group2.changes: same change libreoffice-help-group3.changes: same change libreoffice-help-group4.changes: same change libreoffice-help-group5.changes: same change libreoffice-icon-themes.changes: same change libreoffice-l10n.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2013-05-16 16:13:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2013-06-05 13:28:53.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 31 10:32:02 UTC 2013 - [email protected] + +- Fix build with boost-1.53, is also fixed in next release. + +------------------------------------------------------------------- New: ---- boost-1.53-part1.patch boost-1.53-part2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:28:59.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: libreoffice-branding-upstream Version: 4.0.3.3.2 Release: 0 ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:28:59.000000000 +0200 @@ -37,7 +37,6 @@ %define prepare_build 1 #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 -BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -63,6 +62,7 @@ BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel +BuildRequires: xz BuildRequires: zip %if 0%{?suse_version} == 01010 # is not required by Java SDKs by mistake on SLED10 @@ -261,5 +261,4 @@ %files -f file-lists/help_en_US_list.txt -n libreoffice-help-en-US %defattr(-,root,root) - %changelog ++++++ libreoffice-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:28:59.000000000 +0200 @@ -49,7 +49,6 @@ %endif #!BuildIgnore: libreoffice # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 -BuildRequires: xz BuildRequires: ant BuildRequires: ant-apache-regexp BuildRequires: automake @@ -75,6 +74,7 @@ BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel +BuildRequires: xz BuildRequires: zip %if 0%{?suse_version} == 01010 # is not required by Java SDKs by mistake on SLED10 libreoffice-help-group2.spec: same change libreoffice-help-group3.spec: same change libreoffice-help-group4.spec: same change libreoffice-help-group5.spec: same change ++++++ libreoffice-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:28:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-icon-themes # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,6 @@ # - Name: libreoffice-icon-themes Version: 4.0.3.3.2 Release: 0 ++++++ libreoffice-l10n.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:28:59.000000000 +0200 @@ -1664,8 +1664,8 @@ PreReq: libreoffice >= 3.5 %endif Requires: libreoffice = %{version} -Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res Provides: OpenOffice_org-sh-YU = %version +Provides: OpenOffice_org-sh-YU:%_prefix/ooo-2.0/program/resource/sw680sh-YU.res Obsoletes: OpenOffice_org-sh-YU < %version # compat stuff Provides: OpenOffice_org-sh = %{version} @@ -1752,8 +1752,8 @@ %endif Requires: libreoffice = %{version} Requires: scalable-font-ru -Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res Provides: OpenOffice_org-sr-CS = %version +Provides: OpenOffice_org-sr-CS:%_prefix/ooo-2.0/program/resource/sw680sr-CS.res Obsoletes: OpenOffice_org-sr-CS < %version # compat stuff Provides: OpenOffice_org-sr = %{version} ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.vV0ji2/_old 2013-06-05 13:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.vV0ji2/_new 2013-06-05 13:29:00.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: libreoffice BuildRequires: ImageMagick BuildRequires: ant @@ -46,8 +45,11 @@ BuildRequires: libmysqlclient-devel BuildRequires: libxml2-devel #BuildRequires: libzip-devel +BuildRequires: db-devel +BuildRequires: krb5 BuildRequires: lpsolve-devel BuildRequires: neon-devel +BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: patch BuildRequires: perl-Archive-Zip @@ -55,18 +57,15 @@ BuildRequires: postgresql-devel BuildRequires: procps BuildRequires: python-devel +BuildRequires: python-xml BuildRequires: recode BuildRequires: unixODBC-devel BuildRequires: unzip BuildRequires: xml-commons-apis -BuildRequires: zip -BuildRequires: db-devel -BuildRequires: krb5 -BuildRequires: openldap2-devel -BuildRequires: python-xml BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts BuildRequires: xz +BuildRequires: zip ############################ # GTK3 stuff %if 0%{?suse_version} >= 01210 @@ -611,6 +610,9 @@ Patch16: build-max-64-jobs.diff # Letter and Fax tamplates can't be created by python-2.6 if ODF file type description uses non-Ascii characters Patch17: wizards-create-temlates-with-python-2.6.diff +# applied in 4.0.4 and later +Patch18: boost-1.53-part1.patch +Patch19: boost-1.53-part2.patch # # cpp/poppler-version.h is not included in older poppler packages # FIXME: make it configurable to push upstream @@ -1304,6 +1306,8 @@ %patch15 %patch16 %patch17 -p1 +%patch18 -p1 +%patch19 -p1 # %if %suse_version >= 1110 && %suse_version < 1120 # cpp/poppler-version.h is not included in older poppler packages @@ -1348,8 +1352,6 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" solenv/src/version.c sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c - - %build %{expand:%(cat %_sourcedir/build_prepare.inc)} %if %prepare_build != 0 ++++++ boost-1.53-part1.patch ++++++ >From f2814ac645f0e35d51c1cfc48fb84dbf68f8b4dc Mon Sep 17 00:00:00 2001 From: Stephan Bergmann <[email protected]> Date: Sat, 16 Feb 2013 21:39:13 +0000 Subject: Work around problem with boost::shared_array(NULL) ctor and Boost 1.53.0 ...claiming template<class Y> boost::shared_array<T>::shared_array(Y*) is not a viable option due to mismatched types 'Y*' and 'long int' Change-Id: I8db321cd25cd73c84fa2a3124c9ec1018c131d5f (cherry picked from commit b62048701cea5024383e19314592f2edcd9810fd) Signed-off-by: Markus Mohrhard <[email protected]> --- diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index f98abcd..4d15ec3 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -166,7 +166,7 @@ SvgData::SvgData(const SvgDataArray& rSvgDataArray, sal_uInt32 nSvgDataArrayLeng ////////////////////////////////////////////////////////////////////////////// SvgData::SvgData(const OUString& rPath): - maSvgDataArray(NULL), + maSvgDataArray(), mnSvgDataArrayLength(0), maPath(rPath), maRange(), -- cgit v0.9.0.2-2-gbebe ++++++ boost-1.53-part2.patch ++++++ >From 50f7c2a785aeff17488f09a1fd2ca5bae9d6c761 Mon Sep 17 00:00:00 2001 From: Mark Wright <[email protected]> Date: Sat, 09 Feb 2013 15:04:02 +0000 Subject: fix compile for change to boost 1.53.0 declaring smart pointer operator bool as explicity for C++11 compilers Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79 Reviewed-on: https://gerrit.libreoffice.org/2064 Tested-by: LibreOffice gerrit bot <[email protected]> Reviewed-by: Norbert Thiebaud <[email protected]> (cherry picked from commit d4bab97023e3569571a92551040574b20aceca7c) Signed-off-by: Markus Mohrhard <[email protected]> --- diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx index 9b4fe1b..6c34074 100644 --- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx +++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx @@ -78,7 +78,7 @@ public: operator bool () const { - return m_aItem; + return static_cast< bool >(m_aItem); } virtual ~scoped_disposing_ptr() diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index bc0bcc7..d709a65 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -682,7 +682,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet& rPropSet, XclChObjectT bool XclExpChEscherFormat::IsValid() const { - return maData.mxEscherSet; + return static_cast< bool >(maData.mxEscherSet); } void XclExpChEscherFormat::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index c493560..81e9ac2 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const SvxURLField& rUrlFie 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 ) ); diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index f945a89..2b8462a 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2689,7 +2689,7 @@ void XclImpChTypeGroup::Finalize() 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() ) diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 57538f0..7c44412 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1230,9 +1230,9 @@ public: /** 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/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index e63d600..5d421c2 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -151,7 +151,7 @@ namespace slideshow } } - return mpSprite; + return static_cast< bool >(mpSprite); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index 20c73de..621535f 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -178,7 +178,7 @@ namespace slideshow } } - return io_rCacheEntry.mpRenderer; + return static_cast< bool >(io_rCacheEntry.mpRenderer); } bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index c5636cc..da28159 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -104,7 +104,7 @@ namespace slideshow maTreeNode ); } - return mpSubsetShape; + return static_cast< bool >(mpSubsetShape); } void ShapeSubset::disableSubsetShape() diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx index 5f5e9f5..7d4c788 100644 --- a/slideshow/source/engine/slide/slideanimations.cxx +++ b/slideshow/source/engine/slide/slideanimations.cxx @@ -74,7 +74,7 @@ namespace slideshow SHOW_NODE_TREE( mpRootNode ); - return mpRootNode; + return static_cast< bool >(mpRootNode); } bool SlideAnimations::isAnimated() const diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx index 88405f8..d725255 100644 --- a/slideshow/source/inc/shapeattributelayer.hxx +++ b/slideshow/source/inc/shapeattributelayer.hxx @@ -467,7 +467,7 @@ namespace slideshow // 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, diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx index e53be46..22ce4f3 100644 --- a/slideshow/source/inc/shapeattributelayerholder.hxx +++ b/slideshow/source/inc/shapeattributelayerholder.hxx @@ -83,7 +83,7 @@ namespace slideshow if( mpShape ) mpAttributeLayer = mpShape->createAttributeLayer(); - return mpAttributeLayer; + return static_cast< bool >(mpAttributeLayer); } ShapeAttributeLayerSharedPtr get() const diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx index d4959b2..54dc972 100644 --- a/sw/source/core/inc/bookmrk.hxx +++ b/sw/source/core/inc/bookmrk.hxx @@ -75,7 +75,7 @@ namespace sw { 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; } -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
