Attachment 176169 Details for Bug 213768 – patch set to build editor/libreoffice with lang/gcc5

[patch] patch set to build editor/libreoffice with lang/gcc5

patch-libreoffice-kpsalerno-gcc5 (text/plain), 3.48 KB, created by Kenneth Salerno on 2016-10-26 00:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kenneth Salerno

Created: 2016-10-26 00:50:55 UTC

Size: 3.48 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 213768: 176138 | 176139 | 176140 | 176168 | 176169 | 176170 | 176197 | 176227 | 176228 | 176274 | 176341 | 176418