diff --git a/PKGBUILD b/PKGBUILD index b7052142a25ff1af43c1967776f5badd73795bf1..1805a97ebd8690e7d9f2203d0132ee1cf4e46075 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox -pkgver=41.0.1 +pkgver=41.0.2 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('MPL' 'GPL' 'LGPL') url="https://www.mozilla.org/firefox/" depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme' - 'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite') + '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') @@ -25,12 +25,14 @@ 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=('47b2cfc26b17559c26b95a584ab14b6efba132ca371b8aa30da2e2167e0612c3' +sha256sums=('ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e' '4704798b46be00712a87443be8ed6184dfb5d337e8cc74dbe029c0a25a47add6' 'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' + 'd3796311f93328fc8494d75a2123d29e51d52c3f01ffea0977efbfbe12171809' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') @@ -55,6 +57,9 @@ 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 new file mode 100644 index 0000000000000000000000000000000000000000..0d5bbb1d2e86033d361879cdb9d1b6102000adc6 --- /dev/null +++ b/freetype261.patch @@ -0,0 +1,30 @@ + +# 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 +