[iceweasel]: use gnuzilla 'mozzarella' website for add-ons search

4 files changed, 34 insertions, 25 deletions

diff --git a/libre/iceweasel/9002-FSDG-preference-defaults.patch b/libre/iceweasel/9002-FSDG-preference-defaults.patch
index c32ff866f..9f5dd6151 100644
--- a/libre/iceweasel/9002-FSDG-preference-defaults.patch
+++ b/libre/iceweasel/9002-FSDG-preference-defaults.patch
@@ -154,8 +154,8 @@ index 801816dc41..9c2562ff23 100644
 -pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
 -pref("extensions.getAddons.browserMappings.url", "https://services.addons.mozilla.org/api/v5/addons/browser-mappings/?browser=%BROWSER%");
 +pref("extensions.getAddons.get.url", "");
-+pref("extensions.getAddons.search.browseURL", "https://www.parabola.nu/packages/?q=%TERMS%");
-+pref("extensions.getAddons.link.url", "https://www.parabola.nu/packages/?q=iceweasel-");
++pref("extensions.getAddons.search.browseURL", "https://gnuzilla.gnu.org/mozzarella/search.php?q=%TERMS%");
++pref("extensions.getAddons.link.url", "https://gnuzilla.gnu.org/mozzarella/");
 +pref("extensions.getAddons.langpacks.url", "");
 +pref("extensions.getAddons.discovery.api_url", "");
 +pref("extensions.getAddons.browserMappings.url", "");
diff --git a/libre/iceweasel/9004-FSDG-misc.patch b/libre/iceweasel/9004-FSDG-misc.patch
index d5b7d57f9..dc3da054b 100644
--- a/libre/iceweasel/9004-FSDG-misc.patch
+++ b/libre/iceweasel/9004-FSDG-misc.patch
@@ -1234,25 +1234,37 @@ index 829c18c5e1..71c75114e9 100644
  
  sync-profile-picture =
 diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
-index edd871b..77870fe 100644
+index f4aa0a5..e2978e3 100644
 --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
 +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
-@@ -7,7 +7,7 @@ addons-window =
+@@ -5,7 +5,7 @@
  addons-page-title = Add-ons Manager
  
  search-header =
 -    .placeholder = Search addons.mozilla.org
-+    .placeholder = Search www.parabola.nu/packages
++    .placeholder = Search Mozarella
      .searchbuttonlabel = Search
-
- search-header-shortcut =
-@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
-
- default-heading-search-label = Find more add-ons
+ 
+ ## Variables
+@@ -335,7 +335,7 @@ install-theme-button = Install Theme
+ # The label of the button that appears after installing an add-on. Upon click,
+ # the detailed add-on view is opened, from where the add-on can be managed.
+ manage-addon-button = Manage
+-find-more-addons = Find more add-ons
++find-more-addons = Find more add-ons in the Parabola repos, or search here:
+ find-more-themes = Find more themes
+ 
+ # This is a label for the button to open the "more options" menu, it is only
+@@ -505,9 +505,9 @@ sitepermission-heading = Manage Your Site Permissions
+ discover-heading = Personalize Your { -brand-short-name }
+ shortcuts-heading = Manage Extension Shortcuts
+ 
+-default-heading-search-label = Find more add-ons
++default-heading-search-label = Find more add-ons in the Parabola repos, or search here:
  addons-heading-search-input =
 -    .placeholder = Search addons.mozilla.org
-+    .placeholder = Search www.parabola.nu/packages
-
++    .placeholder = Search Mozarella
+ 
  addon-page-options-button =
      .title = Tools for all add-ons
 diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 25bfb9773..6f36385c1 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -25,8 +25,8 @@
 
 # parabola changes and rationale:
 # libre:
-#  - Modify the addons pages to use GNU IceCat plugins sources, rather
-#    than addons.mozilla.org, which hosts non-free addons
+#  - Modify the addons pages to search the Gnuzilla Mozzarella website
+#    instead of the Mozilla addons website, which hosts non-free addons
 #  - Disable EME, which is implemented via the non-free libWideVine CDM
 #  - Disable Normandy that let Mozilla push messages with recommendations
 #    of nonfree software
