diff --git a/.gitignore b/.gitignore index 1922a91420..c82dadbfc7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ ID obj-x86_64-pc-mingw32/ obj-i686-pc-mingw32/ +autom4te.cache/ # Empty marker file that's generated when we check out NSS security/manager/.nss.checkout diff --git a/.vscode/settings.json b/.vscode/settings.json index 87bacea833..34aa20a556 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,8 @@ "ForEach-Object": true, "Get-Item": true, "Test-Path": true + }, + "files.associations": { + "limits.h": "c" } } \ No newline at end of file diff --git a/build/unix/run-mozilla.sh b/build/unix/run-mozilla.sh old mode 100644 new mode 100755 diff --git a/config/config.mk b/config/config.mk index 5569bff742..ca04bb25af 100644 --- a/config/config.mk +++ b/config/config.mk @@ -29,6 +29,23 @@ endif -include $(DEPTH)/.mozconfig.mk +# Darwin's ranlib errors out on archive members without symbols. +# Avoid implicit ranlib via 'ar ... s' and pass ranlib's suppression flag. +ifeq ($(OS_ARCH),Darwin) +AR_FLAGS = cr $@ +HOST_AR_FLAGS = cr $@ +ifneq (,$(findstring -no_warning_for_no_symbols,$(RANLIB))) +RANLIB := $(RANLIB) +else +RANLIB := $(RANLIB) -no_warning_for_no_symbols +endif +ifneq (,$(findstring -no_warning_for_no_symbols,$(HOST_RANLIB))) +HOST_RANLIB := $(HOST_RANLIB) +else +HOST_RANLIB := $(HOST_RANLIB) -no_warning_for_no_symbols +endif +endif + ifndef EXTERNALLY_MANAGED_MAKE_FILE # Import the automatically generated backend file. If this file doesn't exist, # the backend hasn't been properly configured. We want this to be a fatal diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py index fe9a7f6ebb..727c6111ca 100644 --- a/config/expandlibs_exec.py +++ b/config/expandlibs_exec.py @@ -326,7 +326,23 @@ def main(args, proc_callback=None): (options, args) = parser.parse_args(args) with ExpandArgsMore(args) as args: + run_ranlib = False + ranlib_target = None + if options.extract: + # --extract mode is used for archive creation in the recursive + # make backend. On Darwin, run ranlib with the no-symbol warning + # suppression flag to avoid failures on object members that + # intentionally have no symbols. + if sys.platform == 'darwin' and len(args): + ar_basename = os.path.basename(conf.AR) + cmd_basename = os.path.basename(args[0]) + if cmd_basename == ar_basename: + for a in args[1:]: + if os.path.splitext(a)[1] == conf.LIB_SUFFIX: + ranlib_target = a + run_ranlib = True + break args.extract() if options.symbol_order: args.orderSymbols(options.symbol_order) @@ -349,6 +365,15 @@ def main(args, proc_callback=None): sys.stderr.flush() if proc.returncode: return proc.returncode + if run_ranlib and ranlib_target: + ranlib_cmd = ['ranlib', '-no_warning_for_no_symbols', ranlib_target] + ranlib = subprocess.Popen(ranlib_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + (ranlib_out, ranlib_err) = ranlib.communicate() + if ranlib_out: + sys.stderr.write(ranlib_out) + sys.stderr.flush() + if ranlib.returncode: + return ranlib.returncode return 0 if __name__ == '__main__': diff --git a/js/src/old-configure.in b/js/src/old-configure.in index bcfa78f0eb..0b3cab9542 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -113,6 +113,12 @@ else AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB + case "$target" in + *-apple-darwin*) + AR_FLAGS='cr $@' + RANLIB="$RANLIB -no_warning_for_no_symbols" + ;; + esac MOZ_PATH_PROGS(AS, $AS as, $CC) AC_CHECK_PROGS(AR, ar, :) AC_CHECK_PROGS(LD, ld, :) diff --git a/mach b/mach old mode 100644 new mode 100755 diff --git a/media/ffvpx/config_darwin_new.h b/media/ffvpx/config_darwin_new.h new file mode 100644 index 0000000000..cb39d13ca2 --- /dev/null +++ b/media/ffvpx/config_darwin_new.h @@ -0,0 +1,40 @@ +#pragma once + +/* + * Consolidated macOS ffvpx config. + * + * Include defaults first to provide 0-valued fallbacks for missing CONFIG_* + * symbols, then include generated platform config so enabled features keep + * their configured values. + */ + +#include "defaults_disabled.h" +#include "config_darwin64.h" +#include "config_common.h" + +/* + * UXP macOS build policy: keep ffvpx software-only for H.264 paths. + * Force these toggles off even if upstream-generated headers enable them. + */ +#undef CONFIG_H264_D3D11VA_HWACCEL +#define CONFIG_H264_D3D11VA_HWACCEL 0 +#undef CONFIG_H264_DXVA2_HWACCEL +#define CONFIG_H264_DXVA2_HWACCEL 0 +#undef CONFIG_H264_VAAPI_HWACCEL +#define CONFIG_H264_VAAPI_HWACCEL 0 +#undef CONFIG_H264_VDA_HWACCEL +#define CONFIG_H264_VDA_HWACCEL 0 +#undef CONFIG_H264_VIDEOTOOLBOX_HWACCEL +#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 +#undef CONFIG_H264_VDPAU_HWACCEL +#define CONFIG_H264_VDPAU_HWACCEL 0 +#undef CONFIG_H264_VDPAU_DECODER +#define CONFIG_H264_VDPAU_DECODER 0 + +/* Keep transform APIs enabled because avcodec.symbols exports them. */ +#undef CONFIG_DCT +#define CONFIG_DCT 1 +#undef CONFIG_MDCT +#define CONFIG_MDCT 1 +#undef CONFIG_RDFT +#define CONFIG_RDFT 1 diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/media/ffvpx/ffvpxcommon.mozbuild index 12ce6319bf..9019155b95 100644 --- a/media/ffvpx/ffvpxcommon.mozbuild +++ b/media/ffvpx/ffvpxcommon.mozbuild @@ -112,3 +112,10 @@ if CONFIG['CLANG_CL']: '-fmodules-cache-path=' + TOPOBJDIR + '/media/ffpvx', '-fbuiltin-module-map', ] + +if CONFIG['OS_TARGET'] == 'Darwin': + LOCAL_INCLUDES += [ + '/media/ffvpx', + ] + CFLAGS += ['-include', 'config_darwin_new.h'] + CXXFLAGS += ['-include', 'config_darwin_new.h'] \ No newline at end of file diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c index 4f34312e67..f2cd82f25d 100644 --- a/media/ffvpx/libavcodec/allcodecs.c +++ b/media/ffvpx/libavcodec/allcodecs.c @@ -59,6 +59,20 @@ av_register_codec_parser(&ff_##x##_parser); \ } +#ifdef __APPLE__ +#undef REGISTER_ENCODER +#undef REGISTER_DECODER +#undef REGISTER_ENCDEC +#undef REGISTER_HWACCEL +#undef REGISTER_PARSER + +#define REGISTER_ENCODER(X, x) do { } while (0) +#define REGISTER_DECODER(X, x) do { } while (0) +#define REGISTER_ENCDEC(X, x) do { } while (0) +#define REGISTER_HWACCEL(X, x) do { } while (0) +#define REGISTER_PARSER(X, x) do { } while (0) +#endif + static void register_all(void) { /* hardware accelerators */ diff --git a/media/ffvpx/libavcodec/x86/moz.build b/media/ffvpx/libavcodec/x86/moz.build index 99b76894ac..bbb412c712 100644 --- a/media/ffvpx/libavcodec/x86/moz.build +++ b/media/ffvpx/libavcodec/x86/moz.build @@ -3,77 +3,82 @@ # 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/. -SOURCES += [ - 'aacpsdsp.asm', - 'aacpsdsp_init.c', - 'bswapdsp.asm', - 'bswapdsp_init.c', - 'constants.c', - 'dct32.asm', - 'dct_init.c', - 'fdct.c', - 'fdctdsp_init.c', - 'fft.asm', - 'fft_init.c', - 'flacdsp.asm', - 'flacdsp_init.c', - 'fpel.asm', - 'h264_chromamc.asm', - 'h264_chromamc_10bit.asm', - 'h264_deblock.asm', - 'h264_deblock_10bit.asm', - 'h264_idct.asm', - 'h264_idct_10bit.asm', - 'h264_intrapred.asm', - 'h264_intrapred_10bit.asm', - 'h264_intrapred_init.c', - 'h264_qpel.c', - 'h264_qpel_10bit.asm', - 'h264_qpel_8bit.asm', - 'h264_weight.asm', - 'h264_weight_10bit.asm', - 'h264chroma_init.c', - 'h264dsp_init.c', - 'hevc_add_res.asm', - 'hevc_deblock.asm', - 'hevc_idct.asm', - 'hevc_mc.asm', - 'hevc_sao.asm', - 'hevc_sao_10bit.asm', - 'hevcdsp_init.c', - 'idctdsp.asm', - 'idctdsp_init.c', - 'imdct36.asm', - 'mdct15.asm', - 'mdct15_init.c', - 'me_cmp.asm', - 'me_cmp_init.c', - 'mpegaudiodsp.c', - 'pixblockdsp.asm', - 'pixblockdsp_init.c', - 'qpel.asm', - 'sbrdsp.asm', - 'sbrdsp_init.c', - 'simple_idct.asm', - 'simple_idct10.asm', - 'videodsp.asm', - 'videodsp_init.c', - 'vp8dsp.asm', - 'vp8dsp_init.c', - 'vp8dsp_loopfilter.asm', - 'vp9dsp_init.c', - 'vp9dsp_init_10bpp.c', - 'vp9dsp_init_12bpp.c', - 'vp9dsp_init_16bpp.c', - 'vp9intrapred.asm', - 'vp9intrapred_16bpp.asm', - 'vp9itxfm.asm', - 'vp9itxfm_16bpp.asm', - 'vp9lpf.asm', - 'vp9lpf_16bpp.asm', - 'vp9mc.asm', - 'vp9mc_16bpp.asm', -] +if CONFIG['OS_TARGET'] == 'Darwin': + SOURCES += [ + 'x86util_stub.c', + ] +else: + SOURCES += [ + 'aacpsdsp.asm', + 'aacpsdsp_init.c', + 'bswapdsp.asm', + 'bswapdsp_init.c', + 'constants.c', + 'dct32.asm', + 'dct_init.c', + 'fdct.c', + 'fdctdsp_init.c', + 'fft.asm', + 'fft_init.c', + 'flacdsp.asm', + 'flacdsp_init.c', + 'fpel.asm', + 'h264_chromamc.asm', + 'h264_chromamc_10bit.asm', + 'h264_deblock.asm', + 'h264_deblock_10bit.asm', + 'h264_idct.asm', + 'h264_idct_10bit.asm', + 'h264_intrapred.asm', + 'h264_intrapred_10bit.asm', + 'h264_intrapred_init.c', + 'h264_qpel.c', + 'h264_qpel_10bit.asm', + 'h264_qpel_8bit.asm', + 'h264_weight.asm', + 'h264_weight_10bit.asm', + 'h264chroma_init.c', + 'h264dsp_init.c', + 'hevc_add_res.asm', + 'hevc_deblock.asm', + 'hevc_idct.asm', + 'hevc_mc.asm', + 'hevc_sao.asm', + 'hevc_sao_10bit.asm', + 'hevcdsp_init.c', + 'idctdsp.asm', + 'idctdsp_init.c', + 'imdct36.asm', + 'mdct15.asm', + 'mdct15_init.c', + 'me_cmp.asm', + 'me_cmp_init.c', + 'mpegaudiodsp.c', + 'pixblockdsp.asm', + 'pixblockdsp_init.c', + 'qpel.asm', + 'sbrdsp.asm', + 'sbrdsp_init.c', + 'simple_idct.asm', + 'simple_idct10.asm', + 'videodsp.asm', + 'videodsp_init.c', + 'vp8dsp.asm', + 'vp8dsp_init.c', + 'vp8dsp_loopfilter.asm', + 'vp9dsp_init.c', + 'vp9dsp_init_10bpp.c', + 'vp9dsp_init_12bpp.c', + 'vp9dsp_init_16bpp.c', + 'vp9intrapred.asm', + 'vp9intrapred_16bpp.asm', + 'vp9itxfm.asm', + 'vp9itxfm_16bpp.asm', + 'vp9lpf.asm', + 'vp9lpf_16bpp.asm', + 'vp9mc.asm', + 'vp9mc_16bpp.asm', + ] FINAL_LIBRARY = 'mozavcodec' diff --git a/media/ffvpx/libavcodec/x86/x86util_stub.c b/media/ffvpx/libavcodec/x86/x86util_stub.c new file mode 100644 index 0000000000..6595126678 --- /dev/null +++ b/media/ffvpx/libavcodec/x86/x86util_stub.c @@ -0,0 +1,37 @@ +// Stub x86 init hooks for Darwin when x86 asm objects are disabled. +#include + +#include "libavcodec/avcodec.h" +#include "libavcodec/dct.h" +#include "libavcodec/fdctdsp.h" +#include "libavcodec/fft.h" +#include "libavcodec/idctdsp.h" + +void ff_dct_init_x86(DCTContext *s) { + (void)s; +} + +void ff_fdctdsp_init_x86(FDCTDSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth) { + (void)c; + (void)avctx; + (void)high_bit_depth; +} + +void ff_fft_init_x86(FFTContext *s) { + (void)s; +} + +int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, + enum idct_permutation_type perm_type) { + (void)idct_permutation; + (void)perm_type; + return 0; +} + +void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth) { + (void)c; + (void)avctx; + (void)high_bit_depth; +} \ No newline at end of file diff --git a/media/ffvpx/libavutil/avutil.symbols b/media/ffvpx/libavutil/avutil.symbols index 5389778e66..353ea5b558 100644 --- a/media/ffvpx/libavutil/avutil.symbols +++ b/media/ffvpx/libavutil/avutil.symbols @@ -468,6 +468,8 @@ av_xtea_init av_xtea_le_crypt av_xtea_le_init avpriv_alloc_fixed_dsp +avpriv_atomic_int_add_and_fetch +avpriv_atomic_ptr_cas avpriv_cga_font avpriv_dict_set_timestamp avpriv_float_dsp_alloc diff --git a/media/ffvpx/libavutil/moz.build b/media/ffvpx/libavutil/moz.build index 5154b6d7a8..7d99076130 100644 --- a/media/ffvpx/libavutil/moz.build +++ b/media/ffvpx/libavutil/moz.build @@ -8,9 +8,8 @@ if CONFIG['FFVPX_ASFLAGS']: DIRS += ['x86'] -# 'dummy_funcs.c', - SharedLibrary('mozavutil') + SOURCES += [ 'adler32.c', 'aes.c', @@ -43,7 +42,7 @@ SOURCES += [ 'hash.c', 'hmac.c', 'hwcontext.c', - 'hwcontext_cuda.c', + # 'hwcontext_cuda.c', # DISABLED: macOS does not support CUDA/NVCUVID 'imgutils.c', 'integer.c', 'intmath.c', @@ -83,7 +82,7 @@ SOURCES += [ 'xtea.c', ] -SYMBOLS_FILE = 'avutil.symbols' +SYMBOLS_FILE = 'avutil.symbols' NO_VISIBILITY_FLAGS = True OS_LIBS += CONFIG['REALTIME_LIBS'] diff --git a/media/ffvpx/libavutil/x86/asm.h b/media/ffvpx/libavutil/x86/asm.h index 9bff42d628..e1443e5e88 100644 --- a/media/ffvpx/libavutil/x86/asm.h +++ b/media/ffvpx/libavutil/x86/asm.h @@ -75,7 +75,7 @@ typedef int x86_reg; #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) -#if ARCH_X86_64 && defined(PIC) +#if ARCH_X86_64 && (defined(PIC) || defined(__PIC__) || defined(__pic__)) # define BROKEN_RELOCATIONS 1 #endif @@ -103,7 +103,7 @@ typedef int x86_reg; #define LABEL_MANGLE(a) EXTERN_PREFIX #a // Use rip-relative addressing if compiling PIC code on x86-64. -#if ARCH_X86_64 && defined(PIC) +#if ARCH_X86_64 && (defined(PIC) || defined(__PIC__) || defined(__pic__)) # define LOCAL_MANGLE(a) #a "(%%rip)" #else # define LOCAL_MANGLE(a) #a diff --git a/media/ffvpx/libavutil/x86/moz.build b/media/ffvpx/libavutil/x86/moz.build index 0478f93139..327605a96b 100644 --- a/media/ffvpx/libavutil/x86/moz.build +++ b/media/ffvpx/libavutil/x86/moz.build @@ -3,19 +3,24 @@ # 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/. -SOURCES += [ - 'cpu.c', - 'cpuid.asm', - 'emms.asm', - 'fixed_dsp.asm', - 'fixed_dsp_init.c', - 'float_dsp.asm', - 'float_dsp_init.c', - 'imgutils.asm', - 'imgutils_init.c', - 'lls.asm', - 'lls_init.c' -] +if CONFIG['OS_TARGET'] == 'Darwin': + SOURCES += [ + 'x86util_stub.c', + ] +else: + SOURCES += [ + 'cpu.c', + 'cpuid.asm', + 'emms.asm', + 'fixed_dsp.asm', + 'fixed_dsp_init.c', + 'float_dsp.asm', + 'float_dsp_init.c', + 'imgutils.asm', + 'imgutils_init.c', + 'lls.asm', + 'lls_init.c', + ] FINAL_LIBRARY = 'mozavutil' diff --git a/media/ffvpx/libavutil/x86/x86util_stub.c b/media/ffvpx/libavutil/x86/x86util_stub.c new file mode 100644 index 0000000000..f55b64bdd2 --- /dev/null +++ b/media/ffvpx/libavutil/x86/x86util_stub.c @@ -0,0 +1,22 @@ +// Empty stub to satisfy build system on macOS +#include + +// CPU flags: return 0 (no SIMD) +int ff_get_cpu_flags_x86(void) { + return 0; +} + +// Fixed DSP: do nothing +void ff_fixed_dsp_init_x86(void *dsp) { + (void)dsp; +} + +// Float DSP: do nothing +void ff_float_dsp_init_x86(void *fdsp) { + (void)fdsp; +} + +// LLS init: do nothing +void ff_init_lls_x86(void *lls) { + (void)lls; +} \ No newline at end of file diff --git a/modules/zlib/src/moz.build b/modules/zlib/src/moz.build index df181cb0d4..94778a5c1b 100644 --- a/modules/zlib/src/moz.build +++ b/modules/zlib/src/moz.build @@ -19,33 +19,37 @@ if CONFIG['CPU_ARCH'] == 'arm': ] if CONFIG['INTEL_ARCHITECTURE']: - DEFINES['ADLER32_SIMD_SSSE3'] = True - DEFINES['INFLATE_CHUNK_SIMD_SSE2'] = True - DEFINES['CRC32_SIMD_SSE42_PCLMUL'] = True SOURCES += [ - 'adler32_simd.c', - 'crc32_simd.c', - 'crc_folding.c', - 'fill_window_sse.c', - 'inffast_chunk.c', - 'inflate_simd.c', 'x86.c', ] + + if CONFIG['OS_ARCH'] == 'Darwin': + # Keep SIMD/chunkcopy paths disabled on Darwin, but provide fallback + # helper symbols used by crc32/deflate call sites. + DEFINES['ADLER32_SIMD_SSSE3'] = False + DEFINES['INFLATE_CHUNK_SIMD_SSE2'] = False + DEFINES['CRC32_SIMD_SSE42_PCLMUL'] = False + SOURCES += [ + 'simd_darwin_stub.c', + ] + else: + SOURCES += [ + 'adler32_simd.c', + 'crc32_simd.c', + 'crc_folding.c', + 'fill_window_sse.c', + 'inffast_chunk.c', + 'inflate_simd.c', + ] else: SOURCES += [ 'simd_stub.c', ] -if CONFIG['CPU_ARCH'] != 'arm' and not CONFIG['INTEL_ARCHITECTURE']: - SOURCES += [ - 'inflate.c', - ] - if CONFIG['ZLIB_IN_MOZGLUE']: FINAL_LIBRARY = 'mozglue' DEFINES['IMPL_MFBT'] = True else: - # The final library is in config/external/zlib FINAL_LIBRARY = 'zlib' SOURCES += [ @@ -59,8 +63,10 @@ SOURCES += [ 'gzwrite.c', 'infback.c', 'inffast.c', + 'inflate.c', 'inftrees.c', 'trees.c', 'uncompr.c', 'zutil.c', ] + diff --git a/modules/zlib/src/simd_darwin_stub.c b/modules/zlib/src/simd_darwin_stub.c new file mode 100644 index 0000000000..ec88c6d906 --- /dev/null +++ b/modules/zlib/src/simd_darwin_stub.c @@ -0,0 +1,30 @@ +#include + +#include "deflate.h" + +void ZLIB_INTERNAL crc_fold_init(deflate_state *const s) { + (void)s; + assert(0); +} + +void ZLIB_INTERNAL crc_fold_copy(deflate_state *const s, + unsigned char *dst, + const unsigned char *src, + long len) { + (void)s; + (void)dst; + (void)src; + (void)len; + assert(0); +} + +unsigned ZLIB_INTERNAL crc_fold_512to32(deflate_state *const s) { + (void)s; + assert(0); + return 0; +} + +void ZLIB_INTERNAL fill_window_sse(deflate_state *s) { + (void)s; + assert(0); +} diff --git a/mozconfigs/uxp-darwin-x64 b/mozconfigs/uxp-darwin-x64 new file mode 100644 index 0000000000..fb53e9ab7f --- /dev/null +++ b/mozconfigs/uxp-darwin-x64 @@ -0,0 +1,43 @@ +mk_add_options MOZ_MAKE_FLAGS="-j12" + +# Use Clang on MacOS +export CXX="/usr/bin/clang++ -stdlib=libc++ -arch x86_64" +export CC="/usr/bin/clang -arch x86_64" + +# Build for MacOS 10.7 and above +export MACOSX_DEPLOYMENT_TARGET=10.7 + +# Standard build options for Dactyloidae +ac_add_options --enable-application=basilisk +ac_add_options --enable-optimize="-O2" +ac_add_options --enable-strip +ac_add_options --enable-devtools +ac_add_options --enable-av1 +ac_add_options --disable-webrtc +ac_add_options --enable-gamepad +ac_add_options --enable-pie +ac_add_options --enable-update-channel=release +ac_add_options --disable-necko-wifi +ac_add_options --enable-default-toolkit=cairo-cocoa +ac_add_options --disable-updater +ac_add_options --with-pthreads +ac_add_options --enable-official-branding +ac_add_options --disable-accessibility +ac_add_options --disable-debug +ac_add_options --disable-debug-js-modules +ac_add_options --disable-debug-symbols +ac_add_options --disable-tests + +# Set MacOS SDK and target +ac_add_options --with-macos-sdk=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk +ac_add_options --host=x86_64-apple-darwin +ac_add_options --target=x86_64-apple-darwin +ac_add_options --with-macbundle-type=hybrid + +export MOZILLA_OFFICIAL=1 + +# stops the compiler bitching +CXXFLAGS="-std=c++17 -fgnu-keywords" +ac_add_options --disable-jemalloc +# from Dactyloidae Win64 mozconfig +export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason \ No newline at end of file diff --git a/old-configure.in b/old-configure.in index 28f91bcb2b..ef233e433f 100644 --- a/old-configure.in +++ b/old-configure.in @@ -120,6 +120,12 @@ else esac AC_PROG_CXX AC_PROG_RANLIB + case "$target" in + *-apple-darwin*) + AR_FLAGS='cr $@' + RANLIB="$RANLIB -no_warning_for_no_symbols" + ;; + esac MOZ_PATH_PROGS(AS, $AS as, $CC) AC_CHECK_PROGS(AR, ar, :) AC_CHECK_PROGS(LD, ld, :) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 94c68c9267..643ccc9137 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -5,6 +5,7 @@ #include #include /* memset(), memcpy() */ #include +#include #define XML_BUILDING_EXPAT 1 diff --git a/toolkit/themes/shared/mozapps.inc.mn b/toolkit/themes/shared/mozapps.inc.mn index 83fb44fd9d..ce0288900a 100644 --- a/toolkit/themes/shared/mozapps.inc.mn +++ b/toolkit/themes/shared/mozapps.inc.mn @@ -7,22 +7,22 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. -#ifdef MOZ_WEBEXTENSIONS - skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/webextensions/extensionGeneric.svg) - skin/classic/mozapps/extensions/utilities.svg (../../shared/webextensions/utilities.svg) - skin/classic/mozapps/extensions/navigation.png (../../shared/webextensions/navigation.png) - skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/webextensions/alerticon-warning.svg) - skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/webextensions/alerticon-error.svg) - skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg) - skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg) -#endif - skin/classic/mozapps/formautofill/requestAutocomplete.css (../../shared/formautofill/requestAutocomplete.css) - skin/classic/mozapps/plugins/pluginProblem.css (../../shared/plugins/pluginProblem.css) - skin/classic/mozapps/aboutNetworking.css (../../shared/aboutNetworking.css) - skin/classic/mozapps/aboutProfiles.css (../../shared/aboutProfiles.css) - skin/classic/mozapps/aboutServiceWorkers.css (../../shared/aboutServiceWorkers.css) - skin/classic/mozapps/plugins/contentPluginActivate.png (../../shared/plugins/contentPluginActivate.png) - skin/classic/mozapps/plugins/contentPluginBlocked.png (../../shared/plugins/contentPluginBlocked.png) - skin/classic/mozapps/plugins/contentPluginClose.png (../../shared/plugins/contentPluginClose.png) - skin/classic/mozapps/plugins/contentPluginCrashed.png (../../shared/plugins/contentPluginCrashed.png) - skin/classic/mozapps/plugins/contentPluginStripe.png (../../shared/plugins/contentPluginStripe.png) +# Entire file disabled to prevent duplicate manifest entries during macOS builds. + +# skin/classic/mozapps/extensions/extensionGeneric.svg (../../shared/webextensions/extensionGeneric.svg) +# skin/classic/mozapps/extensions/navigation.png (../../shared/webextensions/navigation.png) +# skin/classic/mozapps/extensions/alerticon-warning.svg (../../shared/webextensions/alerticon-warning.svg) +# skin/classic/mozapps/extensions/alerticon-error.svg (../../shared/webextensions/alerticon-error.svg) +# skin/classic/mozapps/extensions/alerticon-info-positive.svg (../../shared/webextensions/alerticon-info-positive.svg) +# skin/classic/mozapps/extensions/alerticon-info-negative.svg (../../shared/webextensions/alerticon-info-negative.svg) + +# skin/classic/mozapps/formautofill/requestAutocomplete.css (../../shared/formautofill/requestAutocomplete.css) +# skin/classic/mozapps/plugins/pluginProblem.css (../../shared/plugins/pluginProblem.css) +# skin/classic/mozapps/aboutNetworking.css (../../shared/aboutNetworking.css) +# skin/classic/mozapps/aboutProfiles.css (../../shared/aboutProfiles.css) +# skin/classic/mozapps/aboutServiceWorkers.css (../../shared/aboutServiceWorkers.css) +# skin/classic/mozapps/plugins/contentPluginActivate.png (../../shared/plugins/contentPluginActivate.png) +# skin/classic/mozapps/plugins/contentPluginBlocked.png (../../shared/plugins/contentPluginBlocked.png) +# skin/classic/mozapps/plugins/contentPluginClose.png (../../shared/plugins/contentPluginClose.png) +# skin/classic/mozapps/plugins/contentPluginCrashed.png (../../shared/plugins/contentPluginCrashed.png) +# skin/classic/mozapps/plugins/contentPluginStripe.png (../../shared/plugins/contentPluginStripe.png) diff --git a/toolkit/themes/shared/webextensions/alerticon-error.svg b/toolkit/themes/shared/webextensions/alerticon-error.svg deleted file mode 100644 index 04acb4f826..0000000000 --- a/toolkit/themes/shared/webextensions/alerticon-error.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/toolkit/themes/shared/webextensions/alerticon-info-negative.svg b/toolkit/themes/shared/webextensions/alerticon-info-negative.svg deleted file mode 100644 index 5175b2540b..0000000000 --- a/toolkit/themes/shared/webextensions/alerticon-info-negative.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/toolkit/themes/shared/webextensions/alerticon-info-positive.svg b/toolkit/themes/shared/webextensions/alerticon-info-positive.svg deleted file mode 100644 index 1da00b44d7..0000000000 --- a/toolkit/themes/shared/webextensions/alerticon-info-positive.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/toolkit/themes/shared/webextensions/alerticon-warning.svg b/toolkit/themes/shared/webextensions/alerticon-warning.svg deleted file mode 100644 index 7831e085f1..0000000000 --- a/toolkit/themes/shared/webextensions/alerticon-warning.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/toolkit/themes/shared/webextensions/extensionGeneric.svg b/toolkit/themes/shared/webextensions/extensionGeneric.svg deleted file mode 100644 index 28c2f7ba38..0000000000 --- a/toolkit/themes/shared/webextensions/extensionGeneric.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/toolkit/themes/shared/webextensions/extensions.inc.css b/toolkit/themes/shared/webextensions/extensions.inc.css deleted file mode 100644 index c4523bbe64..0000000000 --- a/toolkit/themes/shared/webextensions/extensions.inc.css +++ /dev/null @@ -1,1082 +0,0 @@ -%if 0 -/* 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/. */ -%endif -@import url("chrome://global/skin/in-content/common.css"); - -.main-content { - padding: 0; -} - -#nav-header { - min-height: 39px; - background-color: #424f5a; -} - -.view-pane > .list > scrollbox { - padding-right: 48px; - padding-left: 48px; -} - - -/*** global warnings ***/ - -.global-warning-container { - overflow-x: hidden; -} - -.global-warning { - -moz-box-align: center; - padding: 0 8px; - color: #c8a91e; - font-weight: bold; -} - -#addons-page[warning] .global-warning-container { - background-image: linear-gradient(transparent, rgba(255, 255, 0, 0.1)); -} - -#detail-view .global-warning { - padding: 4px 12px; - border-bottom: 1px solid #c1c1c1; -} - -@media (max-width: 600px) { - .global-warning-text { - display: none; - } - - .global-warning .warning-icon { - background-color: #fff; - box-shadow: 0 0 2px 5px #fff; - border-radius: 10px; - } -} - -/*** global informations ***/ - -/* Plugins aren't yet disabled by safemode (bug 342333), - so don't show that warning when viewing plugins. */ -#addons-page[warning="safemode"] .view-pane[type="plugin"] .global-warning-container, -#addons-page[warning="safemode"] #detail-view[loading="true"] .global-warning-container { - background-color: inherit; - background-image: none; -} - - -/*** notification icons ***/ - -.warning-icon, -.error-icon, -.pending-icon, -.info-icon { - width: 16px; - height: 16px; - margin: 3px 0; -} - -.warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); -} - -.error-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.svg"); -} - -.pending-icon, -.info-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.svg"); -} - -.addon-view[pending="disable"] .pending-icon, -.addon-view[pending="uninstall"] .pending-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg"); -} - -/*** view alert boxes ***/ - -.alert-container { - -moz-box-align: center; - margin-right: 48px; - margin-left: 48px; -} - -.alert-spacer-before { - -moz-box-flex: 1; -} - -.alert-spacer-after { - -moz-box-flex: 3; -} - -.alert { - -moz-box-align: center; - padding: 10px; - color: #333; - border: 1px solid #c1c1c1; - border-radius: 2px; - background-color: #ebebeb; -} - -.alert .alert-title { - font-weight: bold; - font-size: 200%; - margin-bottom: 15px; -} - -.alert button { - margin: 1em 2em; -} - -.loading { - list-style-image: url("chrome://global/skin/icons/loading.png"); - padding-left: 20px; - padding-right: 20px; -} - -@media (min-resolution: 1.1dppx) { - .loading > image { - width: 16px; - list-style-image: url("chrome://global/skin/icons/loading@2x.png"); - } -} - -button.warning { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); -} - - -/*** category selector ***/ - -#categories { - padding-top: 0; -} - -.category[selected="true"]:hover { - background-color:#1A2533; -} - -.category[disabled] { - overflow: hidden; - height: 0; - min-height: 0; - opacity: 0; - transition-property: min-height, opacity; - transition-duration: 1s, 0.8s; -} - -.category:not([disabled]) { - min-height: 40px; - transition-property: min-height, opacity; - transition-duration: 1s, 0.8s; -} - -/* Maximize the size of the viewport when the window is small */ -@media (max-width: 800px) { - .category-name { - display: none; - } -} - -.category-badge { - background-color: #55D4FF; - padding: 2px 8px; - margin: 6px 0; - margin-inline-start: 6px; - border-radius: 100%; - color: #FFF; - font-weight: bold; - text-align: center; -} - -.category-badge[value="0"] { - display: none; -} - -#category-search > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-search.png"); -} -#category-discover > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png"); -} -#category-locale > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); -} -#category-extension > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg"); -} -#category-service > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); -} -#category-theme > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png"); -} -#category-plugin > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png"); -} -#category-dictionary > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png"); -} -#category-experiment > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-experiments.png"); -} -#category-availableUpdates > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-available.png"); -} -#category-recentUpdates > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png"); -} - - -/*** header ***/ - -#header { - margin-top: 20px; - margin-bottom: 20px; - margin-right: 48px; - margin-left: 48px; -} - -@media (max-width: 600px) { - #header-search { - width: 12em; - } -} - -.view-header { - margin: 0 48px; - border-bottom: 1px solid #c1c1c1; -} - -#header-utils-btn { - height: 30px; - line-height: 20px; - border-color: #c1c1c1; - background-color: #fbfbfb; - padding-right: 10px; - padding-left: 10px; -} - -#header-utils-btn:not([disabled="true"]):active:hover, -#header-utils-btn[open="true"] { - background-color: #dadada; -} - -.header-button { - -moz-appearance: none; - border: 1px solid; - border-radius: 2px; -} - -.header-button[disabled="true"] > .toolbarbutton-icon { - opacity: 0.4; -} - -.header-button:not([disabled="true"]):hover, -#header-utils-btn:not([disabled="true"]):hover { - background-color: #ebebeb; - cursor: pointer; -} - -.header-button > .toolbarbutton-text { - display: none; -} - -.nav-button { - list-style-image: url(chrome://mozapps/skin/extensions/navigation.png); - margin-top: 15px; - margin-bottom: 15px; - border-color: transparent; -} - -.nav-button:not([disabled="true"]):hover { - border-color: #ebebeb; -} - -#back-btn:-moz-locale-dir(ltr), -#forward-btn:-moz-locale-dir(rtl) { - -moz-image-region: rect(0, 18px, 18px, 0); -} - -#back-btn:-moz-locale-dir(rtl), -#forward-btn:-moz-locale-dir(ltr) { - -moz-image-region: rect(0, 36px, 18px, 18px); -} - - -/*** sorters ***/ - -.sort-controls { - -moz-appearance: none; -} - -.sorter { - height: 35px; - border: none; - border-radius: 0; - background-color: transparent; - color: #536680; - margin: 0; - min-width: 12px !important; - -moz-box-direction: reverse; -} - -.sorter .button-box { - padding-top: 0; - padding-bottom: 0; -} - -.sorter[checkState="1"], -.sorter[checkState="2"] { - background-color: #ebebeb; - box-shadow: 0 -4px 0 0 #ff9500 inset; -} - -.sorter .button-icon { - margin-inline-start: 6px; -} - - -/*** discover view ***/ - -.discover-spacer-before, -.discover-spacer-after { - -moz-box-flex: 1; -} - -#discover-error .alert { - max-width: 45em; - -moz-box-flex: 1; -} - -.discover-logo { - list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png"); - margin-inline-end: 15px; -} - -.discover-title { - font-weight: bold; - font-size: 24px; - font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif; - margin: 0 0 15px 0; -} - -.discover-description { - text-align: justify; - margin: 0 0 15px 0; -} - -.discover-footer { - text-align: justify; -} - - -/*** list ***/ - -.list { - -moz-appearance: none; - margin: 0; - border-width: 0 !important; - background-color: transparent; -} - -.list > scrollbox > .scrollbox-innerbox { - border: 1px dotted transparent; -} - -.list:-moz-focusring > scrollbox > .scrollbox-innerbox { - border-color: #0095dd; -} - -.addon { - color: #444; - border-bottom: 1px solid #c1c1c1; - padding: 5px; - background-origin: border-box; -} - -.addon:not(:only-child):last-child { - border-bottom-width: 0; -} - -.details { - cursor: pointer; - margin: 0; - margin-inline-start: 10px; -} - -.icon-container { - width: 48px; - height: 48px; - margin: 3px 7px; - -moz-box-align: center; - -moz-box-pack: center; -} - -.icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); - max-width: 32px; - max-height: 32px; -} - -.content-inner-container { - margin-inline-end: 5px; -} - -.addon[active="false"] .icon { - filter: grayscale(1); -} - -.addon-view[type="theme"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); -} - -.addon-view[type="locale"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); -} - -.addon-view[type="plugin"] .icon { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); -} - -.addon-view[type="dictionary"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); -} - -.addon-view[type="experiment"] .icon { - list-style-image: url("chrome://mozapps/skin/extensions/experimentGeneric.png"); -} - -.name-container { - font-size: 1.3rem; - font-weight: bold; - -moz-box-align: end; - -moz-box-flex: 1; -} - -.creator { - font-weight: bold; -} - -.description-container { - margin-inline-start: 6px; - -moz-box-align: center; - font-size: 1.25rem; -} - -.description { - margin: 0; -} - -.warning, -.pending, -.error { - margin-inline-start: 48px; - font-weight: bold; - -moz-box-align: center; -} - -.content-container, -.basicinfo-container { - -moz-box-align: start; -} - -.addon[status="installing"] > .content-container { - -moz-box-align: stretch; -} - -.update-info-container { - -moz-box-align: center; -} - -.update-available { - -moz-box-align: end; -} - -.install-status-container { - -moz-box-pack: end; - -moz-box-align: end; -} - -.name-outer-container { - -moz-box-pack: center; -} - -.relnotes-toggle-container, -.icon-outer-container { - -moz-box-pack: start; -} - -.status-container, -.control-container { - -moz-box-pack: end; -} - -.addon-view .warning { - color: #d8b826; -} - -.addon-view .error { - color: #e62117; -} - -.addon-view .pending { - color: #62c44e; -} - -.addon-view[pending="disable"] .pending, -.addon-view[pending="uninstall"] .pending { - color: #898989; -} - -.addon .relnotes-container { - -moz-box-align: start; - margin-inline-start: 6px; - height: 0; - overflow: hidden; - opacity: 0; - transition-property: height, opacity; - transition-duration: 0.5s, 0.5s; -} - -.addon[show-relnotes] .relnotes-container { - opacity: 1; - transition-property: height, opacity; - transition-duration: 0.5s, 0.5s; -} - -.addon .relnotes-header { - font-weight: bold; - margin: 10px 0; -} - -.addon .relnotes-toggle { - -moz-appearance: none; - border: none; - background: transparent; - font-weight: bold; - cursor: pointer; -} - -.addon .relnotes-toggle > .button-box > .button-icon { - padding-inline-start: 4px; -} - -.addon-view[notification], -.addon-view[pending] { - --view-highlight-color: transparent; - background-image: radial-gradient(at 50% 0%, - var(--view-highlight-color) 0%, - transparent 75%); -} -.addon-view[notification="warning"] { - --view-highlight-color: #F9F5E5; -} - -.addon-view[notification="error"] { - --view-highlight-color: #FFE8E9; -} - -.addon-view[pending="enable"], -.addon-view[pending="upgrade"], -.addon-view[pending="install"] { - --view-highlight-color: #EFFAF2; -} - -.addon-view[pending="disable"], -.addon-view[pending="uninstall"] { - --view-highlight-color: #F2F2F2; -} - -.addon[selected] { - background-color: #fafafa; - color: #333; - padding-inline-start: 1px; /* compensate the 4px border */ - border-inline-start: solid 4px #ff9500; -} - -.addon[active="false"] > .content-container > .content-inner-container { - color: #999; -} - -.addon[active="false"][selected] > .content-container > .content-inner-container { - color: #777; -} - - -/*** item - uninstalled ***/ - -.addon[status="uninstalled"] { - border: none; -} - -.addon[status="uninstalled"] > .container { - -moz-box-align: center; - padding: 4px 20px; - background-color: #FDFFA8; - border-radius: 8px; - font-size: 120%; -} - -.addon[status="uninstalled"][selected] { - background-color: transparent; -} - - -/*** search view ***/ - -#search-filter { - padding: 5px 20px; - margin-right: 48px; - margin-left: 48px; - font-size: 120%; - border-bottom: 1px solid #c1c1c1; - overflow-x: hidden; -} - -#search-filter-label { - font-weight: bold; - color: grey; - margin-inline-end: 10px; -} - -#search-allresults-link { - margin-top: 1em; - margin-bottom: 2em; -} - - -/*** detail view ***/ - -#detail-view > .box-inherit { - margin-right: 48px; - margin-left: 48px; -} - -#detail-view .loading { - opacity: 0; -} - -#detail-view[loading-extended] .loading { - opacity: 1; - transition-property: opacity; - transition-duration: 1s; -} - -.detail-view-container { - padding-inline-end: 2em; - padding-bottom: 2em; - font-size: 1.25rem; - color: #333; -} - -#detail-notifications { - margin-top: 1em; - margin-bottom: 2em; -} - -#detail-notifications .warning, -#detail-notifications .pending, -#detail-notifications .error { - margin-inline-start: 0; -} - -#detail-icon-container { - width: 64px; - margin-inline-end: 10px; - margin-top: 6px; -} - -#detail-icon { - max-width: 64px; - max-height: 64px; -} - -#detail-summary { - margin-bottom: 2em; -} - -#detail-name-container { - font-size: 2.5rem; - font-weight: normal; -} - -#detail-screenshot-box { - margin-inline-end: 2em; - background-image: linear-gradient(rgba(255,255,255,.5), transparent); - background-color: white; - box-shadow: 0 1px 2px #666; - border-radius: 2px; -} - -#detail-screenshot { - max-width: 300px; - max-height: 300px; -} - -#detail-screenshot[loading] { - background-image: url("chrome://global/skin/icons/loading.png"); - background-position: 50% 50%; - background-repeat: no-repeat; -} - -@media (min-resolution: 1.1dppx) { - #detail-screenshot[loading] { - background-image: url("chrome://global/skin/icons/loading@2x.png"); - background-size: 16px; - } -} - -#detail-screenshot[loading="error"] { - background-image: url("chrome://global/skin/media/error.png"); -} - -#detail-desc-container { - margin-bottom: 2em; -} - -#detail-desc, #detail-fulldesc { - margin-inline-start: 6px; - /* This is necessary to fix layout issues with multi-line descriptions, see - bug 592712*/ - outline: solid transparent; - white-space: pre-wrap; - min-width: 10em; -} - -#detail-fulldesc { - margin-top: 1em; -} - -#detail-contributions { - border-radius: 2px; - border: 1px solid #D2DBE8; - margin-bottom: 2em; - padding: 1em; - background-color: #F3F7FB; -} - -#detail-contrib-description { - font-style: italic; - margin-bottom: 1em; - color: #373D48; -} - -#detail-contrib-suggested { - color: grey; - font-weight: bold; -} - -#detail-contrib-btn { - color: #FFF; - text-shadow: none; - border: 1px solid #0095dd; - list-style-image: url("chrome://mozapps/skin/extensions/heart.png"); - background-color: #0095dd; -} - -#detail-contrib-btn .button-icon { - margin-inline-end: 5px; -} - -#detail-contrib-btn:not(:active):hover { - border-color: #008acb; - background-color: #008acb; -} - -#detail-contrib-btn:active:hover { - background-color: #006b9d; - border-color: #006b9d; -} - -#detail-grid { - margin-bottom: 2em; -} - -#detail-grid > columns > column:first-child { - min-width: 15em; - max-width: 25em; -} - -.detail-row[first-row="true"], -.detail-row-complex[first-row="true"], -setting[first-row="true"] { - border-top: none; -} - -.detail-row, -.detail-row-complex, -setting { - border-top: 1px solid #c1c1c1; - -moz-box-align: center; - min-height: 35px; - line-height: 20px; - text-shadow: 0 1px 1px #fefffe; -} - -#detail-controls { - margin-bottom: 1em; -} - -.inline-options-browser, -setting[first-row="true"] { - margin-top: 2em; -} - -setting { - -moz-box-align: start; -} - -.preferences-alignment { - min-height: 30px; - -moz-box-align: center; -} - -.preferences-description { - font-size: 90.9%; - color: graytext; - margin-top: -2px; - margin-inline-start: 2em; - white-space: pre-wrap; -} - -.preferences-description:empty { - display: none; -} - -setting[type="radio"] > radiogroup { - -moz-box-orient: horizontal; -} - - -/*** creator ***/ - -.creator > label { - margin-inline-start: 0; - margin-inline-end: 0; -} - -.creator > .text-link { - margin-top: 1px; - margin-bottom: 1px; -} - - -/*** rating ***/ - -.meta-rating { - margin-inline-end: 0; - padding-top: 2px; -} - - -/*** download progress ***/ - -.download-progress { - border: 1px solid #c1c1c1; - border-radius: 2px; - background-color: #fbfbfb; - width: 200px; - height: 30px; - margin: 2px 4px; -} - -.download-progress[mode="undetermined"] { - border-color: #0095dd; -} - -.download-progress .start-cap, -.download-progress[complete] .end-cap, -.download-progress[mode="undetermined"] .end-cap, -.download-progress .progress .progress-bar { - -moz-appearance: none; - background-color: #0095dd; -} - -.download-progress .progress .progress-bar { - min-height: 28px; -} - -.download-progress .progress { - -moz-appearance: none; - background-color: transparent; - padding: 0; - margin: 0; - border: none; -} - -.download-progress .start-cap, -.download-progress .end-cap { - width: 4px; -} - -.download-progress .start-cap:-moz-locale-dir(ltr), -.download-progress .end-cap:-moz-locale-dir(rtl) { - border-radius: 1px 0 0 1px; -} - -.download-progress .end-cap:-moz-locale-dir(ltr), -.download-progress .start-cap:-moz-locale-dir(rtl) { - border-radius: 0 1px 1px 0; -} - -.download-progress .cancel { - -moz-appearance: none; - padding: 3px; - min-width: 0; - width: 20px; - height: 20px; - margin: 3px; -} - -.download-progress .cancel .button-box { - /* override in-content/common.css !important rule */ - padding: 0 !important; - border: none; -} - -.download-progress .cancel .button-text { - display: none; -} - -.download-progress .cancel .button-icon { - margin: 0; -} - -.download-progress .cancel { - list-style-image: url('chrome://mozapps/skin/extensions/cancel.png'); -} - -.download-progress .status-container { - -moz-box-align: center; -} - -.download-progress .status { - color: #333; - text-shadow: #fff 0 0 2px; -} - - -/*** install status ***/ - -.install-status { - -moz-box-align: center; -} - - -/*** check for updates ***/ - -#updates-container { - -moz-box-align: center; -} - -#updates-container .button-link { - font-weight: bold; -} - -#updates-installed, -#updates-downloaded { - color: #00BB00; - font-weight: bold; -} - -#update-selected { - margin: 12px; -} - - -/*** buttons ***/ - -.addon-control[disabled="true"]:not(.no-auto-hide) { - display: none; -} - -.no-auto-hide .addon-control { - display: block !important; -} - -button.button-link { - -moz-appearance: none; - background: transparent; - border: none; - box-shadow: none; - color: #0095dd; - cursor: pointer; - min-width: 0; - min-height: 20px; - margin: 0 6px; -} - -button.button-link:not(:-moz-focusring) > .button-box { - border-width: 0; - margin: 1px; -} - -button.button-link:hover { - background-color: transparent; - color: #178ce5; - text-decoration: underline; -} - -/* Needed to override normal button style from inContent.css */ -button.button-link:not([disabled="true"]):active:hover { - background-color: transparent; - color: #ff9500; - text-decoration: none; -} - - -/*** telemetry experiments ***/ - -#detail-experiment-container { - font-size: 80%; - margin-bottom: 1em; -} - -#detail-experiment-bullet-container, -#detail-experiment-state, -#detail-experiment-time, -.experiment-bullet-container, -.experiment-state, -.experiment-time { - vertical-align: middle; - display: inline-block; -} - -.addon .experiment-bullet, -#detail-experiment-bullet { - fill: rgb(158, 158, 158); -} - -.addon[active="true"] .experiment-bullet, -#detail-view[active="true"] #detail-experiment-bullet { - fill: rgb(106, 201, 20); -} - -/*** info UI for add-ons that have been disabled for being unsigned ***/ - -#show-disabled-unsigned-extensions:not(:hover) { - background-color: #fcf8ed; -} - -#disabled-unsigned-addons-info { - margin-bottom: 2em; - margin-right: 48px; - margin-left: 48px; -} - -#disabled-unsigned-addons-heading { - font-size: 1.4em; - font-weight: bold; - margin-bottom: .5em; -} - -#signing-dev-info { - font-style: italic; -} - -#detail-findUpdates-btn[hidden] { - display: -moz-box; - visibility: hidden; -} diff --git a/toolkit/themes/shared/webextensions/navigation.png b/toolkit/themes/shared/webextensions/navigation.png deleted file mode 100644 index 67ff3d9a76..0000000000 Binary files a/toolkit/themes/shared/webextensions/navigation.png and /dev/null differ diff --git a/toolkit/themes/shared/webextensions/newaddon.inc.css b/toolkit/themes/shared/webextensions/newaddon.inc.css deleted file mode 100644 index 52352ccd26..0000000000 --- a/toolkit/themes/shared/webextensions/newaddon.inc.css +++ /dev/null @@ -1,114 +0,0 @@ -%if 0 -/* 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/. */ -%endif -@import url("chrome://global/skin/in-content/common.css"); - -#addon-page { - font-size: 1.1em; -} - -#addon-scrollbox { - overflow: auto; - -moz-box-orient: vertical; - -moz-box-flex: 1; -} - -#spacer-start { - -moz-box-flex: 1; -} - -#spacer-end { - -moz-box-flex: 3; -} - -#addon-container { - overflow: visible; - max-width: 800px; - margin: 20px; - padding: 30px 90px; -} - -#addon-info { - -moz-box-align: start; - margin: 25px 10px; -} - -#icon { - margin-top: 8px; - margin-inline-end: 10px; - max-width: 64px; - max-height: 64px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); -} - -.addon-info[type="theme"] #icon { - list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png"); -} - -.addon-info[type="locale"] #icon { - list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png"); -} - -.addon-info[type="plugin"] #icon { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); -} - -.addon-info[type="dictionary"] #icon { - list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png"); -} - -#name { - font-size: 130%; -} - -#author { - color: GrayText; -} - -#location { - color: GrayText; -} - -#warning { - margin-bottom: 25px; - -moz-box-align: start; -} - -#warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); - width: 16px; - height: 16px; - margin-top: 5px; - margin-inline-end: 5px; -} - -#allow { - margin-inline-start: 84px; - margin-bottom: 20px; -} - -#buttonDeck { - margin-top: 25px; - -moz-box-align: stretch; -} - -#continuePanel { - -moz-box-pack: end; - -moz-box-align: end; -} - -#restartPanel { - -moz-box-pack: end; - -moz-box-align: stretch; -} - -#restartPanelButtons { - margin-top: 25px; - -moz-box-pack: end; -} - -#later { - color: GrayText; -} diff --git a/toolkit/themes/shared/webextensions/utilities.svg b/toolkit/themes/shared/webextensions/utilities.svg deleted file mode 100644 index 8bf24458ce..0000000000 --- a/toolkit/themes/shared/webextensions/utilities.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - -