diff --git a/0001-fix-gcc-build-error.patch b/0001-fix-gcc-build-error.patch new file mode 100644 index 0000000..84bc6a0 --- /dev/null +++ b/0001-fix-gcc-build-error.patch @@ -0,0 +1,42 @@ +From f9eda02b6f12e8e8b7f15751e8fa6079de762234 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 3 Feb 2016 10:30:43 +0000 +Subject: [PATCH] fix gcc build error + +error: invalid operands of types '__gnu_cxx::__enable_if::__type +{aka double}' and 'int' to binary 'operator%' + +apparently there's a template returning double for abs for the +non-int/long/float/double argument case. So promote earlier to int so the +abs is called + +Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae +--- + sax/source/tools/converter.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx +index 744415e..cf061c9 100644 +--- a/sax/source/tools/converter.cxx ++++ b/sax/source/tools/converter.cxx +@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration, + + + static void +-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset) ++lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset) + { + if (0 == nOffset) + { +@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear) + static void lcl_ConvertToUTC( + sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay, + sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes, +- sal_Int16 const nSourceOffset) ++ int const nSourceOffset) + { + sal_Int16 nOffsetHours(abs(nSourceOffset) / 60); + sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60); +-- +2.5.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 322c085..6c3a594 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -255,6 +255,7 @@ Patch17: 0002-disable-tearability-of-color-window.patch Patch18: 0001-rhbz-1168757-propagate-selected-slides-to-print-dial.patch Patch19: 0001-error-left-operand-of-shift-expression-1-4-is-negati.patch Patch20: 0001-Missing-include.patch +Patch21: 0001-fix-gcc-build-error.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice