diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
| commit | d94680030da7d627b4a36c39773b791196c01b2c (patch) | |
| tree | 24b082c1bfb5777f1770c82a534bf765160bc1b8 /config | |
| parent | 28db54797756c283b51fe051133923f57af7c09e (diff) | |
| parent | a1ae0a5baaf2111d2264dc1f2ceea53bdcdd3880 (diff) | |
| download | uxp-d94680030da7d627b4a36c39773b791196c01b2c.tar.gz | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into html_input_datetime_1
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/icu/data/icudt58l.dat | bin | 10912128 -> 10912240 bytes | |||
| -rw-r--r-- | config/external/nss/nss.symbols | 8 | ||||
| -rw-r--r-- | config/milestone.txt | 2 | ||||
| -rw-r--r-- | config/rules.mk | 38 |
4 files changed, 9 insertions, 39 deletions
diff --git a/config/external/icu/data/icudt58l.dat b/config/external/icu/data/icudt58l.dat Binary files differindex 7ade5b8fa1..d981febb18 100644 --- a/config/external/icu/data/icudt58l.dat +++ b/config/external/icu/data/icudt58l.dat diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index 41f8ee7a9e..ba5492c37a 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -271,6 +271,7 @@ NSS_IsInitialized NSS_OptionSet NSS_NoDB_Init NSS_SecureMemcmp +NSS_SecureMemcmpZero NSS_SetAlgorithmPolicy NSS_SetDomesticPolicy NSS_Shutdown @@ -278,6 +279,9 @@ NSSSMIME_GetVersion NSS_SMIMESignerInfo_SaveSMIMEProfile NSS_SMIMEUtil_FindBulkAlgForRecipients NSSSSL_GetVersion +#ifdef XP_WIN +_NSSUTIL_Access +#endif NSSUTIL_ArgDecodeNumber NSSUTIL_ArgFetchValue NSSUTIL_ArgGetLabel @@ -299,6 +303,9 @@ NSSUTIL_MkModuleSpec NSSUTIL_MkNSSString NSSUTIL_MkSlotString NSSUTIL_Quote +#ifdef XP_WIN +_NSSUTIL_UTF8ToWide +#endif PK11_AlgtagToMechanism PK11_Authenticate PK11_ChangePW @@ -483,6 +490,7 @@ PORT_UCS2_ASCIIConversion_Util PORT_UCS2_UTF8Conversion PORT_UCS2_UTF8Conversion_Util PORT_ZAlloc +PORT_ZAllocAlignedOffset_Util PORT_ZAlloc_Util PORT_ZFree_Util SEC_AnyTemplate_Util @DATA@ diff --git a/config/milestone.txt b/config/milestone.txt index 48a995e3cc..27f2d007f6 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -52.6.0 +4.1.1 diff --git a/config/rules.mk b/config/rules.mk index a21128cf14..122bd8a776 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -905,44 +905,6 @@ $(ASOBJS): $(AS) $(ASOUTOPTION)$@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS) endif -ifdef MOZ_RUST -ifdef RUST_LIBRARY_FILE - -# Permit users to pass flags to cargo from their mozconfigs (e.g. --color=always). -cargo_build_flags = $(CARGOFLAGS) -ifndef MOZ_DEBUG -cargo_build_flags = --release -endif -ifdef MOZ_CARGO_SUPPORTS_FROZEN -cargo_build_flags += --frozen -endif - -cargo_build_flags += --manifest-path $(CARGO_FILE) -cargo_build_flags += --target=$(RUST_TARGET) -cargo_build_flags += --verbose - -# Enable color output if original stdout was a TTY and color settings -# aren't already present. This essentially restores the default behavior -# of cargo when running via `mach`. -ifdef MACH_STDOUT_ISATTY -ifeq (,$(findstring --color,$(cargo_build_flags))) -cargo_build_flags += --color=always -endif -endif - -# Assume any system libraries rustc links against are already in the target's LIBS. -# -# We need to run cargo unconditionally, because cargo is the only thing that -# has full visibility into how changes in Rust sources might affect the final -# build. -force-cargo-build: - $(REPORT_BUILD) - env CARGO_TARGET_DIR=. RUSTC=$(RUSTC) $(CARGO) build $(cargo_build_flags) -- - -$(RUST_LIBRARY_FILE): force-cargo-build -endif # CARGO_FILE -endif # MOZ_RUST - $(SOBJS): $(REPORT_BUILD) $(AS) -o $@ $(DEFINES) $(ASFLAGS) $($(notdir $<)_FLAGS) $(LOCAL_INCLUDES) -c $< |