diff --git a/Makefile b/Makefile index 071c61e..dcf116b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : help all clean veryclean fetch build artifacts update full-mar serve-mar +.PHONY : help all clean veryclean fetch build artifacts update full-mar serve-mar langpacks help : @echo "Use: make [all] [clean] [veryclean] [check] ..." @@ -9,6 +9,7 @@ help : @echo " update - update 'version' and 'source_release' files." @echo " full-mar - create mar setup file, and update.xml." @echo " serve-mar - serve the update files" + @echo " langpacks - build language packs." @echo "" @echo " fetch - Fetch the latest librewolf source." @echo " build - Perform './mach build && ./mach package' on it." @@ -55,3 +56,6 @@ full-mar : serve-mar : (cd librewolf-$(shell cat version)-$(shell cat source_release)/MAR && python3 -m http.server 8000) + +langpacks : + (cd librewolf-$(shell cat version)-$(shell cat source_release) && cat browser/locales/shipped-locales | xargs ./mach package-multi-locale --locales) diff --git a/assets/mozconfig.windows b/assets/mozconfig.windows index 9450987..1c4e8e3 100644 --- a/assets/mozconfig.windows +++ b/assets/mozconfig.windows @@ -36,3 +36,6 @@ ac_add_options --enable-strip # https://firefox-source-docs.mozilla.org/taskcluster/setting-up-an-update-server.html ac_add_options --disable-verify-mar + +# Internationalization +ac_add_options --with-l10n-base=$PWD/browser/locales/l10n diff --git a/assets/tryfix-reslink-fail.patch b/assets/tryfix-reslink-fail.patch new file mode 100644 index 0000000..dfe074d --- /dev/null +++ b/assets/tryfix-reslink-fail.patch @@ -0,0 +1,11 @@ +--- browser/app/splash.rc~ 2022-04-29 00:02:33 +0200 ++++ browser/app/splash.rc 2022-05-04 14:30:43 +0200 +@@ -12,7 +12,7 @@ + IDI_NEWWINDOW ICON NEWWINDOW_ICO + IDI_NEWTAB ICON NEWTAB_ICO + IDI_PBMODE ICON PBMODE_ICO +-IDI_DOCUMENT_PDF ICON DOCUMENT_PDF_ICO ++IDI_DOCUMENT_PDF ICON DOCUMENT_ICO + + STRINGTABLE DISCARDABLE + BEGIN diff --git a/mk.py b/mk.py index 8dc4676..c2e034c 100644 --- a/mk.py +++ b/mk.py @@ -100,9 +100,10 @@ def build(debug=False): else: exec('cp -v ../assets/mozconfig.windows mozconfig') - # two patches for windows only, currently - patch('../assets/disable-verify-mar.patch') + # patches for windows only patch('../assets/package-manifest.patch') + patch('../assets/disable-verify-mar.patch') + patch('../assets/tryfix-reslink-fail.patch') # perform the build and package exec('MACH_USE_SYSTEM_PYTHON=1 ./mach build')