[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sysui/Package_infoplist.mk

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Wed Jul 17 08:34:30 UTC 2019


 sysui/Package_infoplist.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 069f218729fd4853e6c608abf5abd43a1224cdf8
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 16 15:55:19 2019 +0200
Commit:     Xisco FaulĂ­ <xiscofauli at libreoffice.org>
CommitDate: Wed Jul 17 10:33:47 2019 +0200

    tdf#125693: On macOS, create empty LibreOffice.app/Contents/Resources/en.lproj
    
    ...as otherwise languages like Slovenian (which do not have a full system
    integration) fall back to other LibreOffice.app/Contents/Resource/*.lproj
    localizations instead of to English (whose Info.plist is stored as
    LibreOffice.app/Contents/Info.plist, not as some
    LibreOffice.app/Contents/Resources/en.lproj/InfoPlist.strings as is done for
    other languages).
    
    Change-Id: Ic69907a066e9afe1d66045016ad6bf9d997c67d0
    Reviewed-on: https://gerrit.libreoffice.org/75728
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 47a774fbef8c224e4853de3fdd0230b9442bb716)
    Reviewed-on: https://gerrit.libreoffice.org/75745
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index 7712b3e77e4e..de53ba5ba769 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -17,9 +17,11 @@ $(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/C
 	Info.plist \
 ))
 
-$(foreach lang,$(filter ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
+$(foreach lang,$(filter ca cs da de el es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW,$(gb_WITH_LANG)),\
 $(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/$(lang).lproj,\
 	InfoPlist_$(lang)/InfoPlist.strings \
 )))
 
+$(eval $(call gb_Package_add_empty_directory,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents/Resources/en.lproj))
+
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list