diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/icu/data/icudt58l.dat | bin | 10912128 -> 10912368 bytes | |||
| -rw-r--r-- | config/external/nss/Makefile.in | 11 | ||||
| -rw-r--r-- | config/external/nss/nss.symbols | 8 | ||||
| -rw-r--r-- | config/milestone.txt | 2 | ||||
| -rw-r--r-- | config/rules.mk | 26 | ||||
| -rw-r--r-- | config/version.mk | 2 |
6 files changed, 8 insertions, 41 deletions
diff --git a/config/external/icu/data/icudt58l.dat b/config/external/icu/data/icudt58l.dat Binary files differindex 7ade5b8fa..946a2c868 100644 --- a/config/external/icu/data/icudt58l.dat +++ b/config/external/icu/data/icudt58l.dat diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 4b95a32bd..861b7d07d 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -43,17 +43,6 @@ endif # Default HAVE_FREEBL_LIBS = 1 -# 32-bit HP-UX PA-RISC -ifeq ($(OS_ARCH), HP-UX) -ifneq ($(OS_TEST), ia64) -ifndef HAVE_64BIT_BUILD -HAVE_FREEBL_LIBS = -HAVE_FREEBL_LIBS_32INT32 = 1 -HAVE_FREEBL_LIBS_32FPU = 1 -endif -endif -endif - # SunOS SPARC ifeq ($(OS_ARCH), SunOS) ifneq (86,$(findstring 86,$(OS_TEST))) diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index ba5492c37..41f8ee7a9 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -271,7 +271,6 @@ NSS_IsInitialized NSS_OptionSet NSS_NoDB_Init NSS_SecureMemcmp -NSS_SecureMemcmpZero NSS_SetAlgorithmPolicy NSS_SetDomesticPolicy NSS_Shutdown @@ -279,9 +278,6 @@ NSSSMIME_GetVersion NSS_SMIMESignerInfo_SaveSMIMEProfile NSS_SMIMEUtil_FindBulkAlgForRecipients NSSSSL_GetVersion -#ifdef XP_WIN -_NSSUTIL_Access -#endif NSSUTIL_ArgDecodeNumber NSSUTIL_ArgFetchValue NSSUTIL_ArgGetLabel @@ -303,9 +299,6 @@ NSSUTIL_MkModuleSpec NSSUTIL_MkNSSString NSSUTIL_MkSlotString NSSUTIL_Quote -#ifdef XP_WIN -_NSSUTIL_UTF8ToWide -#endif PK11_AlgtagToMechanism PK11_Authenticate PK11_ChangePW @@ -490,7 +483,6 @@ 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 27f2d007f..b617f64b7 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.1.1 +4.1.2 diff --git a/config/rules.mk b/config/rules.mk index 122bd8a77..9a8f61c2d 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -386,26 +386,6 @@ endif endif endif -# -# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag -# which uses internal symbols first -# -ifeq ($(OS_ARCH),HP-UX) -ifdef IS_COMPONENT -ifeq ($(GNU_CC)$(GNU_CXX),) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -ifneq ($(HAS_EXTRAEXPORTS),1) -MKSHLIB += -Wl,+eNSGetModule -Wl,+eerrno -MKCSHLIB += +eNSGetModule +eerrno -ifneq ($(OS_TEST),ia64) -MKSHLIB += -Wl,+e_shlInit -MKCSHLIB += +e_shlInit -endif # !ia64 -endif # !HAS_EXTRAEXPORTS -endif # non-gnu compilers -endif # IS_COMPONENT -endif # HP-UX - ifeq ($(OS_ARCH),AIX) ifdef IS_COMPONENT ifneq ($(HAS_EXTRAEXPORTS),1) @@ -1129,6 +1109,12 @@ ifneq (,$(JAR_MANIFEST)) ifndef NO_DIST_INSTALL ifdef XPI_NAME +# XXX: Figure out why Pale Moon's defs.mk is not being propigated +ifndef XPI_ROOT_APPID +ifdef MC_PALEMOON +XPI_ROOT_APPID=$(MOZ_APP_ID) +endif +endif ifdef XPI_ROOT_APPID # For add-on packaging we may specify that an application # sub-dir should be added to the root chrome manifest with diff --git a/config/version.mk b/config/version.mk index 1b9f68afa..ef8eca9d0 100644 --- a/config/version.mk +++ b/config/version.mk @@ -16,7 +16,7 @@ ifndef RESFILE RCFILE=./module.rc RESFILE=./module.res _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_DIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION) -ifdef MOZILLA_OFFICIAL +ifdef MC_OFFICIAL _RC_STRING += -OFFICIAL 1 endif ifdef MOZ_DEBUG |