instead of removing addons, just do not build them in the first place

CHANGELOG.md

@@ -7,6 +7,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project follows the official Firefox releases, but also uses
 [Arch Linux Package Versioning](https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_versioning) to mark individual releases in between versions.
 
+## [75.0-2] - Unreleased
+
+### Added
+
+- DoH disabled by default
+- Remove Internal Plugin Certificates from Mozilla
+
+### Fixed
+
+- Some default addons from Mozilla are now removed (#59)
+
 ## [75.0-1] - 2020-04-08
 
 ### Added

PKGBUILD

@@ -7,7 +7,7 @@ pkgname=librewolf
 _pkgname=LibreWolf
 # how to get ci vars instead?
 pkgver=75.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 aarch64)
 license=(MPL GPL LGPL)
@@ -26,11 +26,13 @@ options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
         "git+https://gitlab.com/${pkgname}-community/browser/common.git"
-        "git+https://gitlab.com/${pkgname}-community/settings.git")
+        "git+https://gitlab.com/${pkgname}-community/settings.git"
+        "remove_addons.patch")
 sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f'
             '0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '70fab85453130a84fd2a1865f1cea660f848f394d689cd744b141927359a5937')
 
 if [[ $CARCH == 'aarch64' ]]; then
   source+=(arm.patch
@@ -124,6 +126,9 @@ ac_add_options --enable-optimize
 END
 fi
 
+  # Remove some pre-installed addons that might be questionable
+  patch -p1 -i ../remove_addons.patch
+
   # Disabling Pocket
   sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build
   # this one only to remove an annoying error message:
@@ -276,12 +281,6 @@ END
 exec /usr/lib/$pkgname/librewolf "\$@"
 END
 
-  # Remove some pre-installed addons that might be questionable
-  rm -f "$pkgdir/usr/lib/$pkgname/browser/features/doh-rollout@mozilla.org.xpi"
-  rm -f "$pkgdir/usr/lib/$pkgname/browser/features/screenshots@mozilla.org.xpi"
-  rm -f "$pkgdir/usr/lib/$pkgname/browser/features/webcompat-reporter@mozilla.org.xpi"
-  rm -f "$pkgdir/usr/lib/$pkgname/browser/features/webcompat@mozilla.org.xpi"
-
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -srfv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/librewolf-bin"

binary_tarball/scripts/3_Configure_Source_Code.sh

@@ -122,6 +122,9 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-libstdcxx-check.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/add-missing-include-functional.patch"
 
+# Remove some pre-installed addons that might be questionable
+patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch
+
 # Disabling Pocket
 printf "\nDisabling Pocket\n";
 sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build

binary_tarball/scripts/5_Configure_Binary_Tarball.sh

@@ -36,13 +36,6 @@ cp -r $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER;
 # Add distribution.ini
 distini="$_EXTRACTED_TARBALL_FOLDER/distribution/distribution.ini"
 
-# Remove some pre-installed addons that might be questionable
-rm -f "$_EXTRACTED_TARBALL_FOLDER/browser/features/doh-rollout@mozilla.org.xpi"
-rm -f "$_EXTRACTED_TARBALL_FOLDER/browser/features/screenshots@mozilla.org.xpi"
-rm -f "$_EXTRACTED_TARBALL_FOLDER/browser/features/webcompat-reporter@mozilla.org.xpi"
-rm -f "$_EXTRACTED_TARBALL_FOLDER/browser/features/webcompat@mozilla.org.xpi"
-
-
 install -Dvm644 /dev/stdin "$distini" <<END
 [Global]
 id=io.gitlab.LibreWolf

remove_addons.patch

@@ -0,0 +1,16 @@
+diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
+index 4c9fa78..df8ea65 100644
+--- a/browser/extensions/moz.build
++++ b/browser/extensions/moz.build
+@@ -5,10 +5,6 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ DIRS += [
+-    'doh-rollout',
+     'formautofill',
+-    'pdfjs',
+-    'screenshots',
+-    'webcompat',
+-    'report-site-issue'
++    'pdfjs'
+ ]