mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-19 00:21:40 +00:00
extra/firefox to 61.0-1
This commit is contained in:
Kevin Mihelich
parent
33f640c854
commit
133f3d3dcf
5 changed files with 10 additions and 75 deletions
Binary file not shown.
|
|
@ -6,46 +6,35 @@
|
|||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - mozconfig changes for ARM
|
||||
# - use tarball source
|
||||
# - patch for skia from chromium
|
||||
# - revert change for clang that breaks gcc build on ARM
|
||||
# - upstream patch for AArch64
|
||||
|
||||
buildarch=12
|
||||
highmem=1
|
||||
noautobuild=1
|
||||
|
||||
pkgname=firefox
|
||||
pkgver=60.0.2
|
||||
pkgver=61.0
|
||||
pkgrel=1
|
||||
pkgdesc="Standalone web browser from mozilla.org"
|
||||
arch=(x86_64)
|
||||
license=(MPL GPL LGPL)
|
||||
url="https://www.mozilla.org/firefox/"
|
||||
depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
|
||||
nss hunspell sqlite ttf-font libpulse libvpx icu)
|
||||
nss hunspell-en_US sqlite ttf-font libpulse libvpx icu)
|
||||
makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
|
||||
autoconf2.13 rust mercurial clang llvm jack gtk2)
|
||||
autoconf2.13 rust mercurial clang llvm jack gtk2 python)
|
||||
optdepends=('networkmanager: Location detection via available WiFi networks'
|
||||
'libnotify: Notification integration'
|
||||
'pulseaudio: Audio support'
|
||||
'speech-dispatcher: Text-to-Speech')
|
||||
options=(!emptydirs !makeflags !strip)
|
||||
source=("https://hg.mozilla.org/releases/mozilla-release/archive/FIREFOX_${pkgver//./_}_RELEASE.tar.gz"
|
||||
complete-csd-window-offset-mozilla-1457691.patch.xz
|
||||
0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz
|
||||
$pkgname.desktop firefox-symbolic.svg
|
||||
no-crmf.diff
|
||||
skia_buildfix.patch
|
||||
https://hg.mozilla.org/mozilla-central/raw-rev/537f4d1d837a
|
||||
https://hg.mozilla.org/mozilla-unified/raw-rev/800abe66894d)
|
||||
sha256sums=('b52b4059afa013672e86570965ec2fc49b8e992889d2a7fd9d1a8ad7fdd27b98'
|
||||
'a3fb3c3b6fb775c99afdbad507848b77c5e4bbaac2e8ceeb1bfb47699c4b6268'
|
||||
'8422030440032535d918844263fbd92d39bff207acb5fff55ed0afee38bcf582'
|
||||
https://hg.mozilla.org/mozilla-central/raw-rev/537f4d1d837a)
|
||||
sha256sums=('8354a8c44857e5b0a592b3c3605e0532286a4309020b5d74c1532d8f6fa70bc5'
|
||||
'677e1bde4c6b3cff114345c211805c7c43085038ca0505718a11e96432e9811a'
|
||||
'9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797'
|
||||
'02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
|
||||
'3da0ab55bf92307fe80ed7c9cce6443f5bebc96ba50e751d24f7302786a0406e'
|
||||
'9fa42f3a4ccd255b56f4157119c08ff19df9f972aa25af4cbb685e3683139c24'
|
||||
'23df437b04279e6abac8ee53df9e191dfa93f0079e9d73389f7a460604d749c1')
|
||||
'9fa42f3a4ccd255b56f4157119c08ff19df9f972aa25af4cbb685e3683139c24')
|
||||
|
||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||
# Note: These are for Arch Linux use ONLY. For your own distribution, please
|
||||
|
|
@ -66,15 +55,6 @@ prepare() {
|
|||
|
||||
cd mozilla-release-FIREFOX_${pkgver//./_}_RELEASE
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1283299#c158
|
||||
patch -Np1 -i ../complete-csd-window-offset-mozilla-1457691.patch
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1435212
|
||||
patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
|
||||
patch -Np1 -i ../no-crmf.diff
|
||||
|
||||
echo -n "$_google_api_key" >google-api-key
|
||||
echo -n "$_mozilla_api_key" >mozilla-api-key
|
||||
|
||||
|
|
@ -111,7 +91,6 @@ ac_add_options --with-system-jpeg
|
|||
ac_add_options --with-system-libvpx
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --enable-system-hunspell
|
||||
ac_add_options --enable-system-sqlite
|
||||
ac_add_options --enable-system-ffi
|
||||
|
||||
|
|
@ -132,9 +111,7 @@ END
|
|||
echo "ac_add_options --disable-stylo" >> .mozconfig
|
||||
fi
|
||||
|
||||
patch -p2 -d gfx/skia -i "${srcdir}/skia_buildfix.patch"
|
||||
patch -Rp1 -i ../537f4d1d837a
|
||||
patch -p1 -i ../800abe66894d
|
||||
LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
|
||||
}
|
||||
|
||||
|
|
@ -164,15 +141,15 @@ package() {
|
|||
// Use LANG environment variable to choose locale
|
||||
pref("intl.locale.requested", "");
|
||||
|
||||
// Use system-provided dictionaries
|
||||
pref("spellchecker.dictionary_path", "/usr/share/hunspell");
|
||||
|
||||
// Disable default browser checking.
|
||||
pref("browser.shell.checkDefaultBrowser", false);
|
||||
|
||||
// Don't disable our bundled extensions in the application directory
|
||||
pref("extensions.autoDisableScopes", 11);
|
||||
pref("extensions.shownSelectionUI", true);
|
||||
|
||||
// Opt all of us into e10s, instead of just 50%
|
||||
pref("browser.tabs.remote.autostart", true);
|
||||
END
|
||||
|
||||
_distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
|
||||
|
|
@ -202,11 +179,6 @@ END
|
|||
install -Dm644 ../$pkgname.desktop \
|
||||
"$pkgdir/usr/share/applications/$pkgname.desktop"
|
||||
|
||||
# Use system-provided dictionaries
|
||||
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/$pkgname" <<END
|
||||
#!/bin/sh
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
diff --git i/old-configure.in w/old-configure.in
|
||||
index 12170a47568f..dbbaa0bc9194 100644
|
||||
--- i/old-configure.in
|
||||
+++ w/old-configure.in
|
||||
@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
|
||||
AM_PATH_NSS(3.35, [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
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
|
||||
===================================================================
|
||||
--- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
|
||||
+++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
|
||||
@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
|
||||
}
|
||||
|
||||
SI F from_half(U16 h) {
|
||||
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||
return vcvt_f32_f16(h);
|
||||
|
||||
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
|
||||
@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
|
||||
}
|
||||
|
||||
SI U16 to_half(F f) {
|
||||
-#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||
+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
|
||||
return vcvt_f16_f32(f);
|
||||
|
||||
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
|
||||
Loading…
Reference in a new issue