Date: Tuesday, October 14, 2014 @ 18:11:45 Author: foutrelis Revision: 224337
upgpkg: firefox 33.0-1 - New upstream release. - Build with system cairo again (FS#36972). Modified: firefox/trunk/PKGBUILD firefox/trunk/mozconfig firefox/trunk/rhbz-966424.patch -------------------+ PKGBUILD | 12 ++++++------ mozconfig | 2 +- rhbz-966424.patch | 17 ++++------------- 3 files changed, 11 insertions(+), 20 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-10-14 15:56:54 UTC (rev 224336) +++ PKGBUILD 2014-10-14 16:11:45 UTC (rev 224337) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke <sja...@gmail.com> pkgname=firefox -pkgver=32.0.3 +pkgver=33.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=('i686' 'x86_64') @@ -23,13 +23,13 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2{,.asc} mozconfig firefox.desktop firefox-install-dir.patch vendor.js rhbz-966424.patch firefox-fixed-loading-icon.png) -sha256sums=('ae2aa20538d03b392a04663593fb106c0aec2d8bbb78ddac84a88ce7617b1efe' +sha256sums=('1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229' 'SKIP' - '2e04ee3aefb33bb0f9367e6e88c8ded2cb3e8926fce75a71acfb34b0619dc650' + 'c52b0272c11717603168b7eb28efcbbdcb47a72135874aafd051642fcee37a60' 'd2a7610393ba259c35e3227b92e02ec91095a95189f56ac93ccdf6732772719c' 'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd' '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4' - '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' + '4f0046b39a8d98f6e4fc3360ec490cb2416e38c7b3e92699f7e511c206c2c961' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -45,7 +45,7 @@ patch -Np1 -i ../firefox-install-dir.patch # https://bugs.archlinux.org/task/41689 - patch -Np1 -i ../rhbz-966424.patch + patch -Np2 -i ../rhbz-966424.patch echo -n "$_google_api_key" >google-api-key echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig @@ -64,7 +64,7 @@ # Fix tab loading icon (flickers with libpng 1.6) # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - # TODO: Remove this; Firefox 34 might use CSS animations for the loading icon + # TODO: Remove this; Firefox 36 might use CSS animations for the loading icon # https://bugzilla.mozilla.org/show_bug.cgi?id=759252 cp "$srcdir/firefox-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png Modified: mozconfig =================================================================== --- mozconfig 2014-10-14 15:56:54 UTC (rev 224336) +++ mozconfig 2014-10-14 16:11:45 UTC (rev 224337) @@ -18,7 +18,7 @@ ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi -#ac_add_options --enable-system-cairo +ac_add_options --enable-system-cairo ac_add_options --enable-system-pixman # Features Modified: rhbz-966424.patch =================================================================== --- rhbz-966424.patch 2014-10-14 15:56:54 UTC (rev 224336) +++ rhbz-966424.patch 2014-10-14 16:11:45 UTC (rev 224337) @@ -1,11 +1,7 @@ ---- a/toolkit/modules/CertUtils.jsm -+++ b/toolkit/modules/CertUtils.jsm -@@ -170,17 +170,19 @@ this.checkCert = - issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3); - var tokenNames = issuerCert.getAllTokenNames({}); - - if (!tokenNames || !tokenNames.some(isBuiltinToken)) - throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT); +diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm +--- firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 2014-10-14 08:12:14.358697255 +0200 ++++ firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-14 08:17:59.962181908 +0200 +@@ -174,7 +174,9 @@ this.checkCert = } function isBuiltinToken(tokenName) { @@ -16,8 +12,3 @@ } /** - * This class implements nsIBadCertListener. Its job is to prevent "bad cert" - * security dialogs from being shown to the user. It is better to simply fail - * if the certificate is bad. See bug 304286. - * - * @param aAllowNonBuiltInCerts (optional)