diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-03-15 20:00:39 +0000 |
| commit | 88d39bd86ba879437ef28ea2c936dc13617b8774 (patch) | |
| tree | e082629558e2f17be1d8d8e5489c0dab3c449e7a /user/libreoffice/fix-execinfo.patch | |
| parent | 6e61738144a4ddd8743afe561c789ccbc6634467 (diff) | |
| parent | e5e7f2a7e60e60c88d9f53b16b6bda81a2e4b6f9 (diff) | |
| download | packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.gz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.bz2 packages-88d39bd86ba879437ef28ea2c936dc13617b8774.tar.xz packages-88d39bd86ba879437ef28ea2c936dc13617b8774.zip | |
Merge branch 'libreoffice-6.2' into 'master'
Upgrade LibreOffice to 6.2 and upgrade some of its dependencies
See merge request !197
Diffstat (limited to 'user/libreoffice/fix-execinfo.patch')
| -rw-r--r-- | user/libreoffice/fix-execinfo.patch | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/user/libreoffice/fix-execinfo.patch b/user/libreoffice/fix-execinfo.patch index 4c3b35917..cb82b7d84 100644 --- a/user/libreoffice/fix-execinfo.patch +++ b/user/libreoffice/fix-execinfo.patch @@ -1,7 +1,5 @@ -diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h -index 5fafc1c..408c12c 100644 ---- a/sal/osl/unx/backtrace.h -+++ b/sal/osl/unx/backtrace.h +--- libreoffice-6.2.1.2/sal/osl/unx/backtrace.h ++++ libreoffice-6.2.1.2/sal/osl/unx/backtrace.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H @@ -11,10 +9,8 @@ index 5fafc1c..408c12c 100644 #include <execinfo.h> -diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx -index f4c9a9c..da6d9cf 100644 ---- a/sal/osl/unx/signal.cxx -+++ b/sal/osl/unx/signal.cxx +--- libreoffice-6.2.1.2/sal/osl/unx/signal.cxx ++++ libreoffice-6.2.1.2/sal/osl/unx/signal.cxx @@ -35,7 +35,7 @@ #endif /* MACOSX */ @@ -24,11 +20,9 @@ index f4c9a9c..da6d9cf 100644 #include <execinfo.h> #include <link.h> #define INCLUDE_BACKTRACE -diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c -index 1d9a58b..fd648e4 100644 ---- a/sal/osl/unx/backtrace.c -+++ b/sal/osl/unx/backtrace.c -@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) +--- libreoffice-6.2.1.2/sal/osl/unx/backtrace.c ++++ libreoffice-6.2.1.2/sal/osl/unx/backtrace.c +@@ -279,7 +279,7 @@ void backtrace_symbols_fd( void **buffer } } |