diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch | 35 | ||||
-rw-r--r-- | PKGBUILD | 12 |
3 files changed, 6 insertions, 47 deletions
@@ -35,16 +35,16 @@ pkgbase = firefox-appmenu depends = dbus-glib depends = ffmpeg depends = nss - depends = hunspell-en_US - depends = sqlite depends = ttf-font depends = libpulse + depends = sqlite depends = libvpx depends = icu optdepends = networkmanager: Location detection via available WiFi networks optdepends = libnotify: Notification integration optdepends = pulseaudio: Audio support optdepends = speech-dispatcher: Text-to-Speech + optdepends = hunspell-en_US: Spell checking, American English provides = firefox=63.0.1 conflicts = firefox options = !emptydirs @@ -53,12 +53,10 @@ pkgbase = firefox-appmenu source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_63_0_1_RELEASE source = firefox.desktop source = firefox-symbolic.svg - source = 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch source = unity-menubar.patch sha256sums = SKIP sha256sums = 2adca824b52ab5bc6e7e4fa486c1ecb47d283832bd4b75d10494b033f1cab911 sha256sums = 9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797 - sha256sums = a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f sha256sums = 722324ef522f3e2452f49924e47a2e8a3a547e18aef32d7c1252113eb839451f pkgname = firefox-appmenu diff --git a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch b/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch deleted file mode 100644 index 6fd00ca1c5ad..000000000000 --- a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> -Date: Tue, 30 Oct 2018 22:21:52 +0100 -Subject: [PATCH] Keep mozilla-release building with newer cbindgen versions. - ---- - servo/components/style/cbindgen.toml | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml -index 46162e43db5e..1df99ffc5160 100644 ---- a/servo/components/style/cbindgen.toml -+++ b/servo/components/style/cbindgen.toml -@@ -23,11 +23,17 @@ derive_helper_methods = true - - [export] - prefix = "Style" - include = [ - "StyleAppearance", - "StyleDisplay", - "StyleDisplayMode", - "StyleFillRule", -- "StylePathCommand" -+ "StylePathCommand", -+ -+ "Appearance", -+ "Display", -+ "DisplayMode", -+ "FillRule", -+ "PathCommand" - ] - item_types = ["enums", "structs", "typedefs"] --- -2.17.2 - @@ -5,33 +5,32 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=63.0.1 +pkgver=63.0.3 pkgrel=1 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) license=(MPL GPL LGPL) url="https://aur.archlinux.org/packages/firefox-appmenu/" depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib - ffmpeg nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) + ffmpeg nss ttf-font libpulse sqlite libvpx icu) makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack gtk2 python nodejs python2-psutil cbindgen) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech') + 'speech-dispatcher: Text-to-Speech' + 'hunspell-en_US: Spell checking, American English') provides=("firefox=$pkgver") conflicts=("firefox") options=(!emptydirs !makeflags !strip) _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" $_pkgname.desktop firefox-symbolic.svg - 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch unity-menubar.patch) sha256sums=('SKIP' '2adca824b52ab5bc6e7e4fa486c1ecb47d283832bd4b75d10494b033f1cab911' '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' - 'a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f' '722324ef522f3e2452f49924e47a2e8a3a547e18aef32d7c1252113eb839451f') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -50,9 +49,6 @@ prepare() { mkdir mozbuild cd mozilla-unified - # https://bugzilla.mozilla.org/show_bug.cgi?id=1503401 - patch -Np1 -i ../0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch - # actual appmenu patch from ubuntu repos patch -Np1 -i ../unity-menubar.patch |