diff options
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | firefox-45-disable-data-sharing-infobar.patch | 12 | ||||
-rw-r--r-- | firefox-45-disable-reader.patch | 114 | ||||
-rw-r--r-- | firefox-45-prefs.patch | 9 |
5 files changed, 159 insertions, 9 deletions
@@ -1,8 +1,8 @@ # Generated by makepkg 5.0.0 -# Tue Mar 15 09:38:13 UTC 2016 +# Sat Mar 26 09:10:48 UTC 2016 pkgbase = firefox-esr-privacy pkgdesc = Standalone web browser from mozilla.org - pkgver = 45.0 + pkgver = 45.0.1 pkgrel = 1 url = https://www.mozilla.org/firefox/ install = firefox.install @@ -35,24 +35,28 @@ pkgbase = firefox-esr-privacy depends = sqlite conflicts = firefox options = !emptydirs - source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/45.0esr/source/firefox-45.0esr.source.tar.xz + source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/45.0.1esr/source/firefox-45.0.1esr.source.tar.xz source = firefox-install-dir.patch source = firefox-45-disable-location.services.mozilla.com.patch source = firefox-45-disable-loop-pocket.patch source = firefox-45-disable-sponsored-tiles.patch source = firefox-45-prefs.patch source = firefox-45-disable-telemetry.patch + source = firefox-45-disable-data-sharing-infobar.patch + source = firefox-45-disable-reader.patch source = firefox.desktop source = firefox-fixed-loading-icon.png source = mozconfig validpgpkeys = 2B90598A745E992F315E22C58AB132963A06537A - sha256sums = 0f46f6c2e6b4f7efea2cd688c27b154a2f000cf5a7e5cb676def8a6dbf3839a0 + sha256sums = 1a44568b4d10b208ae21930335a3098aec31cc42dd43ccd6ef659f3c321b7366 sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd sha256sums = 8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103 sha256sums = 4ffefee2f47e2de114df0d8a0c9a7b964d6e6959ce691e274e259ad8fd85682e sha256sums = 1926a3d3b8996cdbdd8b970a12d9880e3272181fd4b07c2c9277ca7290b159c3 - sha256sums = 23e76c382612ef694a4d62cc91996c063266ebb2620cab8149cd22a59ca11293 + sha256sums = 7fc91a81da2a83e7765bdea66944572cb78b87eed71d8f36d6cc6d6cc87b0dff sha256sums = 5f97739f5962c98c94c0cf7a7361d9dac01be1366773cb2b45d2bd5938569fde + sha256sums = 52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b + sha256sums = 01fa29086c1cba4a1fb7ea0e13baea3e210a771ccc67134fbb32de4185e0cb23 sha256sums = 0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630 sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213 sha256sums = 28b56c316c2f3a4072f1f9bb773eb355b204f66805654cb96d5dcda6d2a9a73e @@ -1,6 +1,7 @@ +# firefox-esr-privacy pkgname=firefox-esr-privacy _basever=45 -pkgver=45.0 +pkgver=45.0.1 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') @@ -20,16 +21,20 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}esr/so firefox-${_basever}-disable-sponsored-tiles.patch firefox-${_basever}-prefs.patch firefox-${_basever}-disable-telemetry.patch + firefox-${_basever}-disable-data-sharing-infobar.patch + firefox-${_basever}-disable-reader.patch firefox.desktop firefox-fixed-loading-icon.png mozconfig) -sha256sums=('0f46f6c2e6b4f7efea2cd688c27b154a2f000cf5a7e5cb676def8a6dbf3839a0' +sha256sums=('1a44568b4d10b208ae21930335a3098aec31cc42dd43ccd6ef659f3c321b7366' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103' '4ffefee2f47e2de114df0d8a0c9a7b964d6e6959ce691e274e259ad8fd85682e' '1926a3d3b8996cdbdd8b970a12d9880e3272181fd4b07c2c9277ca7290b159c3' - '23e76c382612ef694a4d62cc91996c063266ebb2620cab8149cd22a59ca11293' + '7fc91a81da2a83e7765bdea66944572cb78b87eed71d8f36d6cc6d6cc87b0dff' '5f97739f5962c98c94c0cf7a7361d9dac01be1366773cb2b45d2bd5938569fde' + '52a94f48e562f98ba0b22b43b1684f6a813872b9c310d6f7567fe91aaab4944b' + '01fa29086c1cba4a1fb7ea0e13baea3e210a771ccc67134fbb32de4185e0cb23' '0bcfe168964338ec9c6e781479f2f8d06aa44f2262d6405ff8fa42983be89630' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' '28b56c316c2f3a4072f1f9bb773eb355b204f66805654cb96d5dcda6d2a9a73e') @@ -47,7 +52,7 @@ prepare() { patch -Np1 -i ${srcdir}/firefox-${_basever}-disable-loop-pocket.patch # Remove loop and pocket source directories rm -fr browser/extensions/loop/ browser/components/pocket/ - + # Disable geo IP lookup on first run patch -Np1 -i ${srcdir}/firefox-${_basever}-disable-location.services.mozilla.com.patch @@ -57,6 +62,12 @@ prepare() { # Disable telemetry options patch -Np1 -i ${srcdir}/firefox-${_basever}-disable-telemetry.patch + # Disable infobar "Firefox automatically sends some data to Mozilla..." + patch -Np1 -i ${srcdir}/firefox-${_basever}-disable-data-sharing-infobar.patch + + # Disable reader view + patch -Np1 -i ${srcdir}/firefox-${_basever}-disable-reader.patch + # Fix build with Fontconfig 2.6 sed -i '/^ftcache.h/a ftfntfmt.h' config/system-headers diff --git a/firefox-45-disable-data-sharing-infobar.patch b/firefox-45-disable-data-sharing-infobar.patch new file mode 100644 index 000000000000..7857f81f237d --- /dev/null +++ b/firefox-45-disable-data-sharing-infobar.patch @@ -0,0 +1,12 @@ +--- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-15 ++++ firefox-45.0esr/browser/base/content/browser.js 2016-03-15 +@@ -1326,9 +1326,6 @@ + gSyncUI.init(); + gFxAccounts.init(); + +- if (AppConstants.MOZ_DATA_REPORTING) +- gDataNotificationInfoBar.init(); +- + gBrowserThumbnails.init(); + + // Add Devtools menuitems and listeners diff --git a/firefox-45-disable-reader.patch b/firefox-45-disable-reader.patch new file mode 100644 index 000000000000..9a3b42c07609 --- /dev/null +++ b/firefox-45-disable-reader.patch @@ -0,0 +1,114 @@ +diff -Naur firefox-45.0esr.bak/browser/base/content/browser.js firefox-45.0esr/browser/base/content/browser.js +--- firefox-45.0esr.bak/browser/base/content/browser.js 2016-03-15 ++++ firefox-45.0esr/browser/base/content/browser.js 2016-03-15 +@@ -251,9 +251,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", + "resource://gre/modules/ReaderMode.jsm"); + +-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", +- "resource:///modules/ReaderParent.jsm"); +- + XPCOMUtils.defineLazyModuleGetter(this, "LoginManagerParent", + "resource://gre/modules/LoginManagerParent.jsm"); + +@@ -4574,7 +4571,6 @@ + } + } + UpdateBackForwardCommands(gBrowser.webNavigation); +- ReaderParent.updateReaderButton(gBrowser.selectedBrowser); + + gGestureSupport.restoreRotationState(); + +diff -Naur firefox-45.0esr.bak/browser/base/content/browser-sets.inc firefox-45.0esr/browser/base/content/browser-sets.inc +--- firefox-45.0esr.bak/browser/base/content/browser-sets.inc 2016-03-15 ++++ firefox-45.0esr/browser/base/content/browser-sets.inc 2016-03-15 +@@ -42,7 +42,6 @@ + <command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/> + <command id="View:PageInfo" oncommand="BrowserPageInfo();"/> + <command id="View:FullScreen" oncommand="BrowserFullScreen();"/> +- <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/> + <command id="cmd_find" + oncommand="gFindBar.onFindCommand();" + observes="isImage"/> +diff -Naur firefox-45.0esr.bak/browser/base/content/browser.xul firefox-45.0esr/browser/base/content/browser.xul +--- firefox-45.0esr.bak/browser/base/content/browser.xul 2016-03-15 ++++ firefox-45.0esr/browser/base/content/browser.xul 2016-03-15 +@@ -731,10 +731,6 @@ + hidden="true" + tooltiptext="&pageReportIcon.tooltip;" + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> +- <image id="reader-mode-button" +- class="urlbar-icon" +- hidden="true" +- onclick="ReaderParent.buttonClick(event);"/> + </hbox> + <hbox id="userContext-icons"> + <label id="userContext-label"/> +diff -Naur firefox-45.0esr.bak/browser/components/nsBrowserGlue.js firefox-45.0esr/browser/components/nsBrowserGlue.js +--- firefox-45.0esr.bak/browser/components/nsBrowserGlue.js 2016-03-15 ++++ firefox-45.0esr/browser/components/nsBrowserGlue.js 2016-03-15 +@@ -177,9 +177,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "WebChannel", + "resource://gre/modules/WebChannel.jsm"); + +-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", +- "resource:///modules/ReaderParent.jsm"); +- + XPCOMUtils.defineLazyModuleGetter(this, "AddonWatcher", + "resource://gre/modules/AddonWatcher.jsm"); + +@@ -850,7 +847,6 @@ + ContentPrefServiceParent.init(); + + LoginManagerParent.init(); +- ReaderParent.init(); + + SelfSupportBackend.init(); + +diff -Naur firefox-45.0esr.bak/browser/components/uitour/UITour.jsm firefox-45.0esr/browser/components/uitour/UITour.jsm +--- firefox-45.0esr.bak/browser/components/uitour/UITour.jsm 2016-03-15 ++++ firefox-45.0esr/browser/components/uitour/UITour.jsm 2016-03-15 +@@ -34,8 +34,6 @@ + "resource://gre/modules/PrivateBrowsingUtils.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", + "resource://gre/modules/ReaderMode.jsm"); +-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent", +- "resource:///modules/ReaderParent.jsm"); + + // See LOG_LEVELS in Console.jsm. Common examples: "All", "Info", "Warn", & "Error". + const PREF_LOG_LEVEL = "browser.uitour.loglevel"; +@@ -722,15 +720,10 @@ + } + + case "forceShowReaderIcon": { +- ReaderParent.forceShowReaderIcon(browser); + break; + } + + case "toggleReaderMode": { +- let targetPromise = this.getTarget(window, "readerMode-urlBar"); +- targetPromise.then(target => { +- ReaderParent.toggleReaderMode({target: target.node}); +- }); + break; + } + } +@@ -1911,7 +1904,6 @@ + } + + if (aFeature == "readinglist") { +- ReaderParent.showReaderModeInfoPanel(browser); + } else { + log.error("startSubTour: Unknown feature option specified"); + return; +diff -Naur firefox-45.0esr.bak/browser/modules/moz.build firefox-45.0esr/browser/modules/moz.build +--- firefox-45.0esr.bak/browser/modules/moz.build 2016-03-15 ++++ firefox-45.0esr/browser/modules/moz.build 2016-03-15 +@@ -33,7 +33,6 @@ + 'offlineAppCache.jsm', + 'PanelFrame.jsm', + 'PluginContent.jsm', +- 'ReaderParent.jsm', + 'RecentWindow.jsm', + 'RemotePrompt.jsm', + 'SelfSupportBackend.jsm', diff --git a/firefox-45-prefs.patch b/firefox-45-prefs.patch index 4b123253b0d5..eb1c0d1ea39b 100644 --- a/firefox-45-prefs.patch +++ b/firefox-45-prefs.patch @@ -28,6 +28,15 @@ diff -Naur firefox-45.0esr.bak/browser/app/profile/firefox.js firefox-45.0esr/br // Limit the number of characters sent to the current search engine to fetch // suggestions. +@@ -346,7 +346,7 @@ + pref("browser.download.animateNotifications", true); + + // This records whether or not the panel has been shown at least once. +-pref("browser.download.panel.shown", false); ++pref("browser.download.panel.shown", true); + + #ifndef XP_MACOSX + pref("browser.helperApps.deleteTempFileOnExit", true); @@ -426,7 +426,7 @@ // Tabbed browser pref("browser.tabs.closeWindowWithLastTab", true); |