mirror of
https://abf.rosa.ru/djam/firefox-esr78.git
synced 2025-02-25 10:42:52 +00:00
apply patch to fix compile libproxy
This commit is contained in:
parent
0cefad5c54
commit
d3291e5c27
2 changed files with 29 additions and 1 deletions
|
@ -52,7 +52,8 @@ Patch12: mozilla-42-kde.patch
|
||||||
#Patch13: mozilla-kde-background.patch
|
#Patch13: mozilla-kde-background.patch
|
||||||
Patch34: xulrunner_nojit.patch
|
Patch34: xulrunner_nojit.patch
|
||||||
Patch35: firefox-37-build-with-time-independent-uuids.patch
|
Patch35: firefox-37-build-with-time-independent-uuids.patch
|
||||||
Patch36: firefox-38.0-enable-NTLMv1.patch
|
Patch36: firefox-38.0-enable-NTLMv1.patch
|
||||||
|
Patch42: mozilla-42.0-libproxy.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
# Unable to install addons from https pages
|
# Unable to install addons from https pages
|
||||||
|
@ -183,6 +184,7 @@ Files and macros mainly for building Firefox extensions.
|
||||||
%endif
|
%endif
|
||||||
%patch35 -p1
|
%patch35 -p1
|
||||||
%patch36 -p1
|
%patch36 -p1
|
||||||
|
%patch42 -p1
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch204 -p2 -b .966424
|
%patch204 -p2 -b .966424
|
||||||
|
|
26
mozilla-42.0-libproxy.patch
Normal file
26
mozilla-42.0-libproxy.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||||
|
# Parent 95b421ca30846be2b5d7230d72263e6dff042d0b
|
||||||
|
Bug 1220399 - building with libproxy support fails
|
||||||
|
|
||||||
|
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||||
|
--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||||
|
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
|
||||||
|
@@ -2,16 +2,17 @@
|
||||||
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
|
#include "nsISystemProxySettings.h"
|
||||||
|
#include "mozilla/ModuleUtils.h"
|
||||||
|
#include "nsIServiceManager.h"
|
||||||
|
#include "nsIURI.h"
|
||||||
|
+#include "nsNetCID.h"
|
||||||
|
#include "nsString.h"
|
||||||
|
#include "nsCOMPtr.h"
|
||||||
|
#include "nspr.h"
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include <proxy.h>
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue