From ad2a345859cd5eb8c21e09d9cb5430558bd0f0d7 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <foutrelis@archlinux.org>
Date: Tue, 15 Dec 2015 18:33:40 +0000
Subject: [PATCH] New upstream release.
- Switch to GTK3; still need GTK2 for plugins.
- Use FFmpeg for H264 video playback.
---
PKGBUILD | 21 +++++++--------------
freetype261.patch | 30 ------------------------------
mozconfig | 4 +++-
3 files changed, 10 insertions(+), 45 deletions(-)
delete mode 100644 freetype261.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2cd7222..90de852 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,21 +2,19 @@
# Contributor: Jakub Schmidtke <sjakub@gmail.com>
pkgname=firefox
-pkgver=42.0
-pkgrel=3
+pkgver=43.0
+pkgrel=1
pkgdesc="Standalone web browser from mozilla.org"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
url="https://www.mozilla.org/firefox/"
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme'
'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
- 'xorg-server-xvfb' 'libpulse' 'gst-plugins-base-libs'
- 'inetutils')
+ 'xorg-server-xvfb' 'libpulse' 'inetutils')
optdepends=('networkmanager: Location detection via available WiFi networks'
- 'gst-plugins-good: h.264 video'
- 'gst-libav: h.264 video'
+ 'ffmpeg: H264/AAC decoding'
'upower: Battery API')
install=firefox.install
options=('!emptydirs' '!makeflags')
@@ -25,14 +23,12 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
firefox.desktop
firefox-install-dir.patch
vendor.js
- freetype261.patch
firefox-fixed-loading-icon.png)
-sha256sums=('994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae'
- '4704798b46be00712a87443be8ed6184dfb5d337e8cc74dbe029c0a25a47add6'
+sha256sums=('a5b16741dcce9344ca71e39e0efb0e7e1336ca5160cb9b6b12f8985f402d8fea'
+ 'b8ecaae997c6a9e3b99903be7aa7c02d46cc0c4b7d6334e796fa32dc8eccc692'
'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
'4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
- 'd3796311f93328fc8494d75a2123d29e51d52c3f01ffea0977efbfbe12171809'
'68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -57,9 +53,6 @@ prepare() {
cp ../mozconfig .mozconfig
patch -Np1 -i ../firefox-install-dir.patch
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1194520
- patch -Np1 -i ../freetype261.patch
-
echo -n "$_google_api_key" >google-api-key
echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
diff --git a/freetype261.patch b/freetype261.patch
deleted file mode 100644
index 0d5bbb1..0000000
--- a/freetype261.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla@glandium.org>
-# Date 1439509838 -32400
-# Node ID ffb931f910498504782f4df88206b9cb911b33a4
-# Parent 467ce7a8340d008a5999e57198035d492b7bc79f
-Bug 1194520 - Add a system header wrapper for <freetype/ftfntfmt.h>. r=mshal a=ritu
-
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -453,16 +453,17 @@ foundation/base64.h
- foundation/hexdump.h
- #endif
- fp.h
- fpieee.h
- frame/log.h
- frame/req.h
- freetype/freetype.h
- freetype/ftcache.h
-+freetype/ftfntfmt.h
- freetype/ftglyph.h
- freetype/ftsynth.h
- freetype/ftoutln.h
- freetype/ttnameid.h
- freetype/tttables.h
- freetype/t1tables.h
- freetype/ftlcdfil.h
- freetype/ftsizes.h
-
diff --git a/mozconfig b/mozconfig
index 579e7ce..4024c12 100644
--- a/mozconfig
+++ b/mozconfig
@@ -5,6 +5,7 @@ ac_add_options --libdir=/usr/lib
ac_add_options --enable-pie
ac_add_options --enable-official-branding
+ac_add_options --enable-default-toolkit=cairo-gtk3
# System libraries
ac_add_options --with-system-nspr
@@ -19,13 +20,14 @@ ac_add_options --with-system-icu
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-ffi
+# system cairo without layers acceleration results in choppy video playback
#ac_add_options --enable-system-cairo
ac_add_options --enable-system-pixman
# Features
ac_add_options --enable-startup-notification
ac_add_options --enable-pulseaudio
-ac_add_options --enable-gstreamer=1.0
+ac_add_options --disable-gstreamer
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
--
GitLab