View | Details | Raw Unified | Return to bug 213768 | Differences between
and this patch

Collapse All | Expand All

(-)editors/libreoffice/files/patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx (-4 / +3 lines)
Lines 1-4 Link Here
1 
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig	2015-08-22 06:41:35 UTC
 1 
--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx.orig	2016-05-04 21:28:24 UTC
2 
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
 2 
+++ bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
3 
@@ -32,10 +32,34 @@
 3 
@@ -32,10 +32,34 @@
4 
 #include <uno/any2.h>
 4 
 #include <uno/any2.h>
Lines 37-52 Link Here
37
37
38 
 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
 38 
 // ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
39
39
40 
@@ -104,6 +128,8 @@ extern "C" void __cxa_throw(
 40 
@@ -104,6 +128,7 @@ extern "C" void __cxa_throw(
41 
     __attribute__((noreturn));
 41 
     __attribute__((noreturn));
42 
 }
 42 
 }
43 
 #endif
 43 
 #endif
44 
+}
45 
+#endif
 44 
+#endif
46
45
47 
 extern "C" void privateSnippetExecutorGeneral();
 46 
 extern "C" void privateSnippetExecutorGeneral();
48 
 extern "C" void privateSnippetExecutorVoid();
 47 
 extern "C" void privateSnippetExecutorVoid();
49 
@@ -115,12 +141,17 @@ extern "C" void privateSnippetExecutorCl
 48 
@@ -115,12 +140,17 @@ extern "C" void privateSnippetExecutorCl
50 
 namespace CPPU_CURRENT_NAMESPACE
 49 
 namespace CPPU_CURRENT_NAMESPACE
51 
 {
 50 
 {
52
51
(-)editors/libreoffice/files/patch-connectivity_source_commontools_dbconversion.cxx (+10 lines)
Added Link Here
1 
--- connectivity/source/commontools/dbconversion.cxx.orig	2016-10-25 14:25:09 UTC
2 
+++ connectivity/source/commontools/dbconversion.cxx
3 
@@ -17,6 +17,7 @@
4 
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
5 
  */
6
7 
+#include <stdio.h>
8 
 #include <connectivity/dbconversion.hxx>
9 
 #include <connectivity/dbcharset.hxx>
10 
 #include <osl/diagnose.h>
(-)editors/libreoffice/files/patch-include_tools_stream.hxx (+10 lines)
Added Link Here
1 
--- include/tools/stream.hxx.orig	2016-05-04 21:28:24 UTC
2 
+++ include/tools/stream.hxx
3 
@@ -19,6 +19,7 @@
4 
 #ifndef INCLUDED_TOOLS_STREAM_HXX
5 
 #define INCLUDED_TOOLS_STREAM_HXX
6
7 
+#include <stdio.h>
8 
 #include <limits>
9 
 #include <osl/process.h>
10 
 #include <tools/toolsdllapi.h>
(-)editors/libreoffice/files/patch-include_unotest_assertion__traits.hxx (+23 lines)
Added Link Here
1 
--- include/unotest/assertion_traits.hxx.orig	2016-10-25 18:18:55 UTC
2 
+++ include/unotest/assertion_traits.hxx
3 
@@ -18,6 +18,20 @@
4 
 #include <sal/config.h>
5
6 
 #include <string>
7 
+/*
8 
+ * Ports patch:
9 
+ * lang/gcc5 bug to force inclusion of std::to_string when using -std=gnu++11
10 
+ */
11 
+#ifndef __clang_version__
12 
+#include <stdio.h>
13 
+#include <ext/string_conversions.h>
14 
+namespace std {
15 
+	inline string
16 
+	to_string(int __val)
17 
+	{ return __gnu_cxx::__to_xstring<string>(&vsnprintf, 4 * sizeof(int),
18 
+	"%d", __val); }
19 
+}
20 
+#endif
21
22 
 namespace CppUnit {
23
(-)editors/libreoffice/files/patch-sc_source_core_opencl_formulagroupcl.cxx (+15 lines)
Added Link Here
1 
--- sc/source/core/opencl/formulagroupcl.cxx.orig	2016-10-25 15:52:40 UTC
2 
+++ sc/source/core/opencl/formulagroupcl.cxx
3 
@@ -7,6 +7,12 @@
4 
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
5 
  */
6
7 
+/*
8 
+ * Ports patch:
9 
+ * lang/gcc5 bug to force inclusion of std::to_string when using -std=gnu++11
10 
+ */
11 
+#define _GLIBCXX_USE_C99 1
12 
+
13 
 #include "formulagroup.hxx"
14 
 #include "formulagroupcl.hxx"
15 
 #include "clkernelthread.hxx"

Return to bug 213768