diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-05-08 11:38:38 +0200 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-05-08 11:38:38 +0200 |
| commit | 393cec9eb50f3888efaf22b5b0df8c216a396271 (patch) | |
| tree | 8597febf4281729fdc69309aedd46140250b76f5 | |
| parent | Drop AppImage validation (diff) | |
| download | librewolf-linux-393cec9eb50f3888efaf22b5b0df8c216a396271.tar.gz librewolf-linux-393cec9eb50f3888efaf22b5b0df8c216a396271.tar.bz2 librewolf-linux-393cec9eb50f3888efaf22b5b0df8c216a396271.zip | |
fix missing locales from removed extension breaking the build when building a profiled browser
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | remove_addons.patch | 63 |
2 files changed, 65 insertions, 2 deletions
@@ -32,7 +32,7 @@ sha256sums=('3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' - '24b75ba55cb4a2c9a088a22279a1f07fd3b8f3ef4f47774c0c12b79f4bfad124') + '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0') if [[ $CARCH == 'aarch64' ]]; then source+=(arm.patch @@ -238,7 +238,7 @@ package() { pref("spellchecker.dictionary_path", "/usr/share/hunspell"); // Don't disable extensions in the application directory -// done in librewolf.cf +// done in librewolf.cfg // pref("extensions.autoDisableScopes", 11); END diff --git a/remove_addons.patch b/remove_addons.patch index 15da8ae..69c4d8f 100644 --- a/remove_addons.patch +++ b/remove_addons.patch @@ -14,3 +14,66 @@ index 4c9fa78..095d199 100644 - 'report-site-issue' + 'screenshots' ] +diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in +index 05f0242..7c9737a 100644 +--- a/browser/locales/Makefile.in ++++ b/browser/locales/Makefile.in +@@ -61,7 +61,6 @@ libs-%: + ifneq (,$(wildcard ../extensions/formautofill/locales)) + @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* + endif +- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' + @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) +@@ -82,7 +81,6 @@ endif + @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* + @$(MAKE) chrome AB_CD=$* + @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* +- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$* + + package-win32-installer: $(SUBMAKEFILES) + $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer +diff --git a/browser/locales/filter.py b/browser/locales/filter.py +index 1fc9b14..d8a9ee2 100755 +--- a/browser/locales/filter.py ++++ b/browser/locales/filter.py +@@ -13,7 +13,6 @@ def test(mod, path, entity=None): + "browser", + "browser/extensions/formautofill", + "browser/extensions/fxmonitor", +- "browser/extensions/report-site-issue", + "extensions/spellcheck", + "other-licenses/branding/firefox", + "browser/branding/official", +diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini +index f4cb7ca..4efac13 100644 +--- a/browser/locales/l10n.ini ++++ b/browser/locales/l10n.ini +@@ -14,7 +14,6 @@ dirs = browser + devtools/startup + browser/extensions/formautofill + browser/extensions/fxmonitor +- browser/extensions/report-site-issue + + [includes] + # non-central apps might want to use %(topsrcdir)s here, or other vars +diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml +index 0b53c52..f8b605d 100644 +--- a/browser/locales/l10n.toml ++++ b/browser/locales/l10n.toml +@@ -129,14 +129,6 @@ locales = [ + reference = "browser/extensions/fxmonitor/locales/en-US/**" + l10n = "{l}browser/extensions/fxmonitor/**" + +-[[paths]] +- reference = "browser/extensions/webcompat-reporter/locales/en-US/**" +- l10n = "{l}browser/extensions/webcompat-reporter/**" +- +-[[paths]] +- reference = "browser/extensions/report-site-issue/locales/en-US/**" +- l10n = "{l}browser/extensions/report-site-issue/**" +- + [[paths]] + reference = "services/sync/locales/en-US/**" + l10n = "{l}services/sync/**" |