@@ -188,11 +188,11 @@ sha256sums=('fa524cb9a63334d74ef996f3cbaf1559b5836f6c8ef6e890fa20846029242ac7'
 sha256sums+=('b701b4c47fca2661feeabe172e398c76c8015ee08ff4cc3cc2f7c3ef2ed692a7'
              'SKIP'
              '60d4373f55bc72b4803420d545c7a895339b38b855e86b6cdc6429463b875ec9'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-             '7de621cecbd05a12606cc977c53a86deebe7bd36e317f427d13b271bb7162ac4'  # 9002-FSDG-preference-defaults.patch
+             '429a50f8bf24ddbcfa3fd1590e77d797fb1445e52bb151f743e901ad65a491e0'  # 9002-FSDG-preference-defaults.patch
              '07d6910ddd07f60b803957259e06e3babee6f072f48c6fe31b906a1ea24e3b62'  # 9003-FSDG-urihandlers.patch
-             'e75975be17acf458c76adcdb7ebb0cedee6d480bef6a0e241bbd4d3cf1e38913'  # 9004-FSDG-misc.patch
+             'cd617d892cb3b3888a65b19c06217356d4f97b12c5c438283ec9c2476eecb218'  # 9004-FSDG-misc.patch
              '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332'  # process-json-files.py
-             '8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc'  # vendor.js.in
+             '86bd54db6026ff65bd24ac4f05d0679a645ff447e2f81b0ee44037c0c4285e06'  # vendor.js.in
              'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
 sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 sha256sums_i686=('a8786bb747ae8a12d28268f6731621810e13f405b664373b23a3070d5ed21302'  # avoid-libxul-OOM-python-check.patch
@@ -206,11 +206,11 @@ b2sums=('748e7ea88f493d449e52e94a268190f9beca671aebba057f7089897dee51d3e8d45c6f9
 b2sums+=('a22044292e464b3922eb2e4a8cf0993524d232eeb4a8602707589d00f690498d3b76e515c8d0ce4995b3bf8a65df9aa814b49de469178aa1f8cc07ec19dd5d32'
          'SKIP'
          'abd0c76b5baecda36c3303b034760bbb8a69c0bd1a7ba7646a203772083f54e79ce07af1f0b1c7f1ae1b7294695b4e259d3a796e48afa4b9782de865277a92c6'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-         'bc3dc2155f8d7d6a19f22b9977bfa1a30a9b4300011470706f3733b2eb71995f8b42290a98b02928362bc9ef05aa8c490b5b9c5bd35d0d64fa8e9904704e4794'  # 9002-FSDG-preference-defaults.patch
+         '12bfa1cfc4d38dcca1592351e6fe7a41776e6117f00c9bc068e9913142ca46196cd83a1b21c18393757c927a54e95b6e15c2212ffab58527ff9741ba262521d1'  # 9002-FSDG-preference-defaults.patch
          'dbb0f9639cbe08bf423faf9e2966b5464a26ab5c6314eea18be0e89edd8ac465bfa04a219821852bdd0801dfed9092999bcca1a982a631035bae9a51408d8dde'  # 9003-FSDG-urihandlers.patch
-         '7b70fcaab0bae5b02aaa3e55ac9429945359e6bbe0691c9b6216b63bd3a81390f7bae7324f0a03253809b8da07d6eff42f08f29a6188c7f0c537348857315739'  # 9004-FSDG-misc.patch
+         'a59bedbb965cbe5eb864158bb82e119ca9594f0d5d1e47afe60495ad6578156d764f5f71d692f0012f22986020a005fa43e26ad191383a866c8ef5eff5ce501d'  # 9004-FSDG-misc.patch
          '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4'  # process-json-files.py
-         '5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a'  # vendor.js.in
+         'f3f344196d03499f3f0392d5dfc5310e131d8c85772edd340faf1df3f04ebf2931eb1dda1b7fe6870d61d498618f4d8ae9f1dd446acbe83e0ce324e04b38f3f9'  # vendor.js.in
          '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
 b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
 b2sums_i686=('01e1bcb331b6147b822fe4c45dd195f38e670db08bdff16db1c21dc2d529f4f783d5798cde415fec782c8fc9cf79ce70dadcc013be3c9d4f5a09fc3a1ee0744d'  # avoid-libxul-OOM-python-check.patch
diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in
index 88984a761..1325a4b39 100644
--- a/libre/iceweasel/vendor.js.in
+++ b/libre/iceweasel/vendor.js.in
@@ -4,11 +4,8 @@
 |*| Parabola additions to vendor.js
 |*|
 |*| TODO: Go through this and figure out what's nescessary, remove
-|*| most of it.  This is mostly cargo-cult BS.  For example, disabling
-|*| all the EME stuff... that's already off because of `--disable-eme`
-|*| in `.mozconfig`.  Some of these settings no longer exist.  Some of
-|*| these settings don't do anything on GNU/Linux.
-|*|
+|*| most of it. For example, some of these settings no longer exist.
+|*| Some of these settings don't do anything on GNU/Linux systems.
 |*| However, they don't seem to be causing any of the critical issues.
 \*/