Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2013-01-29 14:17:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice", Maintainer is "[email protected]" Changes: -------- libreoffice-help-en-US.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-group1.changes 2012-12-22 22:16:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-help-group1.changes 2013-01-29 14:17:09.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 19 14:31:31 UTC 2013 - [email protected] + +- raise memory limits / lower parallelism for emulated/native arm builds + +------------------------------------------------------------------- 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-l10n.changes: same change --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2012-12-22 22:16:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2013-01-29 14:17:09.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 25 10:17:26 UTC 2013 - [email protected] + +- do-not-delete-PropertyMapEntry-instance.diff: lost charts (bnc#798271) + +------------------------------------------------------------------- New: ---- do-not-delete-PropertyMapEntry-instance.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-branding-upstream # -# 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,6 +16,7 @@ # + Name: libreoffice-branding-upstream Version: 3.6.3.2.4 Release: 0 ++++++ libreoffice-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-en-US # -# 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,6 +16,7 @@ # + Name: libreoffice-help-en-US ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -333,5 +334,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.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group1 # -# 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,6 +16,7 @@ # + Name: libreoffice-help-group1 ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -123,6 +124,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-ast Summary: Asturian Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -367,6 +369,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -379,6 +387,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" @@ -589,6 +600,7 @@ %endif %if %test_build_langs >= 2 + %files -f file-lists/help_ast_list.txt -n libreoffice-help-ast %defattr(-,root,root) ++++++ libreoffice-help-group2.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group2 # -# 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,6 +16,7 @@ # + Name: libreoffice-help-group2 ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -123,6 +124,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-el Summary: Greek Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -355,6 +357,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -367,6 +375,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" @@ -565,6 +576,7 @@ %endif %if %test_build_langs >= 2 + %files -f file-lists/help_el_list.txt -n libreoffice-help-el %defattr(-,root,root) ++++++ libreoffice-help-group3.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group3 # -# 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,6 +16,7 @@ # + Name: libreoffice-help-group3 ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -123,6 +124,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-gl Summary: Galician Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -367,6 +369,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -379,6 +387,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" @@ -589,6 +600,7 @@ %endif %if %test_build_langs >= 2 + %files -f file-lists/help_gl_list.txt -n libreoffice-help-gl %defattr(-,root,root) ++++++ libreoffice-help-group4.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group4 # -# 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,6 +16,7 @@ # + Name: libreoffice-help-group4 ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -123,6 +124,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-ko Summary: Korean Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -355,6 +357,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -367,6 +375,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" @@ -565,6 +576,7 @@ %endif %if %test_build_langs >= 2 + %files -f file-lists/help_ko_list.txt -n libreoffice-help-ko %defattr(-,root,root) ++++++ libreoffice-help-group5.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice-help-group5 # -# 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,6 +16,7 @@ # + Name: libreoffice-help-group5 ################################################################### ## DO NOT EDIT THIS SPEC FILE @@ -123,6 +124,7 @@ development. %if %test_build_langs >= 2 + %package -n libreoffice-help-ru Summary: Russian Help Localization for LibreOffice Group: Productivity/Office/Suite @@ -382,6 +384,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -394,6 +402,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" @@ -603,6 +614,7 @@ %endif %if %test_build_langs >= 2 + %files -f file-lists/help_ru_list.txt -n libreoffice-help-ru %defattr(-,root,root) ++++++ libreoffice-icon-themes.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -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,6 +16,7 @@ # + Name: libreoffice-icon-themes Version: 3.6.3.2.4 Release: 0 ++++++ libreoffice-l10n.spec ++++++ ++++ 668 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libreoffice/libreoffice-l10n.spec ++++ and /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-l10n.spec ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# 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,6 +16,7 @@ # + Name: libreoffice BuildRequires: ImageMagick BuildRequires: ant @@ -634,6 +635,8 @@ # add pyuno to python path # FIXME: related to system-python-ure-bootstrap.diff Patch18: pyuno-path.diff +# lost charts (bcn#798271) +Patch19: do-not-delete-PropertyMapEntry-instance.diff # # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP Patch900: officecfg-defaul-export-ms-file-formats.diff @@ -1347,6 +1350,7 @@ %patch16 -p1 %patch17 %patch18 +%patch19 -p1 # %if 0%{?meego_version} # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP ++++++ do-not-delete-PropertyMapEntry-instance.diff ++++++ >From 4153bcbc8e568e8e33c56bab68e9ea036c5dce5b Mon Sep 17 00:00:00 2001 From: Kohei Yoshida <[email protected]> Date: Thu, 24 Jan 2013 22:24:44 -0500 Subject: [PATCH] bnc#798271: Don't delete the PropertyMapEntry instance prematurely. When using comphelper::PropertyMapEntry array to create a UNO property set, we need to make sure we keep this instance while the property set object is alive, else it would cause a very hard-to-debug problem down the road... In this particular case, the aExportInfoMap array instance was destroyed when it went out of scope, but the xInfoSet which references it was used afterward. Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014 --- chart2/source/model/filter/XMLFilter.cxx | 40 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 2a6e35b..551e9b2 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -644,28 +644,26 @@ sal_Int32 XMLFilter::impl_Export( xServiceFactory->createInstanceWithArguments( C2U("com.sun.star.comp.Svx.GraphicExportHelper"), aGraphicResolverArgs ), uno::UNO_QUERY ); - uno::Reference< beans::XPropertySet > xInfoSet; + // property map for export info set + comphelper::PropertyMapEntry aExportInfoMap[] = { - // property map for export info set - comphelper::PropertyMapEntry aExportInfoMap[] = - { - { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, - { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, - { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { NULL, 0, 0, NULL, 0, 0 } - }; - - xInfoSet = comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ); - - SvtSaveOptions aSaveOpt; - OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); - sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); - xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); - if( ! bOasis ) - xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); - } + { MAP_LEN("UsePrettyPrinting"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0}, + { MAP_LEN("BaseURI"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("StreamRelPath"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("StreamName"), 0, &::getCppuType( (OUString *)0 ), beans::PropertyAttribute::MAYBEVOID, 0 }, + { MAP_LEN("ExportTableNumberList"), 0, &::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { NULL, 0, 0, NULL, 0, 0 } + }; + + uno::Reference< beans::XPropertySet > xInfoSet = + comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ); + + SvtSaveOptions aSaveOpt; + OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting")); + sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() ); + xInfoSet->setPropertyValue( sUsePrettyPrinting, uno::makeAny( bUsePrettyPrinting ) ); + if( ! bOasis ) + xInfoSet->setPropertyValue( C2U("ExportTableNumberList"), uno::makeAny( true )); sal_Int32 nArgs = 2; if( xGraphicObjectResolver.is()) -- 1.8.0.2 ++++++ libreoffice-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.ZQqb71/_old 2013-01-29 14:17:27.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQqb71/_new 2013-01-29 14:17:27.000000000 +0100 @@ -160,6 +160,12 @@ BUILD_SCRIPT_FLAGS= # dmake does not work with more than 64 jobs lo_jobs="%{?jobs:%jobs}" +%ifarch %arm +%if ! 0%{?qemu_user_space_build:1} +# native hardware is not that powerful +lo_jobs="" +%endif +%endif if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" lo_jobs="64" @@ -172,6 +178,9 @@ else mem_per_process=200 fi +%if 0%{?qemu_user_space_build:1} + mem_per_process=400 +%endif max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` max_jobs="$(($max_mem / $mem_per_process))" test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
