pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patch to fix build missing-include.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=408
This commit is contained in:
Tomáš Chvátal 2016-06-02 12:08:37 +00:00 committed by Git OBS Bridge
parent 8f368a0d1a
commit a3ab4b08b7
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -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 Thu Jun 2 08:53:49 UTC 2016 - tchvatal@suse.com

3
libreoffice.spec
View File

@ -61,6 +61,8 @@ Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
# PATCH-FIX-SUSE: disable really fragile test run on hsqldb # PATCH-FIX-SUSE: disable really fragile test run on hsqldb
Patch0: disable-flaky-hsqldb-test.patch 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) # correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
Patch3: system-pyuno.diff Patch3: system-pyuno.diff
# do not use the broken help; unopkg complained about it when registering extensions # 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 %prep
%setup -q -b1 -b2 %setup -q -b1 -b2
%patch0 -p1 %patch0 -p1
%patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 %patch4
%patch5 %patch5

29
missing-include.patch Normal file
View File

@ -0,0 +1,29 @@
From 43144d4220fc45bf3bafcce387ff7f5b965bff92 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
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 <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
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 <boost/config.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-
#include <cppconn/connection.h>
#include <cppconn/exception.h>
#include <cppconn/parameter_metadata.h>
--
cgit v0.10.2