From 1c6b9e3f455123bde79cfeb2a01da536d80f6410 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 16 Feb 2016 18:35:24 +0100 Subject: [PATCH] fix rhel build --- 0001-disable-libe-book-support.patch | 36 +++++++++++++++++++++---- 0001-fix-build-with-gcc-4.8.patch | 39 ++++++++++++++++++++++++++++ libreoffice.spec | 4 +++ 3 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 0001-fix-build-with-gcc-4.8.patch diff --git a/0001-disable-libe-book-support.patch b/0001-disable-libe-book-support.patch index 407714d..f9f5b5d 100644 --- a/0001-disable-libe-book-support.patch +++ b/0001-disable-libe-book-support.patch @@ -1,4 +1,4 @@ -From 8ab4035ef1e139386eaa864a35f132e81056e679 Mon Sep 17 00:00:00 2001 +From e75e433e943f7d082e81ea329ec0ca8747120e3b Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 21 Aug 2014 16:10:51 +0200 Subject: [PATCH] disable libe-book support @@ -9,10 +9,11 @@ Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4 external/Module_external.mk | 1 - filter/Configuration_filter.mk | 8 -------- writerperfect/Library_wpftwriter.mk | 2 -- - writerperfect/qa/unit/WpftWriterFilterTest.cxx | 1 - + writerperfect/qa/unit/WpftImportTestBase.hxx | 3 --- + writerperfect/qa/unit/WpftWriterFilterTest.cxx | 5 ----- writerperfect/source/writer/wpftwriter.component | 4 ---- writerperfect/source/writer/wpftwriter_genericfilter.cxx | 6 ------ - 7 files changed, 28 deletions(-) + 8 files changed, 35 deletions(-) diff --git a/configure.ac b/configure.ac index 58a53b5..be1b129 100644 @@ -89,11 +90,36 @@ index 8557991..288c929 100644 writerperfect/source/writer/MSWorksImportFilter \ writerperfect/source/writer/MWAWImportFilter \ writerperfect/source/writer/PagesImportFilter \ +diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx +index 7e20987..514561f 100644 +--- a/writerperfect/qa/unit/WpftImportTestBase.hxx ++++ b/writerperfect/qa/unit/WpftImportTestBase.hxx +@@ -29,9 +29,6 @@ + ((minor) > (req_minor) \ + || ((minor) == (req_minor) && ((micro) >= (req_micro))))) + +-#define REQUIRE_EBOOK_VERSION(major, minor, micro) \ +- REQUIRE_VERSION(EBOOK_VERSION_MAJOR, EBOOK_VERSION_MINOR, EBOOK_VERSION_MICRO, major, minor, micro) +- + #define REQUIRE_ETONYEK_VERSION(major, minor, micro) \ + REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro) + diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -index 9e8bd02..3c668e4 100644 +index 9e8bd02..5e3a04d 100644 --- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx +++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx -@@ -51,7 +51,6 @@ void WpftWriterFilterTest::test() +@@ -31,10 +31,6 @@ WpftWriterFilterTest::WpftWriterFilterTest() + + void WpftWriterFilterTest::test() + { +- const writerperfect::test::WpftOptionalMap_t aEBookOptional +- { +- {"FictionBook2.fb2.zip", REQUIRE_EBOOK_VERSION(0, 1, 1)}, +- }; + const writerperfect::test::WpftOptionalMap_t aEtonyekOptional + { + {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)}, +@@ -51,7 +47,6 @@ void WpftWriterFilterTest::test() }; doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/"); diff --git a/0001-fix-build-with-gcc-4.8.patch b/0001-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000..9ed1088 --- /dev/null +++ b/0001-fix-build-with-gcc-4.8.patch @@ -0,0 +1,39 @@ +From eb6322f6217e3571329d04da512a98f86f5829c8 Mon Sep 17 00:00:00 2001 +From: rpmbuild +Date: Tue, 16 Feb 2016 16:55:38 +0100 +Subject: [PATCH] fix build with gcc 4.8 + +--- + xmloff/source/core/RDFaExportHelper.cxx | 2 +- + xmloff/source/core/RDFaImportHelper.cxx | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx +index 42a25f0..3f054eb 100644 +--- a/xmloff/source/core/RDFaExportHelper.cxx ++++ b/xmloff/source/core/RDFaExportHelper.cxx +@@ -165,7 +165,7 @@ RDFaExportHelper::AddRDFa( + xContent->getValue()); + } + +- auto aStatementToCURIE = [this](rdf::Statement const& aStatement) { ++ std::function aStatementToCURIE = [this](rdf::Statement const& aStatement) { + return makeCURIE(&this->m_rExport, aStatement.Predicate); + }; + OUStringBuffer property; +diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx +index 96d784d..f78f17c 100644 +--- a/xmloff/source/core/RDFaImportHelper.cxx ++++ b/xmloff/source/core/RDFaImportHelper.cxx +@@ -328,7 +328,7 @@ void RDFaInserter::InsertRDFaEntry( + + predicates.reserve(i_rEntry.m_xRDFaAttributes->m_Properties.size()); + +- auto aPropertyToXURI = [this](OUString const& aProperty) { return this->MakeURI(aProperty); }; ++ std::function(OUString const &)> aPropertyToXURI = [this](OUString const& aProperty) { return this->MakeURI(aProperty); }; + // Store as variable so the type matches in both calls. + + ::std::remove_copy_if( +-- +2.5.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 8db228e..f4f1ea5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -258,6 +258,10 @@ Patch21: 0002-split-the-gtk2-and-gtk3-gtkobjects.patch Patch22: 0003-rename-X11WindowProvider-to-a-NativeWindowHandle-pro.patch Patch23: 0004-implement-wayland-handle-passing-for-gstreamer.patch Patch24: 0005-gtk3-wayland-play-video-via-gtksink-gstreamer-elemen.patch +%if 0%{?rhel} +# not upstreamed +Patch25: 0001-fix-build-with-gcc-4.8.patch +%endif %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice