mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-24 09:52:13 +08:00
firefox-kde: remove old patches
This commit is contained in:
parent
878c5e36fe
commit
d6a0946b9b
@ -1,13 +0,0 @@
|
||||
--- Makefile.in 2016-01-24 00:23:32.000000000 +0100
|
||||
+++ Makefile_.in 2016-02-06 22:04:04.307320097 +0100
|
||||
@@ -290,6 +290,10 @@
|
||||
pretty-installer:
|
||||
unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
|
||||
|
||||
+
|
||||
+pgo-profile-run:
|
||||
+ $(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
|
||||
+
|
||||
#XXX: this is a hack, since we don't want to clobber for MSVC
|
||||
# PGO support, but we can't do this test in client.mk
|
||||
ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
File diff suppressed because it is too large
Load Diff
@ -1,51 +0,0 @@
|
||||
diff --git i/toolkit/system/gnome/moz.build w/toolkit/system/gnome/moz.build
|
||||
index 0ecde07..206d6eb 100644
|
||||
--- i/toolkit/system/gnome/moz.build
|
||||
+++ w/toolkit/system/gnome/moz.build
|
||||
@@ -5,9 +5,7 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
SOURCES += [
|
||||
- 'nsAlertsIconListener.cpp',
|
||||
'nsGnomeModule.cpp',
|
||||
- 'nsSystemAlertsService.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ENABLE_GCONF']:
|
||||
diff --git i/toolkit/system/gnome/nsGnomeModule.cpp w/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
index 6ecebcc..2f193a3 100644
|
||||
--- i/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
+++ w/toolkit/system/gnome/nsGnomeModule.cpp
|
||||
@@ -20,8 +20,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init)
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPackageKitService, Init)
|
||||
#endif
|
||||
-#include "nsSystemAlertsService.h"
|
||||
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init)
|
||||
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID);
|
||||
@@ -31,7 +29,6 @@ NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID);
|
||||
NS_DEFINE_NAMED_CID(NS_PACKAGEKITSERVICE_CID);
|
||||
#endif
|
||||
-NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID);
|
||||
|
||||
static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
|
||||
#ifdef MOZ_ENABLE_GCONF
|
||||
@@ -42,7 +39,6 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = {
|
||||
{ &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor },
|
||||
{ &kNS_PACKAGEKITSERVICE_CID, false, nullptr, nsPackageKitServiceConstructor },
|
||||
#endif
|
||||
- { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor },
|
||||
{ nullptr }
|
||||
};
|
||||
|
||||
@@ -55,7 +51,6 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = {
|
||||
{ NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID },
|
||||
{ NS_PACKAGEKITSERVICE_CONTRACTID, &kNS_PACKAGEKITSERVICE_CID },
|
||||
#endif
|
||||
- { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID },
|
||||
{ nullptr }
|
||||
};
|
||||
|
@ -1,23 +0,0 @@
|
||||
--- 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);
|
||||
}
|
||||
|
||||
function isBuiltinToken(tokenName) {
|
||||
- return tokenName == "Builtin Object Token";
|
||||
+ return tokenName == "Builtin Object Token" ||
|
||||
+ tokenName == "Default Trust" ||
|
||||
+ tokenName == "System Trust";
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
Loading…
Reference in New Issue
Block a user