summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2017-04-30 09:36:52 +0200
committerAndreas Grapentin <andreas@grapentin.org>2017-04-30 09:36:52 +0200
commita3149b364d10452e489ac9073988e337d07fa8ca (patch)
treeaa89a8dcde0067a3aa5bb91dfa0b21135718cfd3
parent199d779e316d7907f784ee4bb300df7baf0df36d (diff)
downloadabslibre-a3149b364d10452e489ac9073988e337d07fa8ca.tar.gz
abslibre-a3149b364d10452e489ac9073988e337d07fa8ca.tar.bz2
abslibre-a3149b364d10452e489ac9073988e337d07fa8ca.zip
updated to iceweasel-53.0-2
-rw-r--r--libre/iceweasel/PKGBUILD13
-rw-r--r--libre/iceweasel/rusty-cheddar.patch10
2 files changed, 19 insertions, 4 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index ee5fbbb3e..a62d5653f 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -31,11 +31,11 @@ _pkgname=firefox
pkgname=iceweasel
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox (Parabola rebranded)."
arch=(i686 x86_64 armv7h)
license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell icu=58.2 libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
+depends=(alsa-lib dbus-glib ffmpeg gtk2 gtk3 hunspell 'icu>=58.2' libevent libvpx libxt mime-types mozilla-common nss sqlite startup-notification ttf-font)
makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip)
makedepends_i686=(cargo)
makedepends_x86_64=("${makedepends_i686[@]}")
@@ -66,7 +66,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.is.$_debver.orig.tar.xz"
fix-wifi-scanner.diff
enable-object-directory-paths.patch
mozilla-1253216.patch
- mozilla-build-arm.patch)
+ mozilla-build-arm.patch
+ rusty-cheddar.patch)
sha256sums=('e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a'
'bc8ef2662c571ee90b6b196372146a63c1895c56967dac2a4f7ec0b45802426b'
'cd99556650055283d3cf0eefe5a60fee9944e8b9c365a2ac983a77635ce6125e'
@@ -83,7 +84,8 @@ sha256sums=('e77dbd8a4681481a5c9ab8ed3a5ac6c19caec8e25dc80f8b56461cfdf52d047a'
'9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
'fbb6011501a74a8ea6d01c041870fcefb7ef2859c134aedc676e5f6452833f65'
- '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a')
+ '56eecee8162c138c442773d66483886f1242c8dd2b16eed5711ae5e63d9b0e3a'
+ 'b0977e49c473a9821c60921a2db2f6792489519c26da854458de3bde74844223')
validpgpkeys=(
'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
)
@@ -125,6 +127,9 @@ prepare() {
\|installLinux| s|true|false|
' browser/base/content/browser-plugins.js
+ # fix rust build
+ patch -Np1 -i "$srcdir/rusty-cheddar.patch"
+
# Load our build config, disable SafeSearch
cp "$srcdir/mozconfig" .mozconfig
diff --git a/libre/iceweasel/rusty-cheddar.patch b/libre/iceweasel/rusty-cheddar.patch
new file mode 100644
index 000000000..90d4d8947
--- /dev/null
+++ b/libre/iceweasel/rusty-cheddar.patch
@@ -0,0 +1,10 @@
+--- firefox-52.0.2/media/libstagefright/binding/mp4parse_capi/Cargo.toml.old 2017-04-30 08:13:46.914577002 +0200
++++ firefox-52.0.2/media/libstagefright/binding/mp4parse_capi/Cargo.toml 2017-04-30 08:11:26.937908128 +0200
+@@ -6,6 +6,7 @@ authors = [
+ "Matthew Gregan <kinetik@flim.org>",
+ "Alfredo Yang <ayang@mozilla.com>",
+ ]
++build = false
+
+ description = "Parser for ISO base media file format (mp4)"
+ documentation = "https://mp4parse-docs.surge.sh/mp4parse/"