summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/iceweasel/PKGBUILD24
-rw-r--r--libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch29
-rw-r--r--libre/iceweasel/libre.patch47
-rw-r--r--libre/iceweasel/rust-i686.patch16
4 files changed, 26 insertions, 90 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index f77a200fd..82431b85a 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -20,7 +20,7 @@ _pgo=false
_debname=firefox
_brandingver=50.0
_brandingrel=1
-_debver=50.1.0
+_debver=51.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
_parabolarepo=https://repo.parabola.nu/other/iceweasel
@@ -30,7 +30,7 @@ _pkgname=firefox
pkgname=iceweasel
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=1
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 armv7h)
license=(MPL GPL LGPL)
@@ -61,30 +61,26 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
$pkgname.desktop
$pkgname-install-dir.patch
vendor.js
- rust-i686.patch
fix-wifi-scanner.diff
enable-object-directory-paths.patch
mozilla-1253216.patch
- mozilla-build-arm.patch
- add-bracket-for-sed-4.3-compliance.patch)
-sha256sums=('9400f3d87077b7f9bdd746a52f424f0bd53435ff54412d4a236b2a43acabade3'
- '8924ea69223157369dd26fccf5118ceb7e55e951e863e338cc3c3832f33d3b53'
+ mozilla-build-arm.patch)
+sha256sums=('297e27aeaee5bb98b42c393028b15b02a65869593237f09dfa2cdc5b76567f28'
+ '23b533aa4eebc91022816b2cb12f88b2153b94c0bd27fb1b689c9de3a5c6d82a'
'c9a9f1b712598990ae60810d9e002d340bf0c016e284b11bc4169424b833b641'
'SKIP'
'620e9fef398b2e26c121b6f21da5eefe178a54c9e0320221f5448827d75ab1d4'
- '013af398e97da9e855a143582816bf819e0d9d8d2b0e323d6b832f3df1157fdd'
+ '8fc780677be57f6d1ad1306767ad3470444c9cda1267b3edd250218c3b9ae875'
'32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
'93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
'56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
'87034dbb640f70454b27d1695a6f03b6fd1ab81c82eb4d8c771db925ae03d408'
'3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
'6dfb0ff91dc1428fc06e6f0afd808f8d70d6324fe294c6e07bcf85f7dd4ca372'
- 'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
'9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
- '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a'
- '0b543c953b7357b9b681121006ab1617263dacf611bb2798c8008fc98aebb2e6')
+ '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a')
validpgpkeys=(
'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
'684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
@@ -133,9 +129,6 @@ prepare() {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
patch -Np1 -i ../fix-wifi-scanner.diff
- # Build with the rust targets we actually ship
- patch -Np1 -i ../rust-i686.patch
-
mkdir "$srcdir/path"
ln -s /usr/bin/python2 "$srcdir/path/python"
@@ -148,9 +141,6 @@ prepare() {
sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1329272
- patch -Np1 -i ../add-bracket-for-sed-4.3-compliance.patch
-
# ARM-specific changes:
if [[ "$CARCH" == arm* ]]; then
sed -i '/ac_add_options --enable-rust/d' .mozconfig
diff --git a/libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch b/libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch
deleted file mode 100644
index ab0b26b67..000000000
--- a/libre/iceweasel/add-bracket-for-sed-4.3-compliance.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 66fc64a75617ffc68f16780f60e39c1f368dfd41 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Mon, 9 Jan 2017 14:37:33 +0100
-Subject: [PATCH] bug 1329272: add bracket for sed 4.3 compliance, r=glandium
-
----
- build/autoconf/icu.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
-index 4f46345f435a..794ddcdf4e52 100644
---- a/build/autoconf/icu.m4
-+++ b/build/autoconf/icu.m4
-@@ -67,11 +67,11 @@ if test -n "$USE_ICU"; then
- if test ! -d "$icudir"; then
- AC_MSG_ERROR([Cannot find the ICU directory])
- fi
- fi
-
-- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
-+ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
- if test x"$version" = x; then
- AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
- fi
- MOZ_ICU_VERSION="$version"
-
---
-2.11.0
-
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index a434fef2f..0705835d8 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -1,8 +1,8 @@
diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index c1ef3a4..48e1a16 100644
+index 7f46a7e59..02a94d54c 100644
--- a/browser/base/content/abouthome/aboutHome.css
+++ b/browser/base/content/abouthome/aboutHome.css
-@@ -343,26 +343,46 @@ body[narrow] #restorePreviousSession::before {
+@@ -353,26 +353,46 @@ body[narrow] #restorePreviousSession::before {
width: 32px;
}
@@ -56,7 +56,7 @@ index c1ef3a4..48e1a16 100644
}
/* [HiDPI]
-@@ -435,9 +455,5 @@ body[narrow] #restorePreviousSession::before {
+@@ -445,9 +465,5 @@ body[narrow] #restorePreviousSession::before {
transform: scale(-0.5, 0.5) translateX(24px);
transform-origin: top center;
}
@@ -67,7 +67,7 @@ index c1ef3a4..48e1a16 100644
}
diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index 8943165..cd2efd8 100644
+index 5afe9b97b..70a9b214a 100644
--- a/browser/base/content/abouthome/aboutHome.js
+++ b/browser/base/content/abouthome/aboutHome.js
@@ -9,17 +9,13 @@
@@ -91,7 +91,7 @@ index 8943165..cd2efd8 100644
var searchText;
diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index 655f64b..6dd78e5 100644
+index 01448383b..400069b1a 100644
--- a/browser/base/content/abouthome/aboutHome.xhtml
+++ b/browser/base/content/abouthome/aboutHome.xhtml
@@ -49,10 +49,6 @@
@@ -116,10 +116,10 @@ index 655f64b..6dd78e5 100644
</body>
</html>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index c9a70fc..ab0f1dd 100644
+index 1311c90f1..4051ec0ae 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -32,7 +32,8 @@ browser.jar:
+@@ -31,7 +31,8 @@ browser.jar:
content/browser/abouthome/settings.png (content/abouthome/settings.png)
content/browser/abouthome/restore.png (content/abouthome/restore.png)
content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
@@ -129,7 +129,7 @@ index c9a70fc..ab0f1dd 100644
content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png)
content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png)
content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png)
-@@ -43,7 +44,6 @@ browser.jar:
+@@ -42,7 +43,6 @@ browser.jar:
content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png)
content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
@@ -138,7 +138,7 @@ index c9a70fc..ab0f1dd 100644
content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml)
diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
-index 7e3b57a..6edc89d 100644
+index 7e3b57a79..6edc89d58 100644
--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
@@ -11,14 +11,6 @@
@@ -157,7 +157,7 @@ index 7e3b57a..6edc89d 100644
<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index e078ed5..ce2c5ed 100644
+index e078ed528..ce2c5ed4d 100644
--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -3,17 +3,12 @@
@@ -208,7 +208,7 @@ index e078ed5..ce2c5ed 100644
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index cba600e..cd4e711 100644
+index cba600e81..cd4e71149 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -20,13 +20,20 @@
@@ -239,7 +239,7 @@ index cba600e..cd4e711 100644
</DL><p>
</DL><p>
diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
-index 674a408..d27e97f 100644
+index 674a408d5..d27e97fd5 100644
--- a/devtools/client/locales/en-US/connection-screen.dtd
+++ b/devtools/client/locales/en-US/connection-screen.dtd
@@ -24,7 +24,7 @@
@@ -252,7 +252,7 @@ index 674a408..d27e97f 100644
<!ENTITY remoteHelpSuffix ".">
diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
-index 01447e3..0bc043e 100644
+index 2c67fb514..1dcbbf6ab 100644
--- a/devtools/client/locales/en-US/sourceeditor.properties
+++ b/devtools/client/locales/en-US/sourceeditor.properties
@@ -4,7 +4,7 @@
@@ -265,29 +265,20 @@ index 01447e3..0bc043e 100644
# LOCALIZATION NOTE The correct localization of this file might be to keep it
diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
-index 53385de..fb9a95a 100644
+index 03f1080a8..c946cb78a 100644
--- a/devtools/client/locales/en-US/toolbox.dtd
+++ b/devtools/client/locales/en-US/toolbox.dtd
-@@ -117,7 +117,7 @@ values from browser.dtd. -->
+@@ -93,7 +93,7 @@
- checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
- boolean preference in about:config, in the options panel. -->
<!ENTITY options.enableRemote.label3 "Enable remote debugging">
--<!ENTITY options.enableRemote.tooltip "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
-+<!ENTITY options.enableRemote.tooltip "Turning this option on will allow the developer tools to debug remote Iceweasel instance like Iceweasel OS">
+-<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS">
++<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS">
<!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the
- checkbox that toggles worker debugging, i.e. devtools.debugger.workers
-@@ -146,7 +146,7 @@ values from browser.dtd. -->
- <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
- - the heading of group of checkboxes corresponding to the default developer
- - tools. -->
--<!ENTITY options.selectDefaultTools.label "Default Firefox Developer Tools">
-+<!ENTITY options.selectDefaultTools.label "Default Iceweasel Developer Tools">
-
- <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
- - the heading of group of checkboxes corresponding to the developer tools
diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
-index 5e1a80c..8f375da 100644
+index 5e1a80ccd..8f375da2e 100644
--- a/devtools/client/locales/en-US/webide.dtd
+++ b/devtools/client/locales/en-US/webide.dtd
@@ -2,7 +2,7 @@
@@ -309,7 +300,7 @@ index 5e1a80c..8f375da 100644
<!ENTITY key_quit "W">
<!-- open menu -->
diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
-index 2368ad7..05e39c7 100644
+index 2368ad7f1..05e39c74f 100644
--- a/devtools/client/locales/en-US/webide.properties
+++ b/devtools/client/locales/en-US/webide.properties
@@ -2,8 +2,8 @@
diff --git a/libre/iceweasel/rust-i686.patch b/libre/iceweasel/rust-i686.patch
deleted file mode 100644
index 85512e143..000000000
--- a/libre/iceweasel/rust-i686.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- build/moz.configure/rust.configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
-index cd86b24153debb1b..44911715e25d95e3 100644
---- c/build/moz.configure/rust.configure
-+++ i/build/moz.configure/rust.configure
-@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
- # OpenBSD
- ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
- # Linux
-- ('x86', 'Linux'): 'i586-unknown-linux-gnu',
-+ ('x86', 'Linux'): 'i686-unknown-linux-gnu',
- # Linux
- ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
- # OS X and iOS
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 20:21:31 +0000