--- a/components/desktop/thunderbird/Makefile Fri Sep 30 21:33:56 2016 -0700
+++ b/components/desktop/thunderbird/Makefile Thu Sep 22 15:38:45 2016 -0700
@@ -32,18 +32,18 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= thunderbird
-COMPONENT_VERSION= 45.1.0
+COMPONENT_VERSION= 45.3.0
COMPONENT_PROJECT_URL= http://www.mozilla.com/thunderbird
COMPONENT_ARCHIVE = $(COMPONENT_SRC).source.tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:8ae9ebe536895d69d99f412f2b3aba645b7dd839e520959330da13892d672309
+ sha256:231f6a7a073344659e436a2b1ae58004c3a29e74375af2c8d0de13f3bc79fac7
MOZILLA_FTP = http://ftp.mozilla.org/pub/$(COMPONENT_NAME)/releases/$(COMPONENT_VERSION)
COMPONENT_ARCHIVE_URL= $(MOZILLA_FTP)/source/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= tbird/mailer
-TPNO= 27834
+TPNO= 31787
-LIGHTNING_VERSION= lightning-4.7.1
+LIGHTNING_VERSION= 4.7.1
# There are a set of .xpi files (as given in the LANG_LIST definition below)
# that we need. These are available under:
@@ -56,31 +56,32 @@
# collide due to different files with identical .xpi names.
COMPONENT_ARCHIVE_1 = $(COMPONENT_SRC)-xpi.tar.gz
COMPONENT_ARCHIVE_HASH_1 = \
- sha256:04269456df31de93e5af4b3ee14faf108278e8a885330e3c5c3504ccfb3a6381
-COMPONENT_ARCHIVE_URL_1 = $(INTERNAL_ARCHIVE_MIRROR)/source-archives/$(COMPONENT_ARCHIVE_1)
+ sha256:6b170356db3c345e4704de93ed41f5d16afac9460345f6675b02193ad41a128f
+COMPONENT_ARCHIVE_URL_1 = $(INTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE_1)
-COMPONENT_ARCHIVE_2 = $(LIGHTNING_VERSION)-xpi.tar.gz
+COMPONENT_ARCHIVE_2 = lightning-$(LIGHTNING_VERSION)-xpi.tar.gz
COMPONENT_ARCHIVE_HASH_2 = \
sha256:5bab9f0f879bdae9a312c5612b089c932c0400db89346c9c38b5c41623410e75
-COMPONENT_ARCHIVE_URL_2 = $(INTERNAL_ARCHIVE_MIRROR)/source-archives/$(COMPONENT_ARCHIVE_2)
+COMPONENT_ARCHIVE_URL_2 = $(INTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE_2)
LANG_LIST = ar bg ca cs da de el es-AR es-ES et eu fi \
fr gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl \
pt-BR pt-PT ro ru sk sl sq sv-SE tr uk zh-CN zh-TW
-# Do not use Firefox patches until Firefox is updated to 45.1.1.
+CLEAN_PATHS += $(COMPONENT_DIR)/xpi
+CLEAN_PATHS += $(COMPONENT_DIR)/xpi-lightning
# Firefox and Thunderbird share the same firefox*.patch patches. Copy these
# patches from the Firefox patches directory and the Thunderbird patches to a
# directory of all files (patches-all), except for Firefox patches 42 and 46,
# which don't get applied in Thunderbird. (libxul and dtrace patches)
-#PATCH_DIR=patches-all
-#CLEAN_PATHS += $(PATCH_DIR)
-#COPY_COMMON_FILES_1:= $(shell mkdir -p $(PATCH_DIR))
-#COPY_COMMON_FILES_2:= \
-# $(shell /usr/bin/rsync -ac patches/* ../firefox/patches/* $(PATCH_DIR))
-#COPY_COMMON_FILES_3:= \
-# $(shell /usr/bin/rm -f $(PATCH_DIR)/firefox*42*.patch $(PATCH_DIR)/firefox*46*.patch)
+PATCH_DIR=patches-all
+CLEAN_PATHS += $(PATCH_DIR)
+COPY_COMMON_FILES_1:= $(shell mkdir -p $(PATCH_DIR))
+COPY_COMMON_FILES_2:= \
+ $(shell /usr/bin/rsync -ac patches/* ../firefox/patches/* $(PATCH_DIR))
+COPY_COMMON_FILES_3:= \
+ $(shell /usr/bin/rm -f $(PATCH_DIR)/firefox*42*.patch $(PATCH_DIR)/firefox*46*.patch)
# Depends on libsmbclient but samba is on the do-not-publish list, so this
# must be too.
@@ -179,12 +180,40 @@
list1='$(LANG_LIST)' ; for f in $$list1 ; do \
$(CP) xpi/$$f.xpi \
$(PROTOUSRLIBDIR)/thunderbird-$(COMPONENT_VERSION)/distribution/extensions/[email protected] ; \
- unzip xpi-lightning/$(LIGHTNING_VERSION).$$f.linux-i686.xpi \
+ unzip xpi-lightning/lightning-$(LIGHTNING_VERSION).$$f.linux-i686.xpi \
chrome/calendar-$$f/\* chrome/lightning-$$f/\* -d \
$(LIGHTNING_EXT_DIR)/ ; \
echo 'locale calendar '$$f' chrome/calendar-'$$f'/locale/'$$f'/calendar/' >> $(LIGHTNING_EXT_DIR)/chrome.manifest ; \
echo 'locale lightning '$$f' chrome/lightning-'$$f'/locale/'$$f'/lightning/' >> $(LIGHTNING_EXT_DIR)/chrome.manifest ; \
done ;
+
+download-xpis:
+ @echo "download-xpis"
+ $(RM) -r $(COMPONENT_DIR)/xpi $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1)
+ $(MKDIR) $(COMPONENT_DIR)/xpi
+ @echo "downloading thunderbird xpis"
+ list1='$(LANG_LIST)' ; for f in $$list1 ; do \
+ echo $$f; \
+ /usr/bin/curl -s -o $(COMPONENT_DIR)/xpi/$$f.xpi \
+ $(TB_XPI)/$$f.xpi ;\
+ done
+ (cd $(COMPONENT_DIR); \
+ $(TAR) czvf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_1) xpi )
+ /usr/bin/sha256sum $(COMPONENT_ARCHIVE_1)
+
+download-lightning-xpis:
+ @echo "download-lightning-xpis"
+ $(RM) $(COMPONENT_DIR)/xpi-lightning $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_2)
+ $(MKDIR) $(COMPONENT_DIR)/xpi-lightning
+ @echo "downloading lightning xpis"
+ list1='$(LANG_LIST)' ; for f in $$list1 ; do \
+ echo $$f; \
+ /usr/bin/curl -s -o $(COMPONENT_DIR)/xpi-lightning/lightning-$(LIGHTNING_VERSION).$$f.linux-i686.xpi \
+ $(LN_XPI)/lightning-$(LIGHTNING_VERSION).$$f.linux-i686.xpi ;\
+ done
+ (cd $(COMPONENT_DIR); \
+ $(TAR) czvf $(COMPONENT_DIR)/$(COMPONENT_ARCHIVE_2) xpi-lightning )
+ /usr/bin/sha256sum $(COMPONENT_ARCHIVE_2)
LIB_LIST.i386 =
LIB_LIST.sparc = $(PROTOUSRLIBDIR)/thunderbird-devel-$(COMPONENT_VERSION)/sdk/lib/cpu/sparcv8plus/libnspr_flt4.so
@@ -196,12 +225,13 @@
$(CP) $$f $(PROTOUSRLIBDIR)/thunderbird-$(COMPONENT_VERSION)/cpu/sparcv8plus/libnspr_flt4.so ; \
done ;
+COMPONENT_TEST_MASTER = \
+ $(COMPONENT_TEST_RESULTS_DIR)/results-$(MACH).master
COMPONENT_TEST_DIR = $(@D)/js/src
COMPONENT_TEST_TARGETS=check-jit-test
COMPONENT_TEST_TRANSFORMS += \
'-e "/\(^TEST-PASS\).*/d" '
-# Do not use firefox patches until firefox is update to 45.1.1.
$(SOURCE_DIR)/.patched-firefox-%: GPATCH_FLAGS += -d $(@D)/mozilla
REQUIRED_PACKAGES += compress/bzip2