[arch-commits] Commit in firefox/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, August 6, 2013 @ 22:45:47
  Author: foutrelis
Revision: 192182

upgpkg: firefox 23.0-1

New upstream release.

Modified:
  firefox/trunk/PKGBUILD
Deleted:
  firefox/trunk/firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch

-------------------------------------------------------------+
 PKGBUILD                                                    |   10 --
 firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch |   36 ----------
 2 files changed, 2 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-06 18:35:21 UTC (rev 192181)
+++ PKGBUILD	2013-08-06 20:45:47 UTC (rev 192182)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=22.0
+pkgver=23.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -20,15 +20,13 @@
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch
-        firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch
         firefox-20.0.1-fixed-loading-icon.png)
-sha256sums=('040d4e7fb5076b6aa25f0d3851f8d98c2a2e72ef1599f4387f09f47f6096515e'
+sha256sums=('2d64bd12cfa80c57e4a7f4156c7b4fde725a6173dfe48e2fac12e1927faf563e'
             '1d750088958ae2a2faf43f9bb3909c3e396f01c6504ba39f09b8ed7fc1b29492'
             'd2a7610393ba259c35e3227b92e02ec91095a95189f56ac93ccdf6732772719c'
             'ded67e8204bd5e1c0c5771c0d2c84ff80c998e1543711e7cd804cfe29e8dd1b0'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1'
-            '2baebe5514aafdeacc5727cdaa5e84433dcbdb06228de546bfe051ab7c061b34'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 
 prepare() {
@@ -38,10 +36,6 @@
   patch -Np1 -i ../firefox-install-dir.patch
   patch -Np1 -i ../shared-libs.patch
 
-  # Should be fixed in Firefox 23
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=817533
-  patch -Np1 -i ../firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch
-
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in

Deleted: firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch
===================================================================
--- firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch	2013-08-06 18:35:21 UTC (rev 192181)
+++ firefox-22.0-do-not-fallback-to-manual-proxy-settings.patch	2013-08-06 20:45:47 UTC (rev 192182)
@@ -1,36 +0,0 @@
-
-# HG changeset patch
-# User Patrick McManus <mcmanus at ducksong.com>
-# Date 1365623297 14400
-# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb
-# Parent  2bb26d742f5ffd2d946291fd3c688dc3d6d34f67
-bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell
-
-diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
---- a/netwerk/base/src/nsProtocolProxyService.cpp
-+++ b/netwerk/base/src/nsProtocolProxyService.cpp
-@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal
- 
-     // Proxy auto config magic...
-     if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) {
-         // Do not query PAC now.
-         *usePACThread = true;
-         return NS_OK;
-     }
- 
--    // proxy info values
-+    // If we aren't in manual proxy configuration mode then we don't
-+    // want to honor any manual specific prefs that might be still set
-+    if (mProxyConfig != PROXYCONFIG_MANUAL)
-+        return NS_OK;
-+
-+    // proxy info values for manual configuration mode
-     const char *type = nullptr;
-     const nsACString *host = nullptr;
-     int32_t port = -1;
- 
-     uint32_t proxyFlags = 0;
- 
-     if ((flags & RESOLVE_PREFER_SOCKS_PROXY) &&
-         !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
-