diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-16 17:05:09 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-03-18 19:54:07 +0100 |
| commit | 02448a95b68d4fde04a1a058d2f5408c705b6e16 (patch) | |
| tree | 36662dd6d2bfe1fa8a5a4d37d981e9338dd7abdd | |
| parent | 9eb05864a2262e841aff2bbf7d0825c9b326efa5 (diff) | |
Revert "Don't package unoinfo in case of Mac OS X like app structure"
This reverts commit 3a663f7a4580b97518aee4e0c797b549c67ef1a5. Whatever that
commit was supposed to be good for, not packaging unoinfo on macOS breaks
functionality, see e.g.
<https://bugs.documentfoundation.org/show_bug.cgi?id=106292#c10> comment 10 to
"XMessageBox#execute() in Java fails to draw a window on macOS Sierra".
(cherry picked from commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8)
Change-Id: I51cb79d157887bfcaf2dce6900675439d33d0be0
Reviewed-on: https://gerrit.libreoffice.org/35314
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit b0c3d69c7e763048270bb39ff1dc29f563d2cc0f)
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index d9d9864ec298..6dbce4845834 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -517,7 +517,7 @@ File gid_Brand_File_Desktophelper_Txt End #endif -#if !defined WNT && !defined MACOSX +#if !defined WNT File gid_Brand_File_Bin_Unoinfo BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; |