diff options
-rw-r--r-- | PKGBUILD | 36 | ||||
-rw-r--r-- | moz.configure.diff | 10 | ||||
-rw-r--r-- | package-manifest.diff | 10 | ||||
-rw-r--r-- | vendor.js | 7 |
4 files changed, 52 insertions, 11 deletions
@@ -7,15 +7,15 @@ # # I maintain this because: # Arch version uses git # Arch version requires signed addons -# Arch version doesn't remove system addons # Arch version lacks privacy and security by default # Arch version doesn't support alsa +# Arch version enables debug symbols # Arch version makepdepends on python2 pkgname=firefox pkgver=64.0 bz2ver=$(echo $pkgver | sed 's/\./_/g') -pkgrel=1 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) license=(MPL GPL LGPL) @@ -32,14 +32,18 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags) source=(firefox-$pkgver.tar.bz2::https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${bz2ver}_RELEASE.tar.bz2 $pkgname.desktop firefox-symbolic.svg - vendor.js) + vendor.js + moz.configure.diff + package-manifest.diff) sha256sums=('5f249e8edcced5531b86a330bf90938bfe414d21a03c25a035b52aeab987870c' '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a' '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' - '3b71a4ae3a1b4a598d5d4f82f83d2941277c8f59064231ffc1dff61415763d6f') + '276c70d2fd6b02eb256eb935dfea3514beafda3f63a28db8aaed62bf7dffeb2d' + 'ad8a270e1b2affb098440f82517c3952207b28ebf604fef695dad3e29a5ba30e' + '02f9b14dc547fa059112e693aece6d6f416708d8f00f1b1d825b8f0692ac72a3') prepare() { - mkdir mozbuild +# mkdir mozbuild cd mozilla-release-FIREFOX_${bz2ver}_RELEASE cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/.mozconfig <<END @@ -62,10 +66,8 @@ export RANLIB=llvm-ranlib ac_add_options --enable-official-branding ac_add_options --enable-update-channel=release ac_add_options --with-distribution-id=org.artixlinux -export MOZ_TELEMETRY_REPORTING=0 export MOZ_ADDON_SIGNING=0 export MOZ_REQUIRE_SIGNING=0 -export MOZ_DATA_REPORTING=0 # System libraries ac_add_options --enable-system-ffi @@ -83,18 +85,27 @@ ac_add_options --enable-alsa ac_add_options --disable-pulseaudio ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter +ac_add_options --disable-debug-symbols ac_add_options --disable-eme ac_add_options --disable-gconf ac_add_options --disable-tests ac_add_options --disable-updater +ac_add_options --disable-webspeech +ac_add_options --disable-webspeechtestbackend ac_add_options --disable-webrtc mk_add_options MOZ_MAKE_FLAGS="-j4" END + cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/build/mozconfig.common.override <<END +export MOZ_TELEMETRY_REPORTING=0 +export MOZ_DATA_REPORTING=0 + +END + # Disable various components at the source level -# sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest + sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/toolkit/components/telemetry/TelemetryStartup.manifest # sed -i 's|[;]1|;0|' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/experiments/Experiments.manifest # sed -i '/pocket/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build # sed -i '/activity-stream/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build @@ -104,6 +115,13 @@ END # sed -i '/onboarding/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build # sed -i '/screenshots/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build # sed -i '/webcompat/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build +# sed -i '/webcompat-reporter/d' $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/extensions/moz.build + +# patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/config/mozconfigs/whitelist $srcdir/whitelist.diff +# patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/config/mozconfigs/linux64/common-opt $srcdir/common-opt.diff + patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/moz.configure $srcdir/moz.configure.diff + patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff +# patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/build/mozconfig.common.override $srcdir/mozconfig.common.override.diff } @@ -112,6 +130,7 @@ build() { cd mozilla-release-FIREFOX_${bz2ver}_RELEASE # mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features # mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/extensions/webcompat-reporter/locales +# mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/services/sync/locales # export MOZ_SOURCE_REPO="$_repo" export MOZ_NOSPAM=1 @@ -119,7 +138,6 @@ build() { # LTO needs more open files ulimit -n 4096 -# patch -p0 $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/browser/installer/package-manifest.in $srcdir/package-manifest.diff ./mach build ./mach buildsymbols } diff --git a/moz.configure.diff b/moz.configure.diff new file mode 100644 index 0000000..e80ae35 --- /dev/null +++ b/moz.configure.diff @@ -0,0 +1,10 @@ +--- a/moz.configure.diff ++++ b/moz.configure.diff +@@ -5,7 +5,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + imply_option('MOZ_PLACES', True) +-imply_option('MOZ_SERVICES_HEALTHREPORT', True) + imply_option('MOZ_SERVICES_SYNC', True) + imply_option('MOZ_DEDICATED_PROFILES', True) + imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True) diff --git a/package-manifest.diff b/package-manifest.diff new file mode 100644 index 0000000..db61656 --- /dev/null +++ b/package-manifest.diff @@ -0,0 +1,10 @@ +--- a/package-manifest.in ++++ b/package-manifest.in +@@ -419,7 +419,6 @@ @RESPATH@/browser/chrome/icons/default/default48.png + @RESPATH@/browser/chrome/icons/default/default64.png + @RESPATH@/browser/chrome/icons/default/default128.png + #endif +-@RESPATH@/browser/features/* + + ; [Webide Files] + @RESPATH@/browser/chrome/webide@JAREXT@ @@ -85,14 +85,14 @@ pref("browser.newtabpage.activity-stream.asrouterExperimentEnabled", false); pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", ""); pref("browser.newtabpage.activity-stream.asrouter.providers.onboarding", ""); //FIXME pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", ""); -pref("browser.newtabpage.activity-stream.asrouter.providersbrowser.newtabpage.activity-stream.default.sites.snippets", ""); pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr", false); //FIXME pref("browser.newtabpage.activity-stream.default.sites", ""); //FIXME pref("browser.newtabpage.activity-stream.disableSnippets", true); //FIXME pref("browser.newtabpage.activity-stream.feeds.snippets", false); //FIXME pref("browser.newtabpage.activity-stream.feeds.section.topstories", false); +pref("browser.newtabpage.activity-stream.feeds.section.topstories.options", "") //FIXME pref("browser.newtabpage.activity-stream.feeds.telemetry", false); //FIXME -//pref("browser.newtabpage.activity-stream.impressionId", ""); +pref("browser.newtabpage.activity-stream.fxaccounts.endpoint", ""); pref("browser.newtabpage.activity-stream.section.highlights.includePocket", false); //FIXME pref("browser.newtabpage.activity-stream.showSponsored", false); //FIXME pref("browser.newtabpage.activity-stream.telemetry", false); @@ -488,6 +488,7 @@ pref("middlemouse.contentLoadURL", false); //pref("network.allow-experiments", true); pref("network.allow-experiments", false); //Conflict +pref("network.auth.subresource-http-auth-allow", 1); pref("network.captive-portal-service.enabled", false); //pref("network.cookie.cookieBehavior", 1); pref("network.cookie.cookieBehavior", 2); //Conflict @@ -674,6 +675,7 @@ pref("privacy.use_utc_timezone", true); //pref("reader.parse-on-load.enabled", true); pref("reader.parse-on-load.enabled", false); //Conflict +pref("security.certerrors.recordEventTelemetry", false); pref("security.cert_pinning.enforcement_level", 2); pref("security.csp.enable", true); //pref("security.csp.experimentalEnabled", false); @@ -750,6 +752,7 @@ pref("toolkit.telemetry.archive.enabled", false); //Conflict //pref("toolkit.telemetry.bhrPing.enabled", true); pref("toolkit.telemetry.bhrPing.enabled", false); //Conflict pref("toolkit.telemetry.cachedClientID", ""); +pref("toolkit.telemetry.coverage.opt-out", true); pref("toolkit.telemetry.enabled", false); //pref("toolkit.telemetry.firstShutdownPing.enabled", true); pref("toolkit.telemetry.firstShutdownPing.enabled", false); //Conflict |