diff options
| -rw-r--r-- | PKGBUILD | 25 | ||||
| -rw-r--r-- | firefox-install-dir.patch | 13 | ||||
| -rw-r--r-- | no-crmf.diff | 6 | ||||
| -rw-r--r-- | vendor.js | 48 |
4 files changed, 34 insertions, 58 deletions
@@ -4,16 +4,16 @@ # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox -pkgver=58.0.1 -pkgrel=3 +pkgver=59.0 +pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" -depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg nss hunspell sqlite ttf-font libpulse libvpx icu) makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb - autoconf2.13 rust mercurial clang llvm jack) + autoconf2.13 rust mercurial clang llvm jack gtk2) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -21,24 +21,20 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags !strip !debug) _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" - $pkgname.desktop - firefox-symbolic.svg - firefox-install-dir.patch + $pkgname.desktop firefox-symbolic.svg no-crmf.diff vendor.js) sha256sums=('SKIP' '677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a' '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' - 'a94f80abe65608cd49054a30acc31e4d0885fe5b2a38cf08ded5e5b51b87c99d' - 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' - 'e36cc420ad02d8825e7e835e9853130b12b72218de10da9f07d8599a95700093') + '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873' + 'f5fa8873f8e3890780b857baa3569151921dbf266b9c2af27a43958169303e2c') prepare() { mkdir path ln -s /usr/bin/python2 path/python cd mozilla-unified - patch -Np1 -i ../firefox-install-dir.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 patch -Np1 -i ../no-crmf.diff @@ -57,6 +53,7 @@ ac_add_options --enable-rust-simd ac_add_options --disable-official-branding ac_add_options --enable-update-channel=release ac_add_options --with-distribution-id= +export MOZILLA_OFFICIAL=0 export MOZ_TELEMETRY_REPORTING=0 export MOZ_ADDON_SIGNING=0 export MOZ_REQUIRE_SIGNING=0 @@ -124,14 +121,10 @@ app.distributor.channel=$pkgname app.partner.archlinux=archlinux END - for i in 16 22 24 32 48 256; do + for i in 16 22 24 32 48 64 128 256; do install -Dm644 browser/branding/official/default$i.png \ "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - install -Dm644 browser/branding/official/content/icon64.png \ - "$pkgdir/usr/share/icons/hicolor/64x64/apps/$pkgname.png" - install -Dm644 browser/branding/official/mozicon128.png \ - "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" install -Dm644 browser/branding/official/content/about-logo.png \ "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png" install -Dm644 browser/branding/official/content/about-logo@2x.png \ diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch deleted file mode 100644 index d6aaafa..0000000 --- a/firefox-install-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/config/baseconfig.mk w/config/baseconfig.mk -index e204533ac9b66b88..27ae154ce265ca2b 100644 ---- i/config/baseconfig.mk -+++ w/config/baseconfig.mk -@@ -4,7 +4,7 @@ - # whether a normal build is happening or whether the check is running. - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - ifeq (.,$(DEPTH)) - DIST = dist diff --git a/no-crmf.diff b/no-crmf.diff index 242304e..682ba3f 100644 --- a/no-crmf.diff +++ b/no-crmf.diff @@ -1,9 +1,9 @@ diff --git i/old-configure.in w/old-configure.in -index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +index 12170a47568f..dbbaa0bc9194 100644 --- i/old-configure.in +++ w/old-configure.in -@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi -if test -n "$MOZ_SYSTEM_NSS"; then @@ -22,7 +22,7 @@ pref("beacon.enabled", false); //Conflict pref("breakpad.reportURL", ""); //Conflict //pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); -pref("browser.aboutHomeSnippets.updateUrl", "https://127.0.0.1"); //Conflict +pref("browser.aboutHomeSnippets.updateUrl", "data:,"); //Conflict pref("browser.backspace_action", 2); //pref("browser.bookmarks.max_backups", 15); pref("browser.bookmarks.max_backups", 0); //Conflict @@ -34,8 +34,7 @@ pref("browser.cache.disk.smart_size.enabled", false); //Conflict pref("browser.cache.disk.smart_size.first_run", false); //pref("browser.cache.disk_cache_ssl", true); pref("browser.cache.disk_cache_ssl", false); //Conflict -//pref("browser.cache.frecency_experiment", 0); -pref("browser.cache.frecency_experiment", -1); //Conflict +pref("browser.cache.frecency_experiment", -1); pref("browser.cache.memory.capacity", 1048576); //Hidden pref("browser.cache.offline.enable", false); \pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false); @@ -61,6 +60,7 @@ pref("browser.formfill.enable", false); pref("browser.helperApps.deleteTempFileOnExit", true); pref("browser.laterrun.enabled", false); pref("browser.library.activity-stream.enabled", false); +pref("browser.link.open_newwindow", 3); pref("browser.link.open_newwindow.restriction", 0); pref("browser.migrate.automigrate.enabled", false); //pref("browser.newtab.preload", true); @@ -149,7 +149,9 @@ pref("browser.storageManager.enabled", false); pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); //pref("browser.tabs.crashReporting.sendReport", true); pref("browser.tabs.crashReporting.sendReport", false); //Conflict +pref("browser.tabs.insertRelatedAfterCurrent", true); pref("browser.tabs.remote.allowLinkedWebInFileUriProcess", false); +pref("browser.tabs.selectOwnerOnClose", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.recent.enabled", false); @@ -187,9 +189,6 @@ pref("browser.usedOnWindows10", true); //pref("browser.xul.error_pages.expert_bad_cert", false); pref("browser.xul.error_pages.expert_bad_cert", true); //Conflict -//pref("camera.control.face_detection.enabled", true); -pref("camera.control.face_detection.enabled", false); //Conflict - pref("captivedetect.canonicalURL", ""); //pref("canvas.capturestream.enabled", true); @@ -197,7 +196,6 @@ pref("canvas.capturestream.enabled", false); //Conflict pref("clipboard.autocopy", false); -pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); pref("datareporting.policy.firstRunURL", ""); @@ -219,17 +217,13 @@ pref("dom.caches.enabled", false); //pref("dom.event.clipboardevents.enabled", true); pref("dom.event.clipboardevents.enabled", false); //Conflict pref("dom.event.highrestimestamp.enabled", true); -pref("dom.flyweb.enabled", false); pref("dom.forms.autocomplete.experimental", false); pref("dom.gamepad.extensions.enabled", false); pref("dom.gamepad.non_standard_events.enabled", false); pref("dom.gamepad.test.enabled", false); pref("dom.keyboardevent.dispatch_during_composition", false); -//pref("dom.idle-observers-api.enabled", true); -pref("dom.idle-observers-api.enabled", false); //Conflict pref("dom.imagecapture.enabled", false); -pref("dom.indexedDB.enabled", true); //required by noscript -//pref("dom.indexedDB.enabled", false); //Conflict +pref("dom.indexedDB.enabled", true); pref("dom.input.dirpicker", false); pref("dom.IntersectionObserver.enabled", false); //pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", true); @@ -321,9 +315,11 @@ pref("full-screen-api.warning.timeout", 0); //Conflict pref("font.blacklist.underline_offset", "FangSong,Gulim,GulimChe,MingLiU,MingLiU-ExtB,MingLiU_HKSCS,MingLiU-HKSCS-ExtB,MS Gothic,MS Mincho,MS PGothic,MS PMincho,MS UI Gothic,PMingLiU,PMingLiU-ExtB,SimHei,SimSun,SimSun-ExtB,Hei,Kai,Apple LiGothic,Apple LiSung,Osaka"); +pref("general.useragent.compatMode.firefox", false); //pref("general.warnOnAboutConfig", true); pref("general.warnOnAboutConfig", false); //Conflict +pref("geo.enabled", false); pref("geo.wifi.logging.enabled", false); pref("geo.wifi.uri", ""); pref("geo.wifi.xhr.timeout", 1); @@ -337,19 +333,19 @@ pref("gfx.font_rendering.opentype_svg.enabled", false); pref("gfx.layerscope.enabled", false); pref("gfx.offscreencanvas.enabled", false); +pref("identity.fxaccounts.enabled", false); //Added in Firefox 60 pref("identity.fxaccounts.remote.email.uri", ""); pref("identity.fxaccounts.remote.force_auth.uri", ""); pref("identity.mobilepromo.android", "https://www.mozilla.org/firefox/android/"); pref("identity.mobilepromo.ios", ""); pref("intl.charset.default", "windows-1252"); -pref("intl.locale.matchOS", false); -pref("intl.locale.requested", "en-US"); //Added in Firefox 59 +pref("intl.locale.requested", "en-US"); pref("intl.accept_languages", "en-US, en"); pref("intl.regional_prefs.use_os_locales", false); pref("javascript.options.asmjs", false); -pref("javascript.options.baselinejit.content", false); +pref("javascript.options.baselinejit", false); pref("javascript.options.ion", false); pref("javascript.options.native_regexp", false); pref("javascript.options.shared_memory", false); @@ -376,6 +372,7 @@ pref("media.audio_data.enabled", false); //pref("media.autoplay.enabled", true); pref("media.autoplay.enabled", false); //Conflict //pref("media.block-autoplay-until-in-foreground", false); +pref("media.benchmark.vp9.threshold", 0); pref("media.block-autoplay-until-in-foreground", true); //Conflict pref("media.cache_size", 0); pref("media.decoder-doctor.new-issue-endpoint", ""); @@ -383,8 +380,6 @@ pref("media.eme.enabled", false); pref("media.getusermedia.audiocapture.enabled", false); pref("media.getusermedia.browser.enabled", false); pref("media.getusermedia.noise_enabled", false); -//pref("media.getusermedia.screensharing.allowed_domains", "webex.com,*.webex.com,ciscospark.com,*.ciscospark.com,projectsquared.com,*.projectsquared.com,*.room.co,room.co,beta.talky.io,talky.io,*.clearslide.com,appear.in,*.appear.in,tokbox.com,*.tokbox.com,*.sso.francetelecom.fr,*.si.francetelecom.fr,*.sso.infra.ftgroup,*.multimedia-conference.orange-business.com,*.espacecollaboration.orange-business.com,free.gotomeeting.com,g2m.me,*.g2m.me,*.mypurecloud.com,*.mypurecloud.com.au,spreed.me,*.spreed.me,*.spreed.com,air.mozilla.org,*.circuit.com,*.yourcircuit.com,circuit.siemens.com,yourcircuit.siemens.com,circuitsandbox.net,*.unify.com,tandi.circuitsandbox.net,*.ericsson.net,*.cct.ericsson.net,*.opentok.com,*.conf.meetecho.com,meet.jit.si,*.meet.jit.si,web.stage.speakeasyapp.net,web.speakeasyapp.net,*.hipchat.me,*.beta-wspbx.com,*.wspbx.com,*.unifiedcloudit.com,*.smartboxuc.com,*.smartbox-uc.com,*.panterranetworks.com,pexipdemo.com,*.pexipdemo.com,pex.me,*.pex.me,*.rd.pexip.com,1click.io,*.1click.io,*.fuze.com,*.fuzemeeting.com,*.thinkingphones.com,gotomeeting.com,*.gotomeeting.com,gotowebinar.com,*.gotowebinar.com,gototraining.com,*.gototraining.com,citrix.com,*.citrix.com,expertcity.com,*.expertcity.com,citrixonline.com,*.citrixonline.com,g2m.me,*.g2m.me,gotomeet.me,*.gotomeet.me,gotomeet.at,*.gotomeet.at,miriadaxdes.miriadax.net,certificacion.miriadax.net,miriadax.net,*.wire.com,sylaps.com,*.sylaps.com,bluejeans.com,*.bluejeans.com,*.a.bluejeans.com,*.bbcollab.com"); -pref("media.getusermedia.screensharing.allowed_domains", ""); //Conflict //pref("media.getusermedia.screensharing.enabled", true); pref("media.getusermedia.screensharing.enabled", false); //Conflict pref("media.gmp-gmpopenh264.autoupdate", false); @@ -401,8 +396,6 @@ pref("media.gmp-widevinecdm.enabled", false); pref("media.gmp-widevinecdm.visible", false); pref("media.navigator.enabled", false); pref("media.navigator.video.enabled", false); -//pref("media.ondevicechange.enabled", true); -pref("media.ondevicechange.enabled", false); //Conflict pref("media.ondevicechange.fakeDeviceChangeEvent.enabled", false); pref("media.peerconnection.enabled", false); pref("media.peerconnection.ice.no_host", true); @@ -424,7 +417,7 @@ pref("network.cookie.cookieBehavior", 2); pref("network.cookie.leave-secure-alone", true); //pref("network.cookie.lifetimePolicy", 2); pref("network.cookie.lifetimePolicy", 0); //Conflict //required by ublock origin -pref("network.cookie.thirdparty.nonsecureSessionOnly", true);\ +pref("network.cookie.thirdparty.nonsecureSessionOnly", true); pref("network.cookie.thirdparty.sessionOnly", true); pref("network.dnsCacheEntries", 0); pref("network.dnsCacheExpiration", 0); @@ -446,11 +439,12 @@ pref("network.http.referer.spoofSource", false); //pref("network.http.referer.trimmingPolicy", 2); //Breaks many sites //pref("network.http.referer.XOriginPolicy", 2); //Breaks many sites //pref("network.http.referer.XOriginTrimmingPolicy", 0); //Breaks many sites -//pref("network.http.referer.userControlPolicy", 0); //Breaks many sites -pref("network.http.referer.userControlPolicy", 1); //A better default +pref("network.http.referer.defaultPolicy", 1); //A better default +pref("network.http.referer.defaultPolicy.pbmode", 1); //A better default pref("network.http.spdy.enabled", false); pref("network.http.spdy.enabled.deps", false); pref("network.http.spdy.enabled.http2", false); +pref("network.http.spdy.enabled.http2draft", false); //pref("network.http.speculative-parallel-limit", 6); pref("network.http.speculative-parallel-limit", 0); //Conflict pref("network.http.tailing.enabled", false); @@ -491,6 +485,7 @@ pref("pdfjs.enableWebGL", false); pref("permissions.default.camera", 2); pref("permissions.default.desktop-notification", 2); +pref("permissions.default.geo", 2); pref("permissions.default.microphone", 2); //pref("permissions.default.shortcuts", 2); //pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions"); @@ -588,8 +583,8 @@ pref("security.insecure_password.ui.enabled", true); pref("security.mixed_content.block_active_content", true); //pref("security.mixed_content.block_display_content", false); pref("security.mixed_content.block_display_content", true); //Conflict -pref("security.mixed_content.send_hsts_priming", false); -pref("security.mixed_content.use_hsts", false); +pref("security.mixed_content.send_hsts_priming", false); //Removed in Firefox 59 +pref("security.mixed_content.use_hsts", false); //Removed in Firefox 59 pref("security.nocertdb", true); //pref("security.OCSP.enabled", 1); pref("security.OCSP.enabled", 0); //Conflict @@ -625,7 +620,7 @@ pref("security.tls.version.min", 3); //Conflict //pref("security.tls.version.max", 3); pref("security.tls.version.max", 4); //Conflict //pref("security.xpconnect.plugin.unrestricted", true); -pref("security.xpconnect.plugin.unrestricted", false); //Conflict +pref("security.xpconnect.plugin.unrestricted", false); //Conflict //Removed in Firefox 59 pref("services.blocklist.signing.enforced", true); pref("services.blocklist.update_enabled", false); @@ -653,8 +648,9 @@ pref("toolkit.telemetry.bhrPing.enabled", false); pref("toolkit.telemetry.cachedClientID", ""); pref("toolkit.telemetry.enabled", false); pref("toolkit.telemetry.firstShutdownPing.enabled", false); +pref("toolkit.telemetry.hybridContent.enabled", false); pref("toolkit.telemetry.newProfilePing.enabled", false); -pref("toolkit.telemetry.server", ""); +pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.shutdownPingSender.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); pref("toolkit.telemetry.unified", false); |