From 600d28513da162c744460afe4aabb91050773c73 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Feb 16 2013 21:53:51 +0000 Subject: Work around problem with boost::shared_array(NULL) ctor and Boost 1.53.0 --- diff --git a/0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch b/0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch new file mode 100644 index 0000000..9650242 --- /dev/null +++ b/0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch @@ -0,0 +1,33 @@ +From b62048701cea5024383e19314592f2edcd9810fd Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Sat, 16 Feb 2013 22:39:13 +0100 +Subject: [PATCH] Work around problem with boost::shared_array(NULL) ctor and + Boost 1.53.0 + +...claiming + + template boost::shared_array::shared_array(Y*) + +is not a viable option due to mismatched types 'Y*' and 'long int' + +Change-Id: I8db321cd25cd73c84fa2a3124c9ec1018c131d5f +--- + vcl/source/gdi/svgdata.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx +index 01707e6..e64646f 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(), +-- +1.8.1.2 + diff --git a/libreoffice.spec b/libreoffice.spec index 789b1eb..763bc38 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -253,6 +253,7 @@ Patch19: 0001-make-evolution-3.6-work-with-address-book.patch Patch20: 0001-Resolves-fdo-60132-Error-reading-file-after-insertin.patch Patch21: 0001-no-g_list_free_full-in-RHEL-6-glib.patch Patch22: 0001-Resolves-rhbz-910176-cannot-select-directory-with-gn.patch +Patch23: 0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -995,6 +996,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch20 -p1 -b .fdo-60132-Error-reading-file-after-insertin.patch %patch21 -p1 -b .no-g_list_free_full-in-RHEL-6-glib.patch %patch22 -p1 -b .rhbz-910176-cannot-select-directory-with-gn.patch +%patch23 -p1 -b .Work-around-problem-with-boost-shared_array-NULL-cto.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2060,6 +2062,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : * Fri Feb 15 2013 Caolán McNamara - 1:4.0.0.3-5 - make evolution 3.6 work with address book - Resolves: rhbz#910176 cannot select directory with gtk folder picker +- fixes for building against Boost 1.53.0 * Fri Feb 15 2013 Stephan Bergmann - 1:4.0.0.3-4 - Resolves: fdo#60491 missing libemboleobj.so