Merge branch 'master' into f24
This commit is contained in:
commit
ca79dd7b06
@ -1,6 +1,17 @@
|
|||||||
diff -up mozilla-release/security/certverifier/OCSPCache.h.old mozilla-release/security/certverifier/OCSPCache.h
|
diff -up firefox-48.0/dom/u2f/U2F.cpp.prbool firefox-48.0/dom/u2f/U2F.cpp
|
||||||
--- mozilla-release/security/certverifier/OCSPCache.h.old 2014-10-14 12:33:46.519970732 +0200
|
--- firefox-48.0/dom/u2f/U2F.cpp.prbool 2016-07-26 12:27:56.903381382 +0200
|
||||||
+++ mozilla-release/security/certverifier/OCSPCache.h 2014-10-14 12:34:44.418000625 +0200
|
+++ firefox-48.0/dom/u2f/U2F.cpp 2016-07-26 12:28:08.924399413 +0200
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
* 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 "prtypes.h"
|
||||||
|
#include "hasht.h"
|
||||||
|
#include "mozilla/dom/ContentChild.h"
|
||||||
|
#include "mozilla/dom/CryptoBuffer.h"
|
||||||
|
diff -up firefox-48.0/security/certverifier/OCSPCache.h.prbool firefox-48.0/security/certverifier/OCSPCache.h
|
||||||
|
--- firefox-48.0/security/certverifier/OCSPCache.h.prbool 2016-05-12 19:13:32.000000000 +0200
|
||||||
|
+++ firefox-48.0/security/certverifier/OCSPCache.h 2016-07-26 12:26:56.366290580 +0200
|
||||||
@@ -25,6 +25,7 @@
|
@@ -25,6 +25,7 @@
|
||||||
#ifndef mozilla_psm_OCSPCache_h
|
#ifndef mozilla_psm_OCSPCache_h
|
||||||
#define mozilla_psm_OCSPCache_h
|
#define mozilla_psm_OCSPCache_h
|
||||||
|
@ -3,31 +3,20 @@
|
|||||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||||
|
|
||||||
ac_add_options --prefix="$PREFIX"
|
ac_add_options --prefix="$PREFIX"
|
||||||
ac_add_options --libdir="$LIBDIR"
|
|
||||||
ac_add_options --with-system-zlib
|
ac_add_options --with-system-zlib
|
||||||
ac_add_options --with-system-bz2
|
ac_add_options --with-system-bz2
|
||||||
ac_add_options --enable-system-hunspell
|
ac_add_options --enable-system-hunspell
|
||||||
ac_add_options --with-pthreads
|
ac_add_options --with-pthreads
|
||||||
ac_add_options --disable-strip
|
ac_add_options --disable-strip
|
||||||
ac_add_options --disable-tests
|
ac_add_options --disable-tests
|
||||||
ac_add_options --disable-mochitest
|
#ac_add_options --enable-libnotify
|
||||||
ac_add_options --disable-installer
|
|
||||||
ac_add_options --enable-xinerama
|
|
||||||
ac_add_options --disable-xprint
|
|
||||||
ac_add_options --enable-pango
|
|
||||||
ac_add_options --enable-svg
|
|
||||||
ac_add_options --enable-canvas
|
|
||||||
ac_add_options --disable-javaxpcom
|
|
||||||
ac_add_options --enable-safe-browsing
|
|
||||||
ac_add_options --enable-extensions=default
|
|
||||||
ac_add_options --enable-libnotify
|
|
||||||
ac_add_options --enable-necko-wifi
|
ac_add_options --enable-necko-wifi
|
||||||
ac_add_options --enable-startup-notification
|
ac_add_options --enable-startup-notification
|
||||||
ac_add_options --disable-cpp-exceptions
|
#ac_add_options --disable-cpp-exceptions
|
||||||
ac_add_options --disable-updater
|
ac_add_options --disable-updater
|
||||||
ac_add_options --enable-url-classifier
|
ac_add_options --enable-url-classifier
|
||||||
ac_add_options --enable-gio
|
ac_add_options --enable-gio
|
||||||
ac_add_options --disable-gnomevfs
|
#ac_add_options --disable-gnomevfs
|
||||||
ac_add_options --enable-chrome-format=omni
|
ac_add_options --enable-chrome-format=omni
|
||||||
ac_add_options --enable-pulseaudio
|
ac_add_options --enable-pulseaudio
|
||||||
ac_add_options --with-system-icu
|
ac_add_options --with-system-icu
|
||||||
|
Loading…
Reference in New Issue
Block a user