Bug 638335 - Support Japanese emoji (merged patch from
bug 638335 and
bug 1324555). r=Paenglab,jorgk a=jorgk
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -5,16 +5,17 @@ dnl License, v. 2.0. If a copy of the MP
dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
dnl Things we need to carry from confvars.sh
AC_DEFINE(MOZ_THUNDERBIRD)
AC_SUBST(MOZ_THUNDERBIRD)
AC_SUBST(MOZ_COMPOSER)
AC_SUBST(THUNDERBIRD_VERSION)
AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
+AC_SUBST(MOZ_BUNDLED_FONTS)
dnl Optional parts of the build.
AC_SUBST(MOZ_MORK)
if test "$MOZ_MORK"; then
AC_DEFINE(MOZ_MORK)
fi
if test "$OS_ARCH" != "WINNT"; then
MOZ_MOVEMAIL=1
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -8,16 +8,22 @@ MOZ_APP_NAME=thunderbird
MOZ_UPDATER=1
MOZ_THUNDERBIRD=1
MOZ_APP_STATIC_INI=1
MOZ_DISABLE_EXPORT_JS=1
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_LDAP_XPCOM=1
MOZ_COMPOSER=1
+
+if test "$OS_ARCH" = "WINNT" -o \
+ "$OS_ARCH" = "Linux"; then
+ MOZ_BUNDLED_FONTS=1
+fi
+
if test "$OS_ARCH" = "WINNT"; then
if ! test "$HAVE_64BIT_BUILD"; then
MOZ_VERIFY_MAR_SIGNATURE=1
MOZ_MAINTENANCE_SERVICE=1
fi
fi
MOZ_SAFE_BROWSING=1
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -102,16 +102,20 @@ endif
ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
DEFINES += -DMOZ_SHARED_MOZGLUE=1
endif
ifdef NECKO_WIFI
DEFINES += -DNECKO_WIFI
endif
+ifdef MOZ_BUNDLED_FONTS
+DEFINES += -DMOZ_BUNDLED_FONTS=1
+endif
+
ifdef MAKENSISU
DEFINES += -DHAVE_MAKENSISU=1
endif
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -46,16 +46,19 @@
@RESPATH@/@LPROJ_ROOT@.lproj/*
#endif
[@AB_CD@]
@RESPATH@/chrome/@AB_CD@@JAREXT@
@RESPATH@/chrome/@AB_CD@.manifest
@RESPATH@/@PREF_DIR@/all-l10n.js
@RESPATH@/dictionaries/*
+#ifdef MOZ_BUNDLED_FONTS
+@RESPATH@/fonts/*
+#endif
@RESPATH@/hyphenation/*
#ifdef HAVE_MAKENSISU
@BINPATH@/uninstall/helper.exe
#endif
#ifdef MOZ_UPDATER
@RESPATH@/update.locale
@RESPATH@/updater.ini
#endif
--- a/mail/moz.build
+++ b/mail/moz.build
@@ -17,10 +17,13 @@ DIRS += [
# Add components for external linkage build
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
DIRS += ['components']
if CONFIG['MAKENSISU']:
DIRS += ['installer/windows']
+if CONFIG['MOZ_BUNDLED_FONTS']:
+ DIRS += ['/mozilla/browser/fonts']
+
TEST_DIRS += ['test/mozmill']