Re: [Libreoffice-commits] core.git: scp2/source

classic Classic list List threaded Threaded
3 messages Options
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: scp2/source

On 03/16/2017 05:07 PM, Stephan Bergmann wrote:

> commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8
> Author: Stephan Bergmann <[hidden email]>
> Date:   Thu Mar 16 17:05:09 2017 +0100
>
>     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".

Had there been any specific reason for the original commit,
<https://cgit.freedesktop.org/libreoffice/core/commit/?id=3a663f7a4580b97518aee4e0c797b549c67ef1a5>?

> diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
> index b4c260f17432..7d2a1239b538 100644
> --- a/scp2/source/ooo/common_brand.scp
> +++ b/scp2/source/ooo/common_brand.scp
> @@ -475,7 +475,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;

_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Andras Timar-5 Andras Timar-5
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: scp2/source

Hi Stephan,

On 03/16/2017 06:31 PM, Stephan Bergmann wrote:

> On 03/16/2017 05:07 PM, Stephan Bergmann wrote:
>> commit 3e5aa33ef4ea8f5839e358dd62acdc09fe64dda8
>> Author: Stephan Bergmann <[hidden email]>
>> Date:   Thu Mar 16 17:05:09 2017 +0100
>>
>>     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".
>
> Had there been any specific reason for the original commit,
> <https://cgit.freedesktop.org/libreoffice/core/commit/?id=3a663f7a4580b97518aee4e0c797b549c67ef1a5>?
>
>
>> diff --git a/scp2/source/ooo/common_brand.scp
>> b/scp2/source/ooo/common_brand.scp
>> index b4c260f17432..7d2a1239b538 100644
>> --- a/scp2/source/ooo/common_brand.scp
>> +++ b/scp2/source/ooo/common_brand.scp
>> @@ -475,7 +475,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;
>

I don't remember exactly, but I think the problem was around signing /
App Store acceptance. App Store build did not have Java, so it was not
affected by the bug. OK to revert in master.

Thanks,
Andras
_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] core.git: scp2/source

On 03/16/2017 08:56 PM, Andras Timar wrote:
> I don't remember exactly, but I think the problem was around signing /
> App Store acceptance. App Store build did not have Java, so it was not
> affected by the bug. OK to revert in master.

(unoinfo isn't just about Java, btw; C++ client code needs it too)

_______________________________________________
LibreOffice mailing list
[hidden email]
https://lists.freedesktop.org/mailman/listinfo/libreoffice