[arch-commits] Commit in firefox/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Wed Jun 14 04:38:19 UTC 2017
Date: Wednesday, June 14, 2017 @ 04:38:18
Author: heftig
Revision: 298791
54.0-1
Added:
firefox/trunk/no-crmf.diff
Modified:
firefox/trunk/PKGBUILD
Deleted:
firefox/trunk/0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
-----------------------------------------------------------------+
0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch | 48 --------
PKGBUILD | 57 ++++------
no-crmf.diff | 15 ++
3 files changed, 43 insertions(+), 77 deletions(-)
Deleted: 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
===================================================================
--- 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch 2017-06-14 04:38:09 UTC (rev 298790)
+++ 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch 2017-06-14 04:38:18 UTC (rev 298791)
@@ -1,48 +0,0 @@
-From bbd48a5613c872883616884cfaf41665b0e4ec9b Mon Sep 17 00:00:00 2001
-From: Ralph Giles <giles at mozilla.com>
-Date: Fri, 10 Feb 2017 12:58:18 -0800
-Subject: [PATCH] Bug 1338655 - Don't try to build mp4parse bindings. r=froydnj
-
-We use the cheddar crate to generate a C header file
-for our mp4parse_capi wrapper crate. Currently we
-do this at code check-in time via update-rust.sh.
-
-Cargo 0.18 and later will try to execute a build.rs
-file in the crate source tree regardless of whether
-it's specified in Cargo.toml so patching out that
-line just results in 'crate cheddar not found'.
-
-This change restores the old behaviour by substituting
-a 'build = false' line instead.
-
-We do have syntex vendored, but we don't currently build
-it by default, so I prefer this solution to just vendoring
-cheddar and generating the header at build time. The syntex
-crate is quite large and adds significantly to our compile
-time.
-
-MozReview-Commit-ID: InJRRODWAdP
-
---HG--
-extra : rebase_source : 29378fcbc86015ce6cc22dc66d38a43ddbac204e
----
- media/libstagefright/binding/mp4parse-cargo.patch | 5 +++--
- media/libstagefright/binding/mp4parse_capi/Cargo.toml | 2 ++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/media/libstagefright/binding/mp4parse_capi/Cargo.toml b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-index aee7ee947151a27c..d7e3f55119d3f4b6 100644
---- a/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-+++ b/media/libstagefright/binding/mp4parse_capi/Cargo.toml
-@@ -18,6 +18,8 @@ exclude = [
- "*.mp4",
- ]
-
-+build = false
-+
- [dependencies]
- byteorder = "1.0.0"
- "mp4parse" = {version = "0.6.0", path = "../mp4parse"}
---
-2.12.2
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-14 04:38:09 UTC (rev 298790)
+++ PKGBUILD 2017-06-14 04:38:18 UTC (rev 298791)
@@ -4,7 +4,7 @@
# Contributor: Jakub Schmidtke <sjakub at gmail.com>
pkgname=firefox
-pkgver=53.0.3
+pkgver=54.0
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
arch=(i686 x86_64)
@@ -11,23 +11,23 @@
license=(MPL GPL LGPL)
url="https://www.mozilla.org/firefox/"
depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
- libvpx libevent nss hunspell sqlite ttf-font icu)
-makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
+ nss hunspell sqlite ttf-font libpulse icu libvpx)
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
autoconf2.13 cargo mercurial)
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
+ 'pulseaudio: Audio support'
'speech-dispatcher: Text-to-Speech')
options=(!emptydirs !makeflags !strip)
_repo=https://hg.mozilla.org/mozilla-unified
source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
- firefox.desktop firefox-symbolic.svg
- 0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
- firefox-install-dir.patch fix-wifi-scanner.diff)
+ $pkgname.desktop firefox-symbolic.svg
+ firefox-install-dir.patch no-crmf.diff fix-wifi-scanner.diff)
sha256sums=('SKIP'
'ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef'
'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
- '413cd6d366d78f325d80ebebccfd0afa0d266b40b2e54b66ba2fa03c15f3ea67'
'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
+ 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb'
'9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -49,12 +49,12 @@
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
+
# https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
patch -Np1 -i ../fix-wifi-scanner.diff
- # https://bugs.archlinux.org/task/53890
- patch -Np1 -i ../0001-Bug-1338655-Don-t-try-to-build-mp4parse-bindings.-r-.patch
-
echo -n "$_google_api_key" >google-api-key
echo -n "$_mozilla_api_key" >mozilla-api-key
@@ -65,6 +65,7 @@
ac_add_options --enable-release
ac_add_options --enable-gold
ac_add_options --enable-pie
+ac_add_options --enable-optimize="-O2"
# Branding
ac_add_options --enable-official-branding
@@ -87,7 +88,6 @@
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
-ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
@@ -97,7 +97,6 @@
# Features
ac_add_options --enable-startup-notification
ac_add_options --enable-crashreporter
-ac_add_options --enable-alsa
ac_add_options --disable-updater
STRIP_FLAGS="--strip-debug"
@@ -125,7 +124,7 @@
cd mozilla-unified
make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
- _vendorjs="$pkgdir/usr/lib/firefox/browser/defaults/preferences/vendor.js"
+ _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
install -Dm644 /dev/stdin "$_vendorjs" <<END
// Use LANG environment variable to choose locale
pref("intl.locale.matchOS", true);
@@ -141,7 +140,7 @@
pref("browser.tabs.remote.autostart", true);
END
- _distini="$pkgdir/usr/lib/firefox/distribution/distribution.ini"
+ _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
install -Dm644 /dev/stdin "$_distini" <<END
[Global]
id=archlinux
@@ -156,35 +155,35 @@
for i in 16 22 24 32 48 256; do
install -Dm644 browser/branding/official/default$i.png \
- "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.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/firefox.png"
+ "$pkgdir/usr/share/icons/hicolor/64x64/apps/$pkgname.png"
install -Dm644 browser/branding/official/mozicon128.png \
- "$pkgdir/usr/share/icons/hicolor/128x128/apps/firefox.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/firefox.png"
+ "$pkgdir/usr/share/icons/hicolor/192x192/apps/$pkgname.png"
install -Dm644 browser/branding/official/content/about-logo at 2x.png \
- "$pkgdir/usr/share/icons/hicolor/384x384/apps/firefox.png"
+ "$pkgdir/usr/share/icons/hicolor/384x384/apps/$pkgname.png"
install -Dm644 ../firefox-symbolic.svg \
- "$pkgdir/usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg"
+ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
- install -Dm644 ../firefox.desktop \
- "$pkgdir/usr/share/applications/firefox.desktop"
+ install -Dm644 ../$pkgname.desktop \
+ "$pkgdir/usr/share/applications/$pkgname.desktop"
# Use system-provided dictionaries
- rm -r "$pkgdir"/usr/lib/firefox/dictionaries
- ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/firefox/dictionaries"
- ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/firefox/hyphenation"
+ rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
+ ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+ ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
# Install a wrapper to avoid confusion about binary path
- install -Dm755 /dev/stdin "$pkgdir/usr/bin/firefox" <<END
+ install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
#!/bin/sh
-exec /usr/lib/firefox/firefox "\$@"
+exec /usr/lib/$pkgname/firefox "\$@"
END
# Replace duplicate binary with wrapper
# https://bugzilla.mozilla.org/show_bug.cgi?id=658850
- ln -srf "$pkgdir/usr/bin/firefox" \
- "$pkgdir/usr/lib/firefox/firefox-bin"
+ ln -srf "$pkgdir/usr/bin/$pkgname" \
+ "$pkgdir/usr/lib/$pkgname/firefox-bin"
}
Added: no-crmf.diff
===================================================================
--- no-crmf.diff (rev 0)
+++ no-crmf.diff 2017-06-14 04:38:18 UTC (rev 298791)
@@ -0,0 +1,15 @@
+diff --git i/old-configure.in w/old-configure.in
+index 0a06e470d2085922..d41c8e9d5dd2dbfb 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])])
+ fi
+
+-if test -n "$MOZ_SYSTEM_NSS"; then
+- NSS_LIBS="$NSS_LIBS -lcrmf"
+-else
++if test -z "$MOZ_SYSTEM_NSS"; then
+ NSS_CFLAGS="-I${DIST}/include/nss"
+ case "${OS_ARCH}" in
+ # Only few platforms have been tested with GYP
More information about the arch-commits
mailing list