summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/iceweasel/PKGBUILD25
-rw-r--r--libre/iceweasel/iceweasel-fixed-loading-icon.png (renamed from libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png)bin12184 -> 12184 bytes
-rw-r--r--libre/iceweasel/libre.patch54
-rw-r--r--libre/iceweasel/rhbz-966424.patch23
4 files changed, 65 insertions, 37 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 122e6138e..b450b632f 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -12,10 +12,10 @@
_pgo=true
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=31.0
-_debrel=deb3
+_debver=32.0
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -38,7 +38,7 @@ fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gst-plugins-good: h.264 video'
'gst-libav: h.264 video')
-url="http://packages.debian.org/sid/${pkgname}"
+url="http://packages.debian.org/experimental/${pkgname}"
install=iceweasel.install
replaces=('firefox' "${pkgname}-libre")
conflicts=('firefox' "${pkgname}-libre")
@@ -52,16 +52,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
iceweasel.desktop
iceweasel-install-dir.patch
vendor.js
- iceweasel-20.0.1-fixed-loading-icon.png)
-md5sums=('52fc839ddc92223023d98c600075cd9e'
- '11f646159f802ac0bdb4900d9953e9f6'
+ rhbz-966424.patch
+ iceweasel-fixed-loading-icon.png)
+md5sums=('cfc55fb35f740f90736381c6060534de'
+ 'bf737a17c17b2ac01742b84921bbc5d0'
'2f5cb3df42b09fbfeaee5e72e5433ab9'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '038ce8cedafb790041fb9842ad0f21f4'
+ '27f6c4f656600d559629013427f7fa7d'
'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
'1c42509891cf6843660a5f3c69896e80'
'd6d1d8fa09082766ba8df2ca4b898cba'
+ '8c1578232b7a60fa1caa9a0b322d1e2b'
'6e335a517c68488941340ee1c23f97b0')
prepare() {
@@ -86,6 +88,9 @@ prepare() {
# Install to /usr/lib/iceweasel
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch"
+ # https://bugs.archlinux.org/task/41689
+ patch -Np1 -i "$srcdir/rhbz-966424.patch"
+
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
sed -i 's|Adobe Flash|SWF Player|g;
@@ -159,9 +164,9 @@ prepare() {
# Fix tab loading icon (flickers with libpng 1.6)
# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
- # TODO: Remove this; Iceweasel 32 will use CSS animations for the loading icon
+ # TODO: Remove this; Iceweasel 34 might use CSS animations for the loading icon
# https://bugzilla.mozilla.org/show_bug.cgi?id=759252
- cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
+ cp "$srcdir/iceweasel-fixed-loading-icon.png" \
browser/themes/linux/tabbrowser/loading.png
# Remove non-existent file on Makefile.in
diff --git a/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel/iceweasel-fixed-loading-icon.png
index 55f25e591..55f25e591 100644
--- a/libre/iceweasel/iceweasel-20.0.1-fixed-loading-icon.png
+++ b/libre/iceweasel/iceweasel-fixed-loading-icon.png
Binary files differ
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 08704affd..7884ec5ba 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,8 +1,8 @@
diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js 2014-07-23 13:16:30.287622288 -0300
-+++ mozilla-release/browser/app/profile/firefox.js 2014-07-23 13:19:13.362141893 -0300
-@@ -281,11 +281,6 @@
- pref("browser.slowStartup.timeThreshold", 50000);
+--- mozilla-release.orig/browser/app/profile/firefox.js 2014-09-05 17:00:02.762187158 -0300
++++ mozilla-release/browser/app/profile/firefox.js 2014-09-05 17:02:57.786772902 -0300
+@@ -282,11 +282,6 @@
+ pref("browser.slowStartup.timeThreshold", 45000);
pref("browser.slowStartup.maxSamples", 5);
-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
@@ -13,7 +13,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
pref("browser.enable_automatic_image_resizing", true);
pref("browser.chrome.site_icons", true);
pref("browser.chrome.favicons", true);
-@@ -1489,12 +1484,7 @@
+@@ -1540,12 +1535,7 @@
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -639,8 +639,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
if (window.scrollMaxX) {
document.body.setAttribute("narrow", "true");
diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-06-11 23:51:17.789464976 -0300
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-08-26 00:37:44.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-09-05 17:02:57.806773064 -0300
@@ -43,15 +43,6 @@
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
@@ -657,7 +657,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
</div>
<div class="spacer"/>
-@@ -67,6 +58,6 @@
+@@ -71,6 +62,6 @@
<button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
</div>
@@ -666,8 +666,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
</body>
</html>
diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn
---- mozilla-release.orig/browser/base/jar.mn 2014-06-05 22:15:17.000000000 -0300
-+++ mozilla-release/browser/base/jar.mn 2014-06-11 23:51:17.812798511 -0300
+--- mozilla-release.orig/browser/base/jar.mn 2014-08-26 00:37:44.000000000 -0300
++++ mozilla-release/browser/base/jar.mn 2014-09-05 17:05:26.448079382 -0300
@@ -32,7 +32,7 @@
content/browser/abouthome/settings.png (content/abouthome/settings.png)
content/browser/abouthome/restore.png (content/abouthome/restore.png)
@@ -682,12 +682,12 @@ diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/
content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png)
- #ifdef MOZ_SERVICES_HEALTHREPORT
- content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml)
- content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js)
+
+ content/browser/aboutneterror/netError.xhtml (content/aboutneterror/netError.xhtml)
+ content/browser/aboutneterror/netError.css (content/aboutneterror/netError.css)
diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd
---- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-05 22:15:18.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-11 23:51:17.836132046 -0300
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-08-26 00:37:46.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-09-05 17:02:57.820106506 -0300
@@ -13,17 +13,6 @@
<!ENTITY abouthome.searchEngineButton.label "Search">
@@ -705,7 +705,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dt
-
<!ENTITY abouthome.bookmarksButton.label "Bookmarks">
<!ENTITY abouthome.historyButton.label "History">
- <!ENTITY abouthome.settingsButton.label "Settings">
+ <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-16 22:45:07.000000000 -0300
+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-07-23 13:32:03.204266405 -0300
@@ -787,8 +787,8 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
</DL><p>
</DL><p>
diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm
---- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-06-05 22:15:18.000000000 -0300
-+++ mozilla-release/browser/modules/AboutHome.jsm 2014-06-11 23:51:17.926132826 -0300
+--- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-08-26 00:37:46.000000000 -0300
++++ mozilla-release/browser/modules/AboutHome.jsm 2014-09-05 17:07:48.222390205 -0300
@@ -8,7 +8,7 @@
let Ci = Components.interfaces;
let Cu = Components.utils;
@@ -798,9 +798,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -18,66 +18,6 @@
- XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
- "resource://gre/modules/FxAccounts.jsm");
+@@ -20,66 +20,6 @@
+ XPCOMUtils.defineLazyModuleGetter(this, "Promise",
+ "resource://gre/modules/Promise.jsm");
-// Url to fetch snippets, in the urlFormatter service format.
-const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
@@ -865,14 +865,14 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
/**
* This code provides services to the about:home page. Whenever
* about:home needs to do something chrome-privileged, it sends a
-@@ -202,18 +142,9 @@
- ss.promiseInitialized.then(function() {
+@@ -229,18 +169,9 @@
+ }).then(function(engineName) {
let data = {
showRestoreLastSession: ss.canRestoreLastSession,
- snippetsURL: AboutHomeUtils.snippetsURL,
- showKnowYourRights: AboutHomeUtils.showKnowYourRights,
- snippetsVersion: AboutHomeUtils.snippetsVersion,
- defaultEngineName: Services.search.defaultEngine.name
+ defaultEngineName: engineName
};
- if (AboutHomeUtils.showKnowYourRights) {
@@ -885,9 +885,9 @@ diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/bro
target.messageManager.sendAsyncMessage("AboutHome:Update", data);
} else {
diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
---- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-03 04:25:46.017695291 -0300
-+++ mozilla-release/modules/libpref/src/init/all.js 2014-09-03 04:44:10.801521540 -0300
-@@ -4268,19 +4268,6 @@
+--- mozilla-release.orig/modules/libpref/src/init/all.js 2014-09-05 17:00:02.748853744 -0300
++++ mozilla-release/modules/libpref/src/init/all.js 2014-09-05 17:02:57.840106668 -0300
+@@ -4024,19 +4024,6 @@
// Number of stack frames to capture in createObjectURL for about:memory.
pref("memory.blob_report.stack_frames", 0);
diff --git a/libre/iceweasel/rhbz-966424.patch b/libre/iceweasel/rhbz-966424.patch
new file mode 100644
index 000000000..c4c332e9e
--- /dev/null
+++ b/libre/iceweasel/rhbz-966424.patch
@@ -0,0 +1,23 @@
+--- a/toolkit/modules/CertUtils.jsm
++++ b/toolkit/modules/CertUtils.jsm
+@@ -170,17 +170,19 @@ this.checkCert =
+ issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
+ var tokenNames = issuerCert.getAllTokenNames({});
+
+ if (!tokenNames || !tokenNames.some(isBuiltinToken))
+ throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
+ }
+
+ function isBuiltinToken(tokenName) {
+- return tokenName == "Builtin Object Token";
++ return tokenName == "Builtin Object Token" ||
++ tokenName == "Default Trust" ||
++ tokenName == "System Trust";
+ }
+
+ /**
+ * This class implements nsIBadCertListener. Its job is to prevent "bad cert"
+ * security dialogs from being shown to the user. It is better to simply fail
+ * if the certificate is bad. See bug 304286.
+ *
+ * @param aAllowNonBuiltInCerts (optional)
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 04:12:11 +0000