From e1fafc38a26863ba26d7ae3f917b0427a7e9637d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Fri, 13 May 2022 16:58:22 +0200 Subject: [PATCH] fix locales on macos --- assets/macos.mk | 4 ++-- assets/macos.mozconfig | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/macos.mk b/assets/macos.mk index 246b6b9..a3b497b 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -19,9 +19,9 @@ $(outfile) : ${MAKE} work sed "s/_ARCH_/$(arch)/g" < assets/macos.mozconfig > work/librewolf-$(version)-$(source_release)/mozconfig ifeq ($(use_docker),false) - (cd work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) + (cd work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) else - docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package" + docker run --rm -v $(shell pwd)/work:/work:rw registry.gitlab.com/librewolf-community/browser/bsys5/macos-$(arch) sh -c "cd /work/librewolf-$(version)-$(source_release) && ./mach build && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales" endif cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) diff --git a/assets/macos.mozconfig b/assets/macos.mozconfig index eba9dd4..e236eaa 100644 --- a/assets/macos.mozconfig +++ b/assets/macos.mozconfig @@ -47,6 +47,8 @@ ac_add_options --with-branding=browser/branding/librewolf ac_add_options --with-unsigned-addon-scopes=app,system +ac_add_options --with-l10n-base=$PWD/browser/locales/l10n + export MOZ_REQUIRE_SIGNING= mk_add_options MOZ_CRASHREPORTER=0