From 7058ec053bc486a10a0d4141dadd249f647ef721 Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Sun, 16 Aug 2020 12:18:17 +0000 Subject: editors/libreoffice6: - repocopy from editors/libreoffice - add i18n option (off by default to mimic classic behaviour) - register conflicts with main libreoffice port --- .../files/patch-sal_osl_unx_thread.cxx | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 editors/libreoffice6/files/patch-sal_osl_unx_thread.cxx (limited to 'editors/libreoffice6/files/patch-sal_osl_unx_thread.cxx') diff --git a/editors/libreoffice6/files/patch-sal_osl_unx_thread.cxx b/editors/libreoffice6/files/patch-sal_osl_unx_thread.cxx new file mode 100644 index 000000000000..eff036ea5b31 --- /dev/null +++ b/editors/libreoffice6/files/patch-sal_osl_unx_thread.cxx @@ -0,0 +1,28 @@ +osl_thread_priority_init_Impl() tries to assign values to variables +declared as const on platforms not excluded by NO_PTHREAD_PRIORITY. +This includes FreeBSD. This is https://gerrit.libreoffice.org/69603 +upstream, and this comment and the relevant parts of this patch can +be removed if/when that is merged. + +--- sal/osl/unx/thread.cxx.orig 2019-08-08 19:56:46.260832000 +0800 ++++ sal/osl/unx/thread.cxx 2019-08-08 19:56:45.711297000 +0800 +@@ -46,6 +46,10 @@ + #include + #endif + ++#ifdef __FreeBSD_kernel__ ++#include ++#endif ++ + /**************************************************************************** + * @@@ TODO @@@ + * +@@ -545,7 +549,7 @@ + if ( 0 != err ) + SAL_WARN("sal.osl", "pthread_setname_np failed with errno " << err); + #elif defined __FreeBSD_kernel__ +- pthread_setname_np( pthread_self(), name ); ++ pthread_set_name_np( pthread_self(), name ); + #elif defined MACOSX || defined IOS + pthread_setname_np( name ); + #else -- cgit v1.2.3