diff --git a/libreoffice.changes b/libreoffice.changes index 6bd5fe4..5ef4134 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 2 12:07:43 UTC 2016 - tchvatal@suse.com + +- Add patch to fix build missing-include.patch + ------------------------------------------------------------------- Thu Jun 2 08:53:49 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 14bf3af..cb7cb0b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -61,6 +61,8 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # PATCH-FIX-SUSE: disable really fragile test run on hsqldb Patch0: disable-flaky-hsqldb-test.patch +# PATCH-FIX-UPSTREAM: add missing include, already merged +Patch1: missing-include.patch # correctly bootstrap python stuff with system python (deb#501028, bnc#90701) Patch3: system-pyuno.diff # do not use the broken help; unopkg complained about it when registering extensions @@ -906,6 +908,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 %patch0 -p1 +%patch1 -p1 %patch3 -p1 %patch4 %patch5 diff --git a/missing-include.patch b/missing-include.patch new file mode 100644 index 0000000..bf34045 --- /dev/null +++ b/missing-include.patch @@ -0,0 +1,29 @@ +From 43144d4220fc45bf3bafcce387ff7f5b965bff92 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 30 May 2016 13:33:37 +0200 +Subject: Missing include + +Change-Id: Id61e2de27ec307fa7773d3f0d5a0810005f1c364 +(cherry picked from commit 336b62080bd06000e5ac3c7687b34bac2afc79a9) +Reviewed-on: https://gerrit.libreoffice.org/25716 +Reviewed-by: Stephan Bergmann +Tested-by: Stephan Bergmann + +diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx +index 8122424..5bd8a7e 100644 +--- a/mysqlc/source/mysqlc_preparedstatement.cxx ++++ b/mysqlc/source/mysqlc_preparedstatement.cxx +@@ -22,9 +22,9 @@ + #include "mysqlc_propertyids.hxx" + #include "mysqlc_resultsetmetadata.hxx" + ++#include + #include + #include +- + #include + #include + #include +-- +cgit v0.10.2 +