diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | freetype26.patch | 30 |
3 files changed, 43 insertions, 9 deletions
@@ -1,8 +1,6 @@ -# Generated by makepkg 4.2.1 -# Thu May 28 23:15:09 UTC 2015 pkgbase = firefox-esr pkgdesc = Standalone web browser from mozilla.org, Extended Support Release - pkgver = 38.0.1 + pkgver = 38.1.0 pkgrel = 1 url = https://www.mozilla.org/en-US/firefox/organizations/ install = firefox.install @@ -45,18 +43,20 @@ pkgbase = firefox-esr conflicts = firefox options = !emptydirs options = !makeflags - source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest-esr/source/firefox-38.0.1esr.source.tar.bz2 + source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest-esr/source/firefox-38.1.0esr.source.tar.bz2 source = mozconfig source = firefox.desktop source = firefox-install-dir.patch source = vendor.js source = firefox-fixed-loading-icon.png - sha256sums = b1135b9613fa87453e8064fbd9c776b4cdb8d5ec7007d6302601e1c2b122fbda + source = freetype26.patch + sha256sums = 85eb5f916aa47a92cf50803dcb35e7fa3a9da29abf5fc91cbb6a70bbbc2618ff sha256sums = ffcb2a0ba2ed08f74931a11043717391ef380234cadccc6f0c13f1186ad80e8b sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826 sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4 sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213 + sha256sums = b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85 pkgname = firefox-esr @@ -4,7 +4,7 @@ # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox-esr -pkgver=38.0.1 +pkgver=38.1.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org, Extended Support Release" arch=('i686' 'x86_64') @@ -26,13 +26,14 @@ install=firefox.install options=('!emptydirs' '!makeflags') source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/latest-esr/source/firefox-${pkgver}esr.source.tar.bz2 mozconfig firefox.desktop firefox-install-dir.patch vendor.js - firefox-fixed-loading-icon.png) -sha256sums=('b1135b9613fa87453e8064fbd9c776b4cdb8d5ec7007d6302601e1c2b122fbda' + firefox-fixed-loading-icon.png freetype26.patch) +sha256sums=('85eb5f916aa47a92cf50803dcb35e7fa3a9da29abf5fc91cbb6a70bbbc2618ff' 'ffcb2a0ba2ed08f74931a11043717391ef380234cadccc6f0c13f1186ad80e8b' 'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' - '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') + '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' + 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85') validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -47,6 +48,9 @@ prepare() { cp ../mozconfig .mozconfig patch -Np1 -i ../firefox-install-dir.patch + # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 + patch -Np1 -i ../freetype26.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/freetype26.patch b/freetype26.patch new file mode 100644 index 000000000000..c1eb494972df --- /dev/null +++ b/freetype26.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User NiLuJe <ninuje@gmail.com> +# Date 1426721573 14400 +# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe +# Parent 35515400af363bfc141353acd474814567c43c54 +Bug 1143411 - Fix build against latest freetype code. r=glandium + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -465,16 +465,17 @@ freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h + freetype.h + ftcache.h ++ftfntfmt.h + ftglyph.h + ftsynth.h + ftoutln.h + ttnameid.h + tttables.h + t1tables.h + ftlcdfil.h + ftsizes.h + |