diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/.mozconfig comm-esr17/.mozconfig
--- comm-esr17.orig/.mozconfig 1970-01-01 09:00:00 +0900
+++ comm-esr17/.mozconfig 2013-09-14 03:12:26 +0900
@@ -0,0 +1,2 @@
+RF_MOZCONFIG=/s/rayflood-build/mozconfig
+. ${RF_MOZCONFIG}/mozconfig.sh
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/build.mk comm-esr17/calendar/build.mk
--- comm-esr17.orig/calendar/build.mk 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/build.mk 2013-09-14 03:12:25 +0900
@@ -40,6 +40,12 @@
package-compare:
@$(MAKE) -C calendar/installer package-compare
+stage-package:
+ @$(MAKE) -C calendar/installer stage-package
+
+install::
+ @$(MAKE) -C calendar/installer install
+
source-package::
@$(MAKE) -C calendar/installer source-package
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/confvars.sh comm-esr17/calendar/confvars.sh
--- comm-esr17.orig/calendar/confvars.sh 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/confvars.sh 2013-09-14 03:12:25 +0900
@@ -10,6 +10,7 @@
MOZ_UPDATER=1
MOZ_SUNBIRD=1
MOZ_CALENDAR=1
+MOZ_CHROME_FILE_FORMAT=jar
MOZ_NO_ACTIVEX_SUPPORT=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_MATHML=
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/installer/Makefile.in comm-esr17/calendar/installer/Makefile.in
--- comm-esr17.orig/calendar/installer/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/installer/Makefile.in 2013-09-14 03:12:26 +0900
@@ -18,13 +18,14 @@
xpt_dump* \
xpt_link* \
nspr-config \
+ js$(BIN_SUFFIX) \
$(NULL)
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
-ifdef BUILD_STATIC_LIBS
+ifneq (,$(BUILD_STATIC_LIBS)$(MOZ_ENABLE_LIBXUL))
ifeq (WINNT,$(OS_ARCH))
MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
# XXX Enable when landing unix installer
@@ -33,8 +34,6 @@
# MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static
# endif
endif
-else
-$(error you need a "--enable-static --disable-shared" build to create an installer)
endif
MOZ_NONLOCALIZED_PKG_LIST = \
@@ -42,7 +41,11 @@
calendar \
$(NULL)
+ifdef L10NBASEDIR
+MOZ_LOCALIZED_PKG_LIST = en-US $(shell ls $(L10NBASEDIR))
+else
MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
+endif
DEFINES += -DAB_CD=$(AB_CD)
@@ -50,11 +53,40 @@
DEFINES += -DMOZ_UPDATER=1
endif
+ifdef MOZ_ANGLE
+DEFINES += -DMOZ_ANGLE=$(MOZ_ANGLE)
+DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL)
+DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
+endif
+
+include $(MOZILLA_SRCDIR)/ipc/app/defs.mk
+DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
+
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = packages-static
+ifeq (Darwin, $(OS_ARCH))
+CHROME_PATH = $(_BINPATH)/chrome
+else
+CHROME_PATH = bin/chrome
+endif
+
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+ for AB_CD in $(MOZ_LOCALIZED_PKG_LIST) ; do \
+ if test "$${AB_CD}" != "$(AB_CD)" ; then \
+ echo "" >> $@ ; \
+ echo "[$${AB_CD}]" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}.jar" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}.manifest" >> $@ ; \
+ echo "$(CHROME_PATH)/calendar-$${AB_CD}.jar" >> $@ ; \
+ echo "$(CHROME_PATH)/calendar-$${AB_CD}.manifest" >> $@ ; \
+ echo "$(CHROME_PATH)/sunbird-$${AB_CD}.jar" >> $@ ; \
+ echo "$(CHROME_PATH)/sunbird-$${AB_CD}.manifest" >> $@ ; \
+ echo "$(CHROME_PATH)/../extensions/calendar-timezones@mozilla.org/chrome/calendar-timezones-$${AB_CD}.jar" >> $@ ; \
+ echo "$(CHROME_PATH)/../extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/chrome/gdata-provider-$${AB_CD}.jar" >> $@ ; \
+ fi ; \
+ done
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -63,6 +95,7 @@
MOZ_PKG_MAC_ICON=branding/disk.icns
endif
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (WINNT,$(OS_ARCH))
@@ -82,8 +115,3 @@
ifdef INSTALLER_DIR
$(MAKE) -C $(INSTALLER_DIR)
endif
-
-make-package : removed-files-checked
-
-removed-files-checked : removed-files stage-package
- $(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/installer/windows/Makefile.in comm-esr17/calendar/installer/windows/Makefile.in
--- comm-esr17.orig/calendar/installer/windows/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/installer/windows/Makefile.in 2013-09-14 03:12:26 +0900
@@ -18,10 +18,6 @@
DEFINES += -DMOZ_UPDATER=1
endif
-PP_LOCALIZED_FILES = \
- packages-static \
- $(NULL)
-
INSTALLER_FILES = \
app.tag \
nsis/installer.nsi \
@@ -56,10 +52,6 @@
$(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
- $(EXIT_ON_ERROR) \
- for i in $(PP_LOCALIZED_FILES); do \
- $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
- done
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
@@ -72,10 +64,6 @@
$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--convert-utf8-utf16le $(DIST)/branding/license.txt $(CONFIG_DIR)/license.txt
- $(EXIT_ON_ERROR) \
- for i in $(PP_LOCALIZED_FILES); do \
- $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
- done
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \
$(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/installer/windows/packages-static comm-esr17/calendar/installer/windows/packages-static
--- comm-esr17.orig/calendar/installer/windows/packages-static 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/installer/windows/packages-static 2013-09-16 16:46:33 +0900
@@ -32,18 +32,53 @@
[xpcom]
bin\components\components.list
+#ifndef MOZ_STATIC_JS
bin\mozjs.dll
+#endif
bin\plc4.dll
bin\plds4.dll
bin\xpcom.dll
-bin\xpcom_core.dll
bin\nspr4.dll
+#ifdef MOZ_ENABLE_LIBXUL
+bin\xul.dll
+#else
+bin\xpcom_core.dll
bin\components\xpinstal.dll
bin\components\jar50.dll
+#endif
+#ifdef XP_WIN32
+bin\gkmedias.dll
+#ifdef MOZ_MEMORY
+#endif
+#if _MSC_VER == 1400
bin\Microsoft.VC80.CRT.manifest
bin\msvcm80.dll
bin\msvcp80.dll
bin\msvcr80.dll
+#elif _MSC_VER == 1500
+bin\Microsoft.VC90.CRT.manifest
+bin\msvcm90.dll
+bin\msvcp90.dll
+bin\msvcr90.dll
+#elif _MSC_VER == 1600
+bin\msvcp100.dll
+bin\msvcr100.dll
+#elif _MSC_VER == 1700
+bin\msvcp110.dll
+bin\msvcr110.dll
+#endif
+#endif
+bin\mozalloc.dll
+bin\mozutils.dll
+#ifdef MOZ_TREE_FREETYPE
+bin\freetype2.dll
+#endif
+bin\@MOZ_CHILD_PROCESS_NAME@
+; ANGLE GLES-on-D3D rendering library
+#ifdef MOZ_ANGLE
+bin\libEGL.dll
+bin\libGLESv2.dll
+#endif
[calendar]
; [Base Calendar Files]
@@ -51,11 +86,13 @@
bin\LICENSE
bin\platform.ini
bin\README.txt
-bin\sqlite3.dll
+bin\mozsqlite3.dll
bin\sunbird.exe
; [Components]
+bin\components\components.manifest
bin\AccessibleMarshal.dll
+bin\IA2Marshal.dll
bin\components\accessibility.xpt
bin\components\accessibility-msaa.xpt
bin\components\alerts.xpt
@@ -82,7 +119,8 @@
bin\components\content_xslt.xpt
bin\components\content_xtf.xpt
bin\components\cookie.xpt
-bin\components\docshell_base.xpt
+bin\components\directory.xpt
+bin\components\docshell.xpt
bin\components\dom.xpt
bin\components\dom_base.xpt
bin\components\dom_canvas.xpt
@@ -110,6 +148,7 @@
bin\components\editor.xpt
bin\components\embed_base.xpt
bin\components\extensions.xpt
+bin\components\extensions.manifest
bin\components\exthandler.xpt
bin\components\exthelper.xpt
bin\components\fastfind.xpt
@@ -156,11 +195,14 @@
bin\components\profile.xpt
bin\components\rdf.xpt
bin\components\satchel.xpt
+bin\components\satchel.manifest
bin\components\saxparser.xpt
bin\components\shistory.xpt
bin\components\spellchecker.xpt
bin\components\storage.xpt
+bin\components\toolkitplaces.manifest
bin\components\toolkitprofile.xpt
+bin\components\toolkitsearch.manifest
bin\components\txmgr.xpt
bin\components\txtsvc.xpt
bin\components\uconv.xpt
@@ -181,7 +223,7 @@
bin\components\xpcom_ds.xpt
bin\components\xpcom_io.xpt
bin\components\xpcom_system.xpt
-bin\components\xpcom_thread.xpt
+bin\components\xpcom_threads.xpt
bin\components\xpcom_xpti.xpt
bin\components\xpconnect.xpt
bin\components\xpinstall.xpt
@@ -191,44 +233,104 @@
bin\components\zipwriter.xpt
; JavaScript components
+bin\components\addonManager.js
+bin\components\amContentHandler.js
+bin\components\amWebInstallListener.js
+bin\components\ConsoleAPI.js
+bin\components\ConsoleAPI.manifest
+bin\components\contentAreaDropListener.js
+bin\components\contentAreaDropListener.manifest
+bin\components\contentSecurityPolicy.js
+bin\components\contentSecurityPolicy.manifest
+bin\components\crypto-SDR.js
bin\components\calCompositeCalendar.js
+bin\components\calCompositeCalendar.manifest
bin\components\calDavCalendar.js
+bin\components\calDavCalendar.manifest
bin\components\calendarService.js
+bin\components\calendarService.manifest
bin\components\calICSCalendar.js
+bin\components\calICSCalendar.manifest
bin\components\calImportExportModule.js
+bin\components\calImportExportModule.manifest
bin\components\calItemModule.js
+bin\components\calItemModule.manifest
bin\components\calMemoryCalendar.js
+bin\components\calMemoryCalendar.manifest
bin\components\calStorageCalendar.js
+bin\components\calStorageCalendar.manifest
bin\components\calWcapCalendarModule.js
+bin\components\calWcapCalendarModule.manifest
bin\components\jsconsole-clhandler.js
+bin\components\jsconsole-clhandler.manifest
bin\components\NetworkGeolocationProvider.js
+bin\components\NetworkGeolocationProvider.manifest
bin\components\nsAddonRepository.js
bin\components\nsBadCertHandler.js
+bin\components\nsBadCertHandler.manifest
bin\components\nsBlocklistService.js
bin\components\nsContentDispatchChooser.js
+bin\components\nsContentDispatchChooser.manifest
bin\components\nsContentPrefService.js
+bin\components\nsContentPrefService.manifest
bin\components\nsDefaultCLH.js
+bin\components\nsDefaultCLH.manifest
bin\components\nsDownloadManagerUI.js
+bin\components\nsDownloadManagerUI.manifest
bin\components\nsExtensionManager.js
bin\components\nsHandlerService.js
+bin\components\nsHandlerService.manifest
bin\components\nsHelperAppDlg.js
+bin\components\nsHelperAppDlg.manifest
bin\components\nsLoginInfo.js
bin\components\nsLoginManager.js
bin\components\nsLoginManagerPrompter.js
bin\components\nsProgressDialog.js
bin\components\nsProxyAutoConfig.js
+bin\components\nsProxyAutoConfig.manifest
bin\components\nsTryToClose.js
+bin\components\nsTryToClose.manifest
#ifdef MOZ_UPDATER
bin\components\nsUpdateService.js
+bin\components\nsUpdateService.manifest
bin\components\nsUpdateServiceStub.js
#endif
bin\components\nsUpdateTimerManager.js
+bin\components\nsUpdateTimerManager.manifest
bin\components\nsURLFormatter.js
+bin\components\nsURLFormatter.manifest
bin\components\nsWebHandlerApp.js
+bin\components\nsWebHandlerApp.manifest
bin\components\pluginGlue.js
bin\components\storage-Legacy.js
bin\components\storage-mozStorage.js
bin\components\txEXSLTRegExFunctions.js
+bin\components\txEXSLTRegExFunctions.manifest
+bin\components\FeedProcessor.js
+bin\components\FeedProcessor.manifest
+bin\components\nsSearchService.js
+bin\components\nsSearchSuggestions.js
+bin\components\GPSDGeolocationProvider.js
+bin\components\GPSDGeolocationProvider.manifest
+#ifdef MOZ_IPC
+bin\components\messageWakeupService.js
+bin\components\messageWakeupService.manifest
+#endif
+bin\components\nsFormAutoComplete.js
+bin\components\nsINIProcessor.js
+bin\components\nsINIProcessor.manifest
+bin\components\nsInputListAutoComplete.js
+bin\components\nsLivemarkService.js
+bin\components\nsMicrosummaryService.js
+bin\components\nsPlacesAutoComplete.js
+bin\components\nsPlacesAutoComplete.manifest
+bin\components\nsPlacesExpiration.js
+bin\components\nsPrompter.js
+bin\components\nsPrompter.manifest
+bin\components\nsTaggingService.js
+bin\components\passwordmgr.manifest
+bin\components\PlacesCategoriesStarter.js
+bin\components\pluginGlue.manifest
bin\calendar-js\calAlarm.js
bin\calendar-js\calAlarmMonitor.js
bin\calendar-js\calAlarmService.js
@@ -245,6 +347,7 @@
bin\calendar-js\calHtmlExport.js
bin\calendar-js\calIcsImportExport.js
bin\calendar-js\calIcsParser.js
+bin\calendar-js\calIcsParser-worker.js
bin\calendar-js\calIcsSerializer.js
bin\calendar-js\calItemBase.js
bin\calendar-js\calItipItem.js
@@ -254,6 +357,7 @@
bin\calendar-js\calProtocolHandler.js
bin\calendar-js\calRecurrenceInfo.js
bin\calendar-js\calRelation.js
+bin\calendar-js\calStartupService.js
bin\calendar-js\calTimezoneService.js
bin\calendar-js\calTodo.js
bin\calendar-js\calTransactionManager.js
@@ -362,3 +466,18 @@
; [Crash Reporter]
bin\crashreporter.exe
bin\crashreporter.ini
+
+[gdata-provider]
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\install.rdf
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\chrome.manifest
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\chrome\gdata-provider.jar
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\chrome\gdata-provider-@AB_CD@.jar
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\components\calGoogleCalendarModule.js
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\components\calGoogleCalendarModule.manifest
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\components\gdata.xpt
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\components\interfaces.manifest
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\defaults\preferences\preferences.js
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\js\calGoogleCalendar.js
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\js\calGoogleRequest.js
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\js\calGoogleSession.js
+bin\extensions\{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}\js\calGoogleUtils.js
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/providers/gdata/Makefile.in comm-esr17/calendar/providers/gdata/Makefile.in
--- comm-esr17.orig/calendar/providers/gdata/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/providers/gdata/Makefile.in 2013-09-14 03:12:26 +0900
@@ -15,6 +15,7 @@
export XPI_NAME = gdata-provider
DIST_FILES = install.rdf
XPI_PKGNAME = gdata-provider
+INSTALL_EXTENSION_ID = {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
CALENDAR_VERSION := $(shell cat $(topsrcdir)/calendar/sunbird/config/version.txt)
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/app/Makefile.in comm-esr17/calendar/sunbird/app/Makefile.in
--- comm-esr17.orig/calendar/sunbird/app/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/app/Makefile.in 2013-09-14 03:12:26 +0900
@@ -248,7 +248,7 @@
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-APP_NAME = $(MOZ_APP_DISPLAYNAME)
+APP_NAME = $(MOZ_APP_NAME)
ifdef MOZ_DEBUG
APP_NAME := $(APP_NAME)Debug
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/app/profile/sunbird.js comm-esr17/calendar/sunbird/app/profile/sunbird.js
--- comm-esr17.orig/calendar/sunbird/app/profile/sunbird.js 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/app/profile/sunbird.js 2013-09-14 03:12:26 +0900
@@ -277,3 +277,33 @@
// The Necko Disk Cache. Disable the cache until Sunbird makes correct use of it
// and offers UI preferences to control it.
pref("browser.cache.disk.enable", false);
+
+// The default for this pref reflects whether the build is capable of IPC.
+// (Turning it on in a no-IPC build will have no effect.)
+#ifdef XP_MACOSX
+// i386 ipc preferences
+pref("dom.ipc.plugins.enabled.i386", false);
+pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true);
+pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true);
+pref("dom.ipc.plugins.enabled.i386.javaappletplugin.plugin", true);
+pref("dom.ipc.plugins.enabled.i386.silverlight.plugin", true);
+// x86_64 ipc preferences
+pref("dom.ipc.plugins.enabled.x86_64", true);
+#else
+pref("dom.ipc.plugins.enabled", true);
+#endif
+
+#ifdef MOZ_E10S_COMPAT
+pref("browser.tabs.remote", true);
+#endif
+
+// This pref governs whether we attempt to work around problems caused by
+// plugins using OS calls to manipulate the cursor while running out-of-
+// process. These workarounds all involve intercepting (hooking) certain
+// OS calls in the plugin process, then arranging to make certain OS calls
+// in the browser process. Eventually plugins will be required to use the
+// NPAPI to manipulate the cursor, and these workarounds will be removed.
+// See bug 621117.
+#ifdef XP_MACOSX
+pref("dom.ipc.plugins.nativeCursorSupport", true);
+#endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/app/sunbird.exe.manifest comm-esr17/calendar/sunbird/app/sunbird.exe.manifest
--- comm-esr17.orig/calendar/sunbird/app/sunbird.exe.manifest 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/app/sunbird.exe.manifest 2013-09-14 03:12:26 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/base/Makefile.in comm-esr17/calendar/sunbird/base/Makefile.in
--- comm-esr17.orig/calendar/sunbird/base/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/base/Makefile.in 2013-09-14 03:12:26 +0900
@@ -31,4 +31,8 @@
DEFINES += -DMOZ_UPDATER=1
endif
+EXTRA_JS_MODULES = \
+ $(topsrcdir)/mailnews/base/util/iteratorUtils.jsm \
+ $(NULL)
+
include $(topsrcdir)/config/rules.mk
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/branding/nightly/branding.nsi comm-esr17/calendar/sunbird/branding/nightly/branding.nsi
--- comm-esr17.orig/calendar/sunbird/branding/nightly/branding.nsi 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/branding/nightly/branding.nsi 2013-09-14 03:12:26 +0900
@@ -4,11 +4,11 @@
# NSIS defines for nightly builds.
# The release build branding.nsi is located in other-licenses/branding/sunbird/
-!define BrandShortName "Calendar"
-!define BrandFullName "Calendar"
+!define BrandShortName "sunbird"
+!define BrandFullName "sunbird"
# BrandFullNameInternal is used for some registry and file system values that
# should not contain release that may be in the BrandFullName (e.g. Beta 1, etc.)
-!define BrandFullNameInternal "Mozilla Sunbird"
+!define BrandFullNameInternal "sunbird"
!define CompanyName "Mozilla"
!define URLInfoAbout "http://www.mozilla.org/"
!define URLUpdateInfo "http://www.mozilla.org/projects/calendar/sunbird/"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/branding/nightly/configure.sh comm-esr17/calendar/sunbird/branding/nightly/configure.sh
--- comm-esr17.orig/calendar/sunbird/branding/nightly/configure.sh 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/branding/nightly/configure.sh 2013-09-14 03:12:26 +0900
@@ -2,4 +2,4 @@
# 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/.
-MOZ_APP_DISPLAYNAME=Calendar
+MOZ_APP_DISPLAYNAME=Sunbird
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/branding/nightly/locales/en-US/brand.dtd comm-esr17/calendar/sunbird/branding/nightly/locales/en-US/brand.dtd
--- comm-esr17.orig/calendar/sunbird/branding/nightly/locales/en-US/brand.dtd 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/branding/nightly/locales/en-US/brand.dtd 2013-09-14 03:12:26 +0900
@@ -2,5 +2,5 @@
- 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/. -->
-
-
+
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/branding/nightly/locales/en-US/brand.properties comm-esr17/calendar/sunbird/branding/nightly/locales/en-US/brand.properties
--- comm-esr17.orig/calendar/sunbird/branding/nightly/locales/en-US/brand.properties 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/branding/nightly/locales/en-US/brand.properties 2013-09-14 03:12:26 +0900
@@ -2,8 +2,8 @@
# 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/.
-brandShortName=Calendar
-brandFullName=Calendar
+brandShortName=sunbird
+brandFullName=sunbird
vendorShortName=Mozilla
# LOCALIZATION NOTE (releaseNotesURL):
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/calendar/sunbird/config/version.txt comm-esr17/calendar/sunbird/config/version.txt
--- comm-esr17.orig/calendar/sunbird/config/version.txt 2013-09-12 09:49:36 +0900
+++ comm-esr17/calendar/sunbird/config/version.txt 2013-09-14 03:12:26 +0900
@@ -1 +1 @@
-1.9b1
+1.9.2pre
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/client.mk comm-esr17/client.mk
--- comm-esr17.orig/client.mk 2013-09-12 09:49:36 +0900
+++ comm-esr17/client.mk 2013-09-14 03:12:26 +0900
@@ -102,7 +102,7 @@
endef
-$(eval $(subst ||,$(CR),$(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
+$(eval $(subst ||,$(CR),$(shell $(CONFIG_SHELL) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
ifndef MOZ_OBJDIR
MOZ_OBJDIR = obj-$(CONFIG_GUESS)
@@ -135,7 +135,9 @@
# 'configure' scripts generated by autoconf.
CONFIGURES := $(TOPSRCDIR)/configure
+CONFIGURES += $(TOPSRCDIR)/ldap/sdks/c-sdk/configure
CONFIGURES += $(TOPSRCDIR)/mozilla/configure
+CONFIGURES += $(TOPSRCDIR)/mozilla/nsprpub/configure
CONFIGURES += $(TOPSRCDIR)/mozilla/js/src/configure
#######################################################################
@@ -188,9 +190,9 @@
endif
profiledbuild::
- $(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_GENERATE=1
- $(MAKE) -C $(PGO_OBJDIR) stage-package
- OBJDIR=${PGO_OBJDIR} $(PROFILE_GEN_SCRIPT)
+ $(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_GENERATE=1 MOZ_PGO_INSTRUMENTED=1
+ $(MAKE) -C $(PGO_OBJDIR) package MOZ_PGO_INSTRUMENTED=1 MOZ_INTERNAL_SIGNING_FORMAT= MOZ_EXTERNAL_SIGNING_FORMAT=
+ MOZ_PGO_INSTRUMENTED=1 OBJDIR=${PGO_OBJDIR} JARLOG_DIR=${PGO_OBJDIR}/jarlog/en-US $(PROFILE_GEN_SCRIPT)
$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
$(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_USE=1
@@ -293,8 +295,8 @@
endif
@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
@echo cd $(OBJDIR);
- @echo $(CONFIGURE) $(CONFIGURE_ARGS)
- @cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
+ @echo $(CONFIG_SHELL) $(CONFIGURE) $(CONFIGURE_ARGS)
+ @cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIG_SHELL) $(CONFIGURE) $(CONFIGURE_ARGS) \
|| ( echo "*** Fix above errors and then restart with\
\"$(MAKE) -f client.mk build\"" && exit 1 )
@touch $(OBJDIR)/Makefile
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/config/config.mk comm-esr17/config/config.mk
--- comm-esr17.orig/config/config.mk 2013-09-12 09:49:36 +0900
+++ comm-esr17/config/config.mk 2013-09-14 03:12:26 +0900
@@ -241,8 +241,10 @@
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # INTERNAL_TOOLS
endif # MOZ_PROFILE_GENERATE
@@ -252,8 +254,10 @@
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # INTERNAL_TOOLS
endif # MOZ_PROFILE_USE
endif # NO_PROFILE_GUIDED_OPTIMIZE
@@ -536,7 +540,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mconsole
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE$(MOZ_SUBSYSTEM_VERSION)
endif
endif
else # MOZ_WINCONSOLE
@@ -547,7 +551,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mwindows
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION)
endif
endif
endif
@@ -654,10 +658,6 @@
# overridden by the command line. (Besides, AB_CD is prettier).
AB_CD = $(MOZ_UI_LOCALE)
-ifndef L10NBASEDIR
-L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
-endif
-
EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(L10NBASEDIR)/$(AB_CD)/$(subst /locales,,$(1)))
EXPAND_MOZLOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(MOZILLA_SRCDIR)/$(1)/en-US,$(L10NBASEDIR)/$(AB_CD)/$(subst /locales,,$(1)))
@@ -665,18 +665,6 @@
LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
endif
-ifdef LOCALE_SRCDIR
-# if LOCALE_MERGEDIR is set, use mergedir first, then the localization,
-# and finally en-US
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
-endif
-MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
-endif
-endif
-
ifdef WINCE
RUN_TEST_PROGRAM = $(PYTHON) $(MOZILLA_SRCDIR)/build/mobile/devicemanager-run-test.py
else
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/config/rules.mk comm-esr17/config/rules.mk
--- comm-esr17.orig/config/rules.mk 2013-09-12 09:49:36 +0900
+++ comm-esr17/config/rules.mk 2013-09-14 03:12:26 +0900
@@ -590,7 +590,7 @@
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
ifndef IS_COMPONENT
-DSO_LDOPTS += -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
+DSO_LDOPTS += -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
endif
endif
endif
@@ -1626,13 +1626,35 @@
$(FINAL_TARGET)/chrome:
$(NSINSTALL) -D $@
+L10N = $(AB_CD)
+ifdef relativesrcdir
+ifdef L10NBASEDIR
+L10N = en-US $(shell ls $(L10NBASEDIR))
+endif
+ifdef LOCALE_MERGEDIR
+LOCALE_MERGEDIR_MERGE = -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
+LOCALE_MERGEDIR_EN_US = -c $(topsrcdir)/$(relativesrcdir)/en-US
+endif
+endif
+
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
+ for AB_CD in $(L10N) ; do \
+ if test "$(relativesrcdir)" ; then \
+ if test "$${AB_CD}" = "en-US" ; then \
+ LOCALE_SRCDIR=$(topsrcdir)/$(relativesrcdir)/en-US ; \
+ else \
+ LOCALE_SRCDIR=$(L10NBASEDIR)/$${AB_CD}/$(subst /locales,,$(relativesrcdir)) ; \
+ fi ; \
+ MAKE_JARS_FLAGS="-DAB_CD=$${AB_CD} $(LOCALE_MERGEDIR_MERGE) -c $${LOCALE_SRCDIR} $(LOCALE_MERGEDIR_EN_US)" ; \
+ fi ; \
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
- $(JAR_MANIFEST)
+ $${MAKE_JARS_FLAGS} \
+ $(JAR_MANIFEST) ; \
+ done
endif
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/configure.in comm-esr17/configure.in
--- comm-esr17.orig/configure.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/configure.in 2013-09-14 03:12:26 +0900
@@ -436,12 +436,10 @@
AC_DEFINE(_CRT_NONSTDC_NO_DEPRECATE)
elif test "$_CC_MAJOR_VERSION" = "15"; then
_CC_SUITE=9
- LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "16"; then
_CC_SUITE=10
- LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "17"; then
@@ -622,7 +620,7 @@
fi
# Check windres version
AC_MSG_CHECKING([for windres version >= $WINDRES_VERSION])
- _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
+ _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $5 }'`.0
AC_MSG_RESULT([$_WINDRES_VERSION])
_WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
_WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
@@ -689,6 +687,10 @@
SKIP_COMPILER_CHECKS=1
SKIP_LIBRARY_CHECKS=1
+ if test $_MSC_VER -ge 1600; then
+ AC_DEFINE(HAVE_NULLPTR)
+ fi
+
dnl Since we're using MSVC, we'll be building MAPI
MAIL_COMPONENT="$MAIL_COMPONENT msgMapi"
export MAIL_COMPONENT
@@ -1576,7 +1578,7 @@
HOST_CFLAGS="$HOST_CFLAGS -TC -nologo -Fd\$(HOST_PDBFILE)"
HOST_RANLIB='echo ranlib'
else
- HOST_CFLAGS="$HOST_CFLAGS -mno-cygwin"
+ HOST_CFLAGS="$HOST_CFLAGS -mwindows"
fi
HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11"
HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
@@ -2047,9 +2049,9 @@
# #include vs -I./dist/include/string issue so don't use it
MOZ_NATIVE_MAKEDEPEND=
if test -n "$GNU_CC"; then
- CC="$CC -mno-cygwin"
- CXX="$CXX -mno-cygwin"
- CPP="$CPP -mno-cygwin"
+ CC="$CC -mwindows"
+ CXX="$CXX -mwindows"
+ CPP="$CPP -mwindows"
CFLAGS="$CFLAGS -mms-bitfields"
CXXFLAGS="$CXXFLAGS -mms-bitfields"
DSO_LDOPTS='-shared'
@@ -2064,7 +2066,8 @@
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
DLL_PREFIX=
- IMPORT_LIB_SUFFIX=dll.a
+ IMPORT_LIB_SUFFIX=a
+ GCC_VERSION=`$CC -v 2>&1 | awk '/^gcc version/ { print $3 }'`
else
TARGET_COMPILER_ABI=msvc
HOST_CC='$(CC)'
@@ -2093,7 +2096,7 @@
MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)'
MKSHLIB_FORCE_ALL=
MKSHLIB_UNFORCE_ALL=
- DSO_LDOPTS=-SUBSYSTEM:WINDOWS
+ DSO_LDOPTS=-SUBSYSTEM:WINDOWS'$(MOZ_SUBSYSTEM_VERSION)'
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(DEPTH)/comm-config.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(DEPTH)/comm-config.h -DMOZILLA_CLIENT'
@@ -5173,7 +5176,13 @@
MOZ_TREE_FREETYPE=1,
MOZ_TREE_FREETYPE= )
if test -n "$MOZ_TREE_FREETYPE"; then
+ AC_DEFINE(MOZ_TREE_FREETYPE)
+ AC_SUBST(MOZ_TREE_FREETYPE)
+if test -z "$_WIN32_MSVC"; then
CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype2,$(LIBXUL_DIST)/lib)'
+else
+ CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
+fi
fi
dnl ========================================================
@@ -5942,13 +5951,6 @@
AC_SUBST(MOZ_DEMANGLE_SYMBOLS)
dnl ========================================================
-dnl = Support for gcc stack unwinding (from gcc 3.3)
-dnl ========================================================
-if test "$HAVE_GCC3_ABI" -a -z "$SKIP_LIBRARY_CHECKS"; then
- AC_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
-fi
-
-dnl ========================================================
dnl =
dnl = Misc. Options
dnl =
@@ -6578,6 +6580,12 @@
fi
AC_SUBST(MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE)
+if test -z "$CC_VERSION"; then
+ CC_VERSION=`$CC -v 2>&1 | grep -i 'version'`
+fi
+if test -z "$CXX_VERSION"; then
+ CXX_VERSION=`$CXX -v 2>&1 | grep -i 'version'`
+fi
dnl ========================================================
dnl =
@@ -6687,7 +6695,7 @@
Prefix for MOZ_MACBUNDLE_NAME],
[ MOZ_MACBUNDLE_NAME_PREFIX="$withval"])
-MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '`
+MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_NAME | tr -d ' '`
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
fi
@@ -6988,7 +6996,7 @@
# See bug 655339.
case "$host" in
*-apple-darwin11*)
- FIXED_EGREP="arch -arch i386 egrep"
+ FIXED_EGREP="env ARCHPREFERENCE=i386,x86_64 arch egrep"
;;
*)
FIXED_EGREP="egrep"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/build.mk comm-esr17/ldap/sdks/c-sdk/build.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/build.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/build.mk 2013-09-14 03:12:26 +0900
@@ -448,7 +448,7 @@
LINK_EXE = $(CYGWIN_WRAPPER) link $(DLLFLAGS) -OUT:"$@" -MAP $(ALDFLAGS) $(LDFLAGS) $(ML_DEBUG) \
$(LCFLAGS) -NOLOGO $(DEBUG_FLAGS) -INCREMENTAL:NO \
- -NODEFAULTLIB:MSVCRTD -SUBSYSTEM:$(SUBSYSTEM) $(DEPLIBS) \
+ -NODEFAULTLIB:MSVCRTD -SUBSYSTEM:$(SUBSYSTEM)$(MOZ_SUBSYSTEM_VERSION) $(DEPLIBS) \
$(filter %.$(OBJ_SUFFIX),$^) $(OBJS) $(EXTRA_LIBS) $(PLATFORMLIBS) msvcrt.lib
ifdef MT
@@ -469,7 +469,7 @@
endif
LINK_DLL = $(CYGWIN_WRAPPER) $(LD) $(DLLFLAGS) -MAP $(OS_DLLFLAGS) \
- $(ML_DEBUG) -SUBSYSTEM:$(SUBSYSTEM) $(LLFLAGS) $(DLL_LDFLAGS) \
+ $(ML_DEBUG) -SUBSYSTEM:$(SUBSYSTEM)$(MOZ_SUBSYSTEM_VERSION) $(LLFLAGS) $(DLL_LDFLAGS) \
$(EXTRA_LIBS) -out:"$@" $(OBJS)
endif # NS_USE_GCC
else # WINNT
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/config/OS2.mk comm-esr17/ldap/sdks/c-sdk/config/OS2.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/config/OS2.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/config/OS2.mk 2013-09-14 03:12:26 +0900
@@ -78,7 +78,7 @@
CC = gcc
CCC = gcc
-LINK = gcc
+LD = gcc
RC = rc.exe
FILTER = emxexp
IMPLIB = emximp -o
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/config/WIN32.mk comm-esr17/ldap/sdks/c-sdk/config/WIN32.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/config/WIN32.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/config/WIN32.mk 2013-09-14 03:12:26 +0900
@@ -51,7 +51,7 @@
CC = cl
CCC = cl
-LINK = link
+LD = link
AR = lib -NOLOGO -OUT:"$@"
RANLIB = echo
BSDECHO = echo
@@ -173,4 +173,4 @@
OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH_TAG)$(OBJDIR_TAG).$(OBJDIR_SUFFIX)
-OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS -PDB:NONE
+OS_DLLFLAGS = -nologo -DLL -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION) -PDB:NONE
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/config/config.mk comm-esr17/ldap/sdks/c-sdk/config/config.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/config/config.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/config/config.mk 2013-09-14 03:12:26 +0900
@@ -158,7 +158,7 @@
AS = $(CC)
ASFLAGS = $(CFLAGS)
PURIFY = purify $(PURIFYOPTIONS)
-LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
NFSPWD = $(MOD_DEPTH)/config/nfspwd
CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/config/rules.mk comm-esr17/ldap/sdks/c-sdk/config/rules.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/config/rules.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/config/rules.mk 2013-09-14 03:12:26 +0900
@@ -356,7 +356,7 @@
echo $(W16LIBS) >>w16link
echo $(W16_EXPORTS) >>w16link
echo libfile libentry >>w16link
- $(LINK) @w16link.
+ $(LD) @w16link.
rm w16link
else # WIN16
$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(OBJS)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/config/win16.mk comm-esr17/ldap/sdks/c-sdk/config/win16.mk
--- comm-esr17.orig/ldap/sdks/c-sdk/config/win16.mk 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/config/win16.mk 2013-09-14 03:12:26 +0900
@@ -70,7 +70,7 @@
CC = wcc
CCC = wcl
-LINK = wlink
+LD = wlink
AR = wlib -q $@
RC = wrc.exe /r /dWIN16=1 /bt=windows
RANLIB = echo
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/configure.in comm-esr17/ldap/sdks/c-sdk/configure.in
--- comm-esr17.orig/ldap/sdks/c-sdk/configure.in 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/configure.in 2013-09-14 03:12:26 +0900
@@ -1584,8 +1584,8 @@
RESOLVE_LINK_SYMBOLS=1
PROG_SUFFIX=.exe
if test -n "$GNU_CC"; then
- CC="$CC -mno-cygwin"
- CXX="$CXX -mno-cygwin"
+ CC="$CC -mwindows"
+ CXX="$CXX -mwindows"
DLL_SUFFIX=dll
MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) -o $@'
# Use temp file for windres (bug 213281)
@@ -1674,7 +1674,7 @@
LDFLAGS="$LDFLAGS -DEBUG"
fi
- OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS'
+ OS_DLLFLAGS='-nologo -DLL -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION)'
if test "$_MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE"
fi
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/ldap/sdks/c-sdk/ldap/examples/win32.mak comm-esr17/ldap/sdks/c-sdk/ldap/examples/win32.mak
--- comm-esr17.orig/ldap/sdks/c-sdk/ldap/examples/win32.mak 2013-09-12 09:56:10 +0900
+++ comm-esr17/ldap/sdks/c-sdk/ldap/examples/win32.mak 2013-09-14 03:12:26 +0900
@@ -103,7 +103,7 @@
CC=cl
OPTFLAGS=-MD
CFLAGS=$(OPTFLAGS) $(EXTRACFLAGS) -I$(INCDIR) -I$(NSPRINCDIR)
-LINK=link
+LD=link
LDFLAGS=$(EXTRALDFLAGS)
@@ -176,4 +176,4 @@
%.exe : %.obj
- $(LINK) -OUT:$@ $(LDFLAGS) $(SYSLIBS) $< $(LIBS)
+ $(LD) -OUT:$@ $(LDFLAGS) $(SYSLIBS) $< $(LIBS)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/app/Makefile.in comm-esr17/mail/app/Makefile.in
--- comm-esr17.orig/mail/app/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/app/Makefile.in 2013-09-14 03:12:26 +0900
@@ -206,7 +206,7 @@
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
+MAC_APP_NAME = $(MOZ_APP_NAME)
ifdef MOZ_DEBUG
MAC_APP_NAME := $(MAC_APP_NAME)Debug
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
--- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-09-14 03:12:26 +0900
@@ -772,13 +772,6 @@
pref("mail.taskbar.lists.tasks.enabled", true);
#endif
-// Disable hardware accelerated layers
-pref("layers.acceleration.disabled", true);
-#ifdef XP_WIN
-// and direct2d support on Windows
-pref("gfx.direct2d.disabled", true);
-#endif
-
// Account provisioner.
pref("mail.provider.providerList", "https://broker-live.mozillamessaging.com/provider/list");
pref("mail.provider.suggestFromName", "https://broker-live.mozillamessaging.com/provider/suggest");
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/app/thunderbird.exe.manifest comm-esr17/mail/app/thunderbird.exe.manifest
--- comm-esr17.orig/mail/app/thunderbird.exe.manifest 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/app/thunderbird.exe.manifest 2013-09-14 03:12:26 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/aurora/branding.nsi comm-esr17/mail/branding/aurora/branding.nsi
--- comm-esr17.orig/mail/branding/aurora/branding.nsi 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/aurora/branding.nsi 2013-09-14 03:12:26 +0900
@@ -7,7 +7,7 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Earlybird"
+!define BrandFullNameInternal "thunderbird"
!define CompanyName "mozilla.org"
!define URLInfoAbout "http://www.mozilla.org/"
!define URLUpdateInfo "http://www.mozilla.org/products/thunderbird/"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/aurora/configure.sh comm-esr17/mail/branding/aurora/configure.sh
--- comm-esr17.orig/mail/branding/aurora/configure.sh 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/aurora/configure.sh 2013-09-14 03:12:26 +0900
@@ -2,4 +2,4 @@
# 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/.
-MOZ_APP_DISPLAYNAME=Earlybird
+MOZ_APP_DISPLAYNAME=Thunderbird
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/aurora/locales/en-US/brand.dtd comm-esr17/mail/branding/aurora/locales/en-US/brand.dtd
--- comm-esr17.orig/mail/branding/aurora/locales/en-US/brand.dtd 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/aurora/locales/en-US/brand.dtd 2013-09-14 03:12:26 +0900
@@ -2,7 +2,7 @@
- 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/. -->
-
-
+
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/aurora/locales/en-US/brand.properties comm-esr17/mail/branding/aurora/locales/en-US/brand.properties
--- comm-esr17.orig/mail/branding/aurora/locales/en-US/brand.properties 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/aurora/locales/en-US/brand.properties 2013-09-14 03:12:26 +0900
@@ -2,6 +2,6 @@
# 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/.
-brandShortName=Earlybird
-brandFullName=Earlybird
+brandShortName=thunderbird
+brandFullName=thunderbird
vendorShortName=mozilla.org
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/nightly/branding.nsi comm-esr17/mail/branding/nightly/branding.nsi
--- comm-esr17.orig/mail/branding/nightly/branding.nsi 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/nightly/branding.nsi 2013-09-14 03:12:26 +0900
@@ -7,7 +7,7 @@
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Daily"
+!define BrandFullNameInternal "thunderbird"
!define CompanyName "mozilla.org"
!define URLInfoAbout "http://www.mozilla.org/"
!define URLUpdateInfo "http://www.mozilla.org/products/thunderbird/"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/nightly/configure.sh comm-esr17/mail/branding/nightly/configure.sh
--- comm-esr17.orig/mail/branding/nightly/configure.sh 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/nightly/configure.sh 2013-09-14 03:12:26 +0900
@@ -2,4 +2,4 @@
# 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/.
-MOZ_APP_DISPLAYNAME=Daily
+MOZ_APP_DISPLAYNAME=Thunderbird
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/nightly/locales/en-US/brand.dtd comm-esr17/mail/branding/nightly/locales/en-US/brand.dtd
--- comm-esr17.orig/mail/branding/nightly/locales/en-US/brand.dtd 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/nightly/locales/en-US/brand.dtd 2013-09-14 03:12:26 +0900
@@ -2,7 +2,7 @@
- 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/. -->
-
-
+
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/branding/nightly/locales/en-US/brand.properties comm-esr17/mail/branding/nightly/locales/en-US/brand.properties
--- comm-esr17.orig/mail/branding/nightly/locales/en-US/brand.properties 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/branding/nightly/locales/en-US/brand.properties 2013-09-14 03:12:26 +0900
@@ -2,7 +2,7 @@
# 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/.
-brandShortName=Daily
-brandFullName=Daily
+brandShortName=thunderbird
+brandFullName=thunderbird
vendorShortName=mozilla.org
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/components/search/wsenable/Makefile.in comm-esr17/mail/components/search/wsenable/Makefile.in
--- comm-esr17.orig/mail/components/search/wsenable/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/components/search/wsenable/Makefile.in 2013-09-14 03:12:26 +0900
@@ -20,4 +20,14 @@
# This isn't XPCOM code, but it wants to use STL so disable STL wrappers
STL_FLAGS =
+ifndef MOZ_WINCONSOLE
+ifdef MOZ_DEBUG
+MOZ_WINCONSOLE = 1
+else
+MOZ_WINCONSOLE = 0
+endif
+endif
+
include $(topsrcdir)/config/rules.mk
+
+LDFLAGS += -MANIFESTUAC:NO
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/components/search/wsenable/WSEnable.exe.manifest comm-esr17/mail/components/search/wsenable/WSEnable.exe.manifest
--- comm-esr17.orig/mail/components/search/wsenable/WSEnable.exe.manifest 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/components/search/wsenable/WSEnable.exe.manifest 2013-09-14 03:12:26 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/installer/Makefile.in comm-esr17/mail/installer/Makefile.in
--- comm-esr17.orig/mail/installer/Makefile.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/installer/Makefile.in 2013-09-14 03:12:26 +0900
@@ -22,7 +22,11 @@
offline \
$(NULL)
+ifdef L10NBASEDIR
+MOZ_LOCALIZED_PKG_LIST = en-US $(shell ls $(L10NBASEDIR))
+else
MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
+endif
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
ifdef MOZ_ENABLE_GNOME_COMPONENT
@@ -39,8 +43,10 @@
ifeq ($(MOZ_CHROME_FILE_FORMAT), jar)
DEFINES += -DJAREXT=.jar
+JAREXT = .jar
else
DEFINES += -DJAREXT=
+JAREXT =
endif
ifdef MOZ_ANGLE
@@ -63,8 +69,22 @@
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
+ifeq (Darwin, $(OS_ARCH))
+CHROME_PATH = $(_BINPATH)/chrome
+else
+CHROME_PATH = bin/chrome
+endif
+
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+ for AB_CD in $(MOZ_LOCALIZED_PKG_LIST) ; do \
+ if test "$${AB_CD}" != "$(AB_CD)" ; then \
+ echo "" >> $@ ; \
+ echo "[$${AB_CD}]" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}$(JAREXT)" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}.manifest" >> $@ ; \
+ fi ; \
+ done
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/installer/package-manifest.in comm-esr17/mail/installer/package-manifest.in
--- comm-esr17.orig/mail/installer/package-manifest.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/installer/package-manifest.in 2013-09-16 16:47:13 +0900
@@ -82,6 +82,9 @@
#else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#endif
+#ifdef MOZ_TREE_FREETYPE
+@BINPATH@/@DLL_PREFIX@freetype2@DLL_SUFFIX@
+#endif
#ifdef XP_MACOSX
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
@@ -92,8 +95,6 @@
#ifdef MOZ_ANGLE
@BINPATH@/libEGL.dll
@BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DX9_DLL@
-@BINPATH@/@MOZ_D3DCOMPILER_DLL@
#endif
; Modules
@@ -211,7 +212,6 @@
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
@BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
-@BINPATH@/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
; Gloda
@BINPATH@/chrome/gloda@JAREXT@
@@ -524,7 +524,6 @@
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_battery.xpt
@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_contacts.xpt
@BINPATH@/components/dom_core.xpt
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_events.xpt
@@ -647,8 +646,6 @@
@BINPATH@/components/chardet.xpt
@BINPATH@/components/ConsoleAPI.js
@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
@BINPATH@/components/contentAreaDropListener.js
@BINPATH@/components/contentAreaDropListener.manifest
@BINPATH@/components/contentSecurityPolicy.js
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mail/installer/windows/nsis/defines.nsi.in comm-esr17/mail/installer/windows/nsis/defines.nsi.in
--- comm-esr17.orig/mail/installer/windows/nsis/defines.nsi.in 2013-09-12 09:49:36 +0900
+++ comm-esr17/mail/installer/windows/nsis/defines.nsi.in 2013-09-14 03:12:26 +0900
@@ -17,9 +17,9 @@
!define AppRegNameMail "Thunderbird"
!define AppRegNameNews "Thunderbird (News)"
-!define ClientsRegName "Mozilla Thunderbird"
+!define ClientsRegName "@MOZ_APP_NAME@"
-!define BrandShortName "@MOZ_APP_DISPLAYNAME@"
+!define BrandShortName "@MOZ_APP_NAME@"
!define PreReleaseSuffix "@PRE_RELEASE_SUFFIX@"
!define BrandFullName "${BrandFullNameInternal}${PreReleaseSuffix}"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/base/search/src/nsMsgSearchTerm.cpp comm-esr17/mailnews/base/search/src/nsMsgSearchTerm.cpp
--- comm-esr17.orig/mailnews/base/search/src/nsMsgSearchTerm.cpp 2013-09-12 09:49:37 +0900
+++ comm-esr17/mailnews/base/search/src/nsMsgSearchTerm.cpp 2013-09-14 03:12:26 +0900
@@ -197,7 +197,7 @@
}
}
if (!found)
- *string = '\0'; // don't leave the string uninitialized
+ *string = ""; // don't leave the string uninitialized
// we no longer return invalid attribute. If we cannot find the string in the table,
// then it is an arbitrary header. Return success regardless if found or not
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp comm-esr17/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp
--- comm-esr17.orig/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp 2013-09-12 09:49:37 +0900
+++ comm-esr17/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp 2013-09-14 03:12:26 +0900
@@ -240,7 +240,7 @@
{
// this must be a folder that had no hits with the current search.
// So all cached hits, if any, need to be removed.
- UpdateCacheAndViewForFolder(m_foldersSearchingOver[0], 0, nullptr);
+ UpdateCacheAndViewForFolder(m_foldersSearchingOver[0], nullptr, 0);
m_foldersSearchingOver.RemoveObjectAt(0);
}
}
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/base/util/nsMsgDBFolder.cpp comm-esr17/mailnews/base/util/nsMsgDBFolder.cpp
--- comm-esr17.orig/mailnews/base/util/nsMsgDBFolder.cpp 2013-09-12 09:49:37 +0900
+++ comm-esr17/mailnews/base/util/nsMsgDBFolder.cpp 2013-09-14 03:12:26 +0900
@@ -2753,7 +2753,7 @@
// post analysis filters will run consistently on a folder, even if
// disabled junk processing, which could be dynamic through whitelisting,
// makes the bayes analysis unnecessary.
- OnMessageClassified(nullptr, nullptr, nullptr);
+ OnMessageClassified(nullptr, nsIJunkMailPlugin::UNCLASSIFIED, 0);
}
return rv;
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/compose/src/nsMsgCompUtils.cpp comm-esr17/mailnews/compose/src/nsMsgCompUtils.cpp
--- comm-esr17.orig/mailnews/compose/src/nsMsgCompUtils.cpp 2013-09-12 09:49:37 +0900
+++ comm-esr17/mailnews/compose/src/nsMsgCompUtils.cpp 2013-09-14 03:12:27 +0900
@@ -1241,25 +1241,25 @@
// check to see if we are in the middle of escaped char
if (*end == '%')
{
- tmp = '%'; *end = nullptr;
+ tmp = '%'; *end = 0;
}
else if (end-1 > start && *(end-1) == '%')
{
- end -= 1; tmp = '%'; *end = nullptr;
+ end -= 1; tmp = '%'; *end = 0;
}
else if (end-2 > start && *(end-2) == '%')
{
- end -= 2; tmp = '%'; *end = nullptr;
+ end -= 2; tmp = '%'; *end = 0;
}
else
{
- tmp = *end; *end = nullptr;
+ tmp = *end; *end = 0;
}
}
else
{
// XXX should check if we are in the middle of escaped char (RFC 822)
- tmp = *end; *end = nullptr;
+ tmp = *end; *end = 0;
}
NS_MsgSACat(&foldedParm, start);
if (!needEscape)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/compose/src/nsMsgSend.cpp comm-esr17/mailnews/compose/src/nsMsgSend.cpp
--- comm-esr17.orig/mailnews/compose/src/nsMsgSend.cpp 2013-09-12 09:49:38 +0900
+++ comm-esr17/mailnews/compose/src/nsMsgSend.cpp 2013-09-14 03:12:27 +0900
@@ -223,7 +223,7 @@
NS_IMETHODIMP MsgDeliveryListener::OnStartRunningUrl(nsIURI *url)
{
if (mMsgSend)
- mMsgSend->NotifyListenerOnStartSending(nullptr, nullptr);
+ mMsgSend->NotifyListenerOnStartSending(nullptr, 0);
return NS_OK;
}
@@ -4262,7 +4262,7 @@
aMsgType, aMsgBody,
aMsgBodyLength,
nullptr, aAttachments,
- nullptr, EmptyCString(), nullptr);
+ nullptr, EmptyCString(), nsIMsgCompType::New);
if (NS_FAILED(rv) && mSendReport)
mSendReport->SetError(nsIMsgSendReport::process_Current, rv, false);
@@ -4314,9 +4314,9 @@
rv = Init(aUserIndentity, aAccountKey, (nsMsgCompFields *)fields, sendIFile,
digest_p, false, mode, msgToReplace,
- nullptr, nullptr, nullptr,
+ nullptr, nullptr, 0,
nullptr, nullptr,
- password, EmptyCString(), nullptr);
+ password, EmptyCString(), nsIMsgCompType::New);
if (NS_SUCCEEDED(rv))
rv = DeliverMessage();
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp comm-esr17/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp
--- comm-esr17.orig/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp 2013-09-12 09:49:38 +0900
+++ comm-esr17/mailnews/extensions/bayesian-spam-filter/src/nsBayesianFilter.cpp 2013-09-14 03:12:27 +0900
@@ -1346,9 +1346,9 @@
{
// call all listeners with null parameters to signify end of batch
if (mJunkListener)
- mJunkListener->OnMessageClassified(nullptr, nullptr, nullptr);
+ mJunkListener->OnMessageClassified(nullptr, nsIJunkMailPlugin::UNCLASSIFIED, 0);
if (mTraitListener)
- mTraitListener->OnMessageTraitsClassified(nullptr, nullptr, nullptr, nullptr);
+ mTraitListener->OnMessageTraitsClassified(nullptr, 0, nullptr, nullptr);
mTokenListener = nullptr; // this breaks the circular ref that keeps this object alive
// so we will be destroyed as a result.
}
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-esr17/mailnews/imap/src/nsImapMailFolder.cpp
--- comm-esr17.orig/mailnews/imap/src/nsImapMailFolder.cpp 2013-09-12 09:49:38 +0900
+++ comm-esr17/mailnews/imap/src/nsImapMailFolder.cpp 2013-09-14 03:12:27 +0900
@@ -4671,7 +4671,7 @@
msgUrl->GetMsgWindow(getter_AddRefs(msgWindow));
}
m_filterList->ApplyFiltersToHdr(nsMsgFilterType::InboxRule, newMsgHdr,
- this, mDatabase, nullptr, nullptr, this,
+ this, mDatabase, nullptr, 0, this,
msgWindow);
NotifyFolderEvent(mFiltersAppliedAtom);
}
@@ -9125,7 +9125,7 @@
else // end of batch
{
// Parent will apply post bayes filters.
- nsMsgDBFolder::OnMessageClassified(nullptr, nullptr, nullptr);
+ nsMsgDBFolder::OnMessageClassified(nullptr, nsIJunkMailPlugin::UNCLASSIFIED, 0);
if (m_junkMessagesToMarkAsRead)
{
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/import/eudora/src/nsEudoraCompose.cpp comm-esr17/mailnews/import/eudora/src/nsEudoraCompose.cpp
--- comm-esr17.orig/mailnews/import/eudora/src/nsEudoraCompose.cpp 2013-09-12 09:49:38 +0900
+++ comm-esr17/mailnews/import/eudora/src/nsEudoraCompose.cpp 2013-09-14 03:12:27 +0900
@@ -527,7 +527,7 @@
nsCOMPtr uri;
nsresult rv = NS_NewFileURI(getter_AddRefs(uri), pAttach->pAttachment);
- NS_ENSURE_SUCCESS(rv, nullptr);
+ NS_ENSURE_SUCCESS(rv, rv);
uri->GetSpec(urlStr);
if (urlStr.IsEmpty())
return NS_ERROR_FAILURE;
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mailnews/local/src/nsLocalMailFolder.cpp comm-esr17/mailnews/local/src/nsLocalMailFolder.cpp
--- comm-esr17.orig/mailnews/local/src/nsLocalMailFolder.cpp 2013-09-12 09:49:38 +0900
+++ comm-esr17/mailnews/local/src/nsLocalMailFolder.cpp 2013-09-14 03:12:27 +0900
@@ -3374,7 +3374,7 @@
else // end of batch
{
// Parent will apply post bayes filters.
- nsMsgDBFolder::OnMessageClassified(nullptr, nullptr, nullptr);
+ nsMsgDBFolder::OnMessageClassified(nullptr, nsIJunkMailPlugin::UNCLASSIFIED, 0);
nsCOMPtr messages(do_CreateInstance(NS_ARRAY_CONTRACTID));
if (!mSpamKeysToMove.IsEmpty())
{
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/build/autoconf/compiler-opts.m4 comm-esr17/mozilla/build/autoconf/compiler-opts.m4
--- comm-esr17.orig/mozilla/build/autoconf/compiler-opts.m4 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/build/autoconf/compiler-opts.m4 2013-09-14 03:12:27 +0900
@@ -14,7 +14,7 @@
if test -z "$CC"; then CC=cl; fi
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="cl -E -nologo"; fi
- if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
+ if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; fi
if test -z "$LD"; then LD=link; fi
if test -z "$AS"; then
case "${target_cpu}" in
@@ -27,6 +27,7 @@
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
+ ac_cv_prog_CXXCPP="$CXXCPP"
# need override this flag since we don't use $(LDFLAGS) for this.
if test -z "$HOST_LDFLAGS" ; then
@@ -34,19 +35,8 @@
fi
;;
*-darwin*)
- # we prefer gcc-4.2 over gcc on older darwin, so
- # use that specific version if it's available.
- # On newer versions of darwin, gcc is llvm-gcc while gcc-4.2 is the plain
- # one, so we also try that first. If that fails, we fall back to clang
- # as llvm-gcc is an unsupported dead end.
- MOZ_PATH_PROGS(CC, $CC gcc-4.2 clang gcc)
- MOZ_PATH_PROGS(CXX, $CXX g++-4.2 clang++ g++)
- IS_LLVM_GCC=$($CC -v 2>&1 | grep llvm-gcc)
- if test -n "$IS_LLVM_GCC"
- then
- echo llvm-gcc is known to be broken, please use gcc-4.2 or clang.
- exit 1
- fi
+ if test -z "$CC"; then CC=gcc-4.2; fi
+ if test -z "$CXX"; then CXX=g++-4.2; fi
;;
esac
fi
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/build/pgo/profileserver.py comm-esr17/mozilla/build/pgo/profileserver.py
--- comm-esr17.orig/mozilla/build/pgo/profileserver.py 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/build/pgo/profileserver.py 2013-09-14 03:12:27 +0900
@@ -12,6 +12,7 @@
import sys
import shutil
from datetime import datetime
+import time
SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
sys.path.insert(0, SCRIPT_DIR)
@@ -24,7 +25,7 @@
os.chdir(SCRIPT_DIR)
class EasyServer(SocketServer.TCPServer):
- allow_reuse_address = True
+ allow_reuse_address = False
if __name__ == '__main__':
from optparse import OptionParser
@@ -38,7 +39,15 @@
debuggerInfo = getDebuggerInfo(".", options.debugger, options.debuggerArgs,
options.debuggerInteractive)
- httpd = EasyServer(("", PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
+ httpd = None
+ while not httpd:
+ try:
+ httpd = EasyServer(("", PORT), SimpleHTTPServer.SimpleHTTPRequestHandler)
+ except:
+ print("wait for previous PGO server ...")
+ time.sleep(15)
+ else:
+ print("start PGO server.")
t = threading.Thread(target=httpd.serve_forever)
t.setDaemon(True) # don't hang on exit
t.start()
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/client.mk comm-esr17/mozilla/client.mk
--- comm-esr17.orig/mozilla/client.mk 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/client.mk 2013-09-14 03:12:27 +0900
@@ -101,7 +101,7 @@
# As $(shell) doesn't preserve newlines, use sed to replace them with an
# unlikely sequence (||), which is then replaced back to newlines by make
# before evaluation.
-$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
+$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(CONFIG_SHELL) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
ifndef MOZ_OBJDIR
MOZ_OBJDIR = obj-$(CONFIG_GUESS)
@@ -134,6 +134,7 @@
# 'configure' scripts generated by autoconf.
CONFIGURES := $(TOPSRCDIR)/configure
+CONFIGURES += $(TOPSRCDIR)/nsprpub/configure
CONFIGURES += $(TOPSRCDIR)/js/src/configure
# Make targets that are going to be passed to the real build system
@@ -276,6 +277,7 @@
CONFIGURE_ENV_ARGS += \
MAKE="$(MAKE)" \
+ _PYMAKE="$(.PYMAKE)" \
$(NULL)
# configure uses the program name to determine @srcdir@. Calling it without
@@ -301,8 +303,8 @@
configure:: $(configure-preqs)
@echo cd $(OBJDIR);
- @echo $(CONFIGURE) $(CONFIGURE_ARGS)
- @cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
+ @echo $(CONFIG_SHELL) $(CONFIGURE) $(CONFIGURE_ARGS)
+ @cd $(OBJDIR) && $(BUILD_PROJECT_ARG) $(CONFIGURE_ENV_ARGS) $(CONFIG_SHELL) $(CONFIGURE) $(CONFIGURE_ARGS) \
|| ( echo "*** Fix above errors and then restart with\
\"$(MAKE) -f client.mk build\"" && exit 1 )
@touch $(OBJDIR)/Makefile
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/config/config.mk comm-esr17/mozilla/config/config.mk
--- comm-esr17.orig/mozilla/config/config.mk 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/config/config.mk 2013-09-14 03:12:27 +0900
@@ -291,8 +291,10 @@
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # MOZ_PROFILE_GENERATE
ifdef MOZ_PROFILE_USE
@@ -300,8 +302,10 @@
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # MOZ_PROFILE_USE
endif # NO_PROFILE_GUIDED_OPTIMIZE
@@ -597,7 +601,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mconsole
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE$(MOZ_SUBSYSTEM_VERSION)
endif
endif
else # MOZ_WINCONSOLE
@@ -608,7 +612,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mwindows
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION)
endif
endif
endif
@@ -694,30 +698,12 @@
# overridden by the command line. (Besides, AB_CD is prettier).
AB_CD = $(MOZ_UI_LOCALE)
-ifndef L10NBASEDIR
- L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
-else
- IS_LANGUAGE_REPACK = 1
-endif
-
EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
ifdef relativesrcdir
LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
endif
-ifdef LOCALE_SRCDIR
-# if LOCALE_MERGEDIR is set, use mergedir first, then the localization,
-# and finally en-US
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
-endif
-MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
-endif
-endif
-
ifdef LOCALE_MERGEDIR
MERGE_FILE = $(firstword \
$(wildcard $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))/$(1)) \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/config/rules.mk comm-esr17/mozilla/config/rules.mk
--- comm-esr17.orig/mozilla/config/rules.mk 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/config/rules.mk 2013-09-14 03:12:27 +0900
@@ -523,7 +523,7 @@
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
ifndef IS_COMPONENT
-DSO_LDOPTS += -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
+DSO_LDOPTS += -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
endif
endif
endif
@@ -1443,13 +1443,35 @@
$(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)
+L10N = $(AB_CD)
+ifdef relativesrcdir
+ifdef L10NBASEDIR
+L10N = en-US $(shell ls $(L10NBASEDIR))
+endif
+ifdef LOCALE_MERGEDIR
+LOCALE_MERGEDIR_MERGE = -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
+LOCALE_MERGEDIR_EN_US = -c $(topsrcdir)/$(relativesrcdir)/en-US
+endif
+endif
+
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
+ for AB_CD in $(L10N) ; do \
+ if test "$(relativesrcdir)" ; then \
+ if test "$${AB_CD}" = "en-US" ; then \
+ LOCALE_SRCDIR=$(topsrcdir)/$(relativesrcdir)/en-US ; \
+ else \
+ LOCALE_SRCDIR=$(L10NBASEDIR)/$${AB_CD}/$(subst /locales,,$(relativesrcdir)) ; \
+ fi ; \
+ MAKE_JARS_FLAGS="-DAB_CD=$${AB_CD} $(LOCALE_MERGEDIR_MERGE) -c $${LOCALE_SRCDIR} $(LOCALE_MERGEDIR_EN_US)" ; \
+ fi ; \
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
- $(JAR_MANIFEST)
+ $${MAKE_JARS_FLAGS} \
+ $(JAR_MANIFEST) ; \
+ done
endif
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/configure.in comm-esr17/mozilla/configure.in
--- comm-esr17.orig/mozilla/configure.in 2013-09-12 09:55:24 +0900
+++ comm-esr17/mozilla/configure.in 2013-09-14 03:12:27 +0900
@@ -683,7 +683,7 @@
fi
# Check windres version
AC_MSG_CHECKING([for windres version >= $WINDRES_VERSION])
- _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
+ _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $5 }'`.0
AC_MSG_RESULT([$_WINDRES_VERSION])
_WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
_WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
@@ -976,6 +976,22 @@
cc_version=$($CC --version)
AC_MSG_RESULT([$cc_version])
+dnl XCode 4.2 also shipped an llvm-gcc which couldn't compile
+dnl the libtheora inline asm.
+AC_MSG_CHECKING([bad gcc versions])
+if `$CC --version | grep -q "Apple Inc. build 5658"`; then
+ AC_MSG_RESULT([Apple build 5658])
+ MOZ_NO_THEORA_ASM=1
+else
+ AC_MSG_RESULT([we're ok])
+fi
+
+AC_SUBST(MOZ_NO_THEORA_ASM)
+
+if test "x$MOZ_NO_THEORA_ASM" = x1; then
+ AC_MSG_WARN([Disabling libtheora inline assembly])
+fi
+
if test -n "$MAKE"; then
if test `echo $MAKE | grep -c make.py` != 1; then
NOT_PYMAKE=$MAKE
@@ -2108,7 +2124,7 @@
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
DLL_PREFIX=
- IMPORT_LIB_SUFFIX=dll.a
+ IMPORT_LIB_SUFFIX=a
GCC_VERSION=`$CC -v 2>&1 | awk '/^gcc version/ { print $3 }'`
else
TARGET_COMPILER_ABI=msvc
@@ -2138,7 +2154,7 @@
MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)'
MKSHLIB_FORCE_ALL=
MKSHLIB_UNFORCE_ALL=
- DSO_LDOPTS=-SUBSYSTEM:WINDOWS
+ DSO_LDOPTS=-SUBSYSTEM:WINDOWS'$(MOZ_SUBSYSTEM_VERSION)'
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(DEPTH)/dist/include/mozilla-config.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(DEPTH)/dist/include/mozilla-config.h -DMOZILLA_CLIENT'
@@ -2201,7 +2217,9 @@
case "$host" in
*-mingw*)
MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
- L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
+ if test -n "$L10NBASEDIR"; then
+ L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
+ fi
;;
esac
@@ -5876,8 +5894,7 @@
dnl and --disable-libjpeg-turbo wasn't passed, check for Yasm, and error out if
dnl it doesn't exist or we have too old of a version.
if test -n "$LIBJPEG_TURBO_X86_ASM" -o -n "$LIBJPEG_TURBO_X64_ASM" ; then
- AC_MSG_CHECKING([for Yasm assembler])
- AC_CHECK_PROGS(LIBJPEG_TURBO_AS, yasm, "")
+ LIBJPEG_TURBO_AS=$YASM
if test -z "$LIBJPEG_TURBO_AS" ; then
AC_MSG_ERROR([Yasm is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you do not appear to have Yasm installed. Either install it or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder. See https://developer.mozilla.org/en/YASM for more details.])
@@ -6004,21 +6021,25 @@
MOZ_TREE_FREETYPE=1,
MOZ_TREE_FREETYPE= )
if test -n "$MOZ_TREE_FREETYPE"; then
- if test -n "$_WIN32_MSVC"; then
- AC_ERROR("building with in-tree freetype is not supported on MSVC")
- fi
AC_DEFINE(MOZ_TREE_FREETYPE)
AC_SUBST(MOZ_TREE_FREETYPE)
MOZ_ENABLE_CAIRO_FT=1
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
+if test -z "$_WIN32_MSVC"; then
FT2_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)'
CAIRO_FT_OSLIBS=''
CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)'
+else
+ FT2_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
+ CAIRO_FT_OSLIBS=''
+ CAIRO_FT_LIBS='$(LIBXUL_DIST)/lib/freetype2.lib'
+fi
AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM)
AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN)
AC_DEFINE(HAVE_FT_LOAD_SFNT_TABLE)
+ AC_DEFINE(HAVE_FT_LIBRARY_SETLCDFILTER)
AC_SUBST(CAIRO_FT_CFLAGS)
fi
@@ -8182,6 +8203,13 @@
AC_DEFINE_UNQUOTED(MOZ_APP_COMPONENT_MODULES, $MOZ_APP_COMPONENT_MODULES)
fi
+if test -z "$CC_VERSION"; then
+ CC_VERSION=`$CC -v 2>&1 | grep -i 'version'`
+fi
+if test -z "$CXX_VERSION"; then
+ CXX_VERSION=`$CXX -v 2>&1 | grep -i 'version'`
+fi
+
dnl ========================================================
dnl =
dnl = Maintainer debug option (no --enable equivalent)
@@ -8305,7 +8333,10 @@
Prefix for MOZ_MACBUNDLE_NAME],
[ MOZ_MACBUNDLE_NAME_PREFIX="$withval"])
-MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_DISPLAYNAME | tr -d ' '`
+if test -z "$MOZ_APP_NAME"; then
+ MOZ_APP_NAME=`echo $MOZ_APP_BASENAME | tr A-Z a-z`
+fi
+MOZ_MACBUNDLE_NAME=`echo $MOZ_APP_NAME | tr -d ' '`
if test "$MOZ_MACBUNDLE_NAME_PREFIX"; then
MOZ_MACBUNDLE_NAME="${MOZ_MACBUNDLE_NAME_PREFIX}${MOZ_MACBUNDLE_NAME}"
fi
@@ -8648,6 +8679,12 @@
AC_SUBST(MOZILLA_VERSION)
AC_SUBST(ac_configure_args)
+if test -f ../config/autoconf.mk -a "`cat ../config/autoconf.mk | grep COMM_BUILD`" ; then
+buildconfig_configure_args="`cat ../config/autoconf.mk | grep ac_configure_args | sed -e 's/^ac_configure_args *= *//'`"
+else
+buildconfig_configure_args="$_SUBDIR_CONFIG_ARGS"
+fi
+AC_SUBST(buildconfig_configure_args)
dnl Spit out some output
dnl ========================================================
@@ -8864,6 +8901,7 @@
# Run freetype configure script
if test "$MOZ_TREE_FREETYPE"; then
+if test -z "$_WIN32_MSVC"; then
export CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS -std=c99"
export CPPFLAGS="$CPPFLAGS $MOZ_DEBUG_FLAGS"
export CXXFLAGS="$CXXFLAGS $MOZ_DEBUG_FLAGS"
@@ -8872,6 +8910,7 @@
ac_configure_args="$ac_configure_args --host=$target --disable-shared --with-pic=yes"
AC_OUTPUT_SUBDIRS(modules/freetype2)
fi
+fi
if test -z "$direct_nspr_config"; then
dnl ========================================================
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/2d/2D.h comm-esr17/mozilla/gfx/2d/2D.h
--- comm-esr17.orig/mozilla/gfx/2d/2D.h 2013-09-12 09:55:29 +0900
+++ comm-esr17/mozilla/gfx/2d/2D.h 2013-09-14 03:12:27 +0900
@@ -16,6 +16,10 @@
// solution.
#include "mozilla/RefPtr.h"
+#ifdef MOZ_TREE_FREETYPE
+#define MOZ_ENABLE_FREETYPE
+#endif
+
#ifdef MOZ_ENABLE_FREETYPE
#include
#endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/2d/Makefile.in comm-esr17/mozilla/gfx/2d/Makefile.in
--- comm-esr17.orig/mozilla/gfx/2d/Makefile.in 2013-09-12 09:55:29 +0900
+++ comm-esr17/mozilla/gfx/2d/Makefile.in 2013-09-14 03:12:27 +0900
@@ -125,6 +125,12 @@
CPPSRCS += \
ScaledFontWin.cpp \
$(NULL)
+
+ifdef MOZ_TREE_FREETYPE
+CPPSRCS += \
+ ScaledFontFreetype.cpp \
+ $(NULL)
+endif
endif
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/2d/moz-d2d1-1.h comm-esr17/mozilla/gfx/2d/moz-d2d1-1.h
--- comm-esr17.orig/mozilla/gfx/2d/moz-d2d1-1.h 2013-09-12 09:55:29 +0900
+++ comm-esr17/mozilla/gfx/2d/moz-d2d1-1.h 2013-09-14 03:12:27 +0900
@@ -12,6 +12,13 @@
#include
#endif // #ifndef _D2D1_H_
+#ifndef _In_
+#define _In_
+#endif
+#ifndef _In_opt_
+#define _In_opt_
+#endif
+
//+-----------------------------------------------------------------------------
//
// Flag:
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/angle/Makefile.in comm-esr17/mozilla/gfx/angle/Makefile.in
--- comm-esr17.orig/mozilla/gfx/angle/Makefile.in 2013-09-12 09:55:29 +0900
+++ comm-esr17/mozilla/gfx/angle/Makefile.in 2013-09-14 03:12:27 +0900
@@ -124,10 +124,6 @@
# libEGL depends on (links against!) libGLESv2!
DIRS = src/libGLESv2 src/libEGL
-libs::
- expand "$(MOZ_D3DX9_CAB)" -F:$(MOZ_D3DX9_DLL) "$(DIST)/bin"
- expand "$(MOZ_D3DCOMPILER_CAB)" -F:$(MOZ_D3DCOMPILER_DLL) "$(DIST)/bin"
-
endif
include $(topsrcdir)/config/rules.mk
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/cairo/cairo/src/cairo-ft-font.c comm-esr17/mozilla/gfx/cairo/cairo/src/cairo-ft-font.c
--- comm-esr17.orig/mozilla/gfx/cairo/cairo/src/cairo-ft-font.c 2013-09-12 09:55:29 +0900
+++ comm-esr17/mozilla/gfx/cairo/cairo/src/cairo-ft-font.c 2013-09-14 03:12:27 +0900
@@ -59,10 +59,10 @@
#if HAVE_FT_LIBRARY_SETLCDFILTER
#include FT_LCD_FILTER_H
-#endif
-
+#else
#define _GNU_SOURCE /* for RTLD_DEFAULT */
#include
+#endif
#ifndef RTLD_DEFAULT
#define RTLD_DEFAULT ((void *) 0)
@@ -2152,8 +2152,10 @@
/* Ignore global advance unconditionally */
load_flags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
+#ifndef XP_WIN
if ((info & CAIRO_SCALED_GLYPH_INFO_PATH) != 0 &&
(info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)
+#endif
load_flags |= FT_LOAD_NO_BITMAP;
/*
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/cairo/libpixman/src/pixman-bits-image.c comm-esr17/mozilla/gfx/cairo/libpixman/src/pixman-bits-image.c
--- comm-esr17.orig/mozilla/gfx/cairo/libpixman/src/pixman-bits-image.c 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/cairo/libpixman/src/pixman-bits-image.c 2013-09-14 03:12:27 +0900
@@ -875,7 +875,11 @@
return *(row + x) << 24;
}
+#if __GNUC__ && (__GNUC__ == 4 && __GNUC_MINOR__ == 6)
+static inline uint32_t
+#else
static force_inline uint32_t
+#endif
convert_r5g6b5 (const uint8_t *row, int x)
{
return CONVERT_0565_TO_0888 (*((uint16_t *)row + x));
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/harfbuzz/src/hb-open-type-private.hh comm-esr17/mozilla/gfx/harfbuzz/src/hb-open-type-private.hh
--- comm-esr17.orig/mozilla/gfx/harfbuzz/src/hb-open-type-private.hh 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/harfbuzz/src/hb-open-type-private.hh 2013-09-14 03:12:27 +0900
@@ -689,6 +689,9 @@
DEFINE_SIZE_ARRAY (sizeof (USHORT), array);
};
+#if __GNUC__ && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
+#pragma GCC visibility push(default)
+#endif
/* An array with sorted elements. Supports binary searching. */
template
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/Makefile.in comm-esr17/mozilla/gfx/thebes/Makefile.in
--- comm-esr17.orig/mozilla/gfx/thebes/Makefile.in 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/Makefile.in 2013-09-14 03:12:27 +0900
@@ -144,6 +144,13 @@
gfxGDIFontList.h \
gfxPlatformFontList.h \
$(NULL)
+
+ifdef MOZ_TREE_FREETYPE
+EXPORTS += \
+ gfxFT2Fonts.h \
+ gfxFT2FontBase.h \
+ $(NULL)
+endif
endif
CPPSRCS = \
@@ -205,6 +212,16 @@
nsUnicodeRange.cpp \
$(NULL)
+ifdef MOZ_TREE_FREETYPE
+CPPSRCS += gfxFT2Fonts.cpp \
+ gfxFT2FontBase.cpp \
+ gfxFT2Utils.cpp \
+ gfxFT2FontList.cpp \
+ $(NULL)
+
+SHARED_LIBRARY_LIBS += $(FT2_LIBS)
+endif
+
ifdef MOZ_ENABLE_DWRITE_FONT
CPPSRCS += gfxDWriteFonts.cpp \
gfxDWriteShaper.cpp \
@@ -350,6 +367,12 @@
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
CFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifdef MOZ_TREE_FREETYPE
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxFT2FontList.cpp comm-esr17/mozilla/gfx/thebes/gfxFT2FontList.cpp
--- comm-esr17.orig/mozilla/gfx/thebes/gfxFT2FontList.cpp 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxFT2FontList.cpp 2013-09-14 03:12:27 +0900
@@ -32,6 +32,8 @@
#include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H
#include FT_TRUETYPE_TABLES_H
+#include "freetype/ftsnames.h"
+#include "freetype/ttnameid.h"
#include "cairo-ft.h"
#include "gfxFT2FontList.h"
@@ -54,6 +56,7 @@
#ifdef XP_WIN
#include "nsIWindowsRegKey.h"
#include
+#include
#endif
using namespace mozilla;
@@ -217,6 +220,7 @@
delete userFontData;
}
+#ifdef ANDROID
/* static */
FT2FontEntry*
FT2FontEntry::CreateFontEntry(const FontListEntry& aFLE)
@@ -229,6 +233,7 @@
fe->mItalic = aFLE.italic();
return fe;
}
+#endif
/* static */
FT2FontEntry*
@@ -239,6 +244,11 @@
{
static cairo_user_data_key_t key;
+ if (FT2FontEntry::IsSynthFace(aFace)) {
+ FT_Done_Face(aFace);
+ return nullptr;
+ }
+
FT2FontEntry *fe = new FT2FontEntry(aName);
fe->mItalic = aFace->style_flags & FT_STYLE_FLAG_ITALIC;
fe->mFTFace = aFace;
@@ -294,6 +304,27 @@
return FT2FontEntry::CreateFontEntry(aFace, aFilename, aIndex, fontName);
}
+bool
+FT2FontEntry::IsSynthFace(FT_Face aFace) {
+ NS_ConvertUTF8toUTF16 name(aFace->family_name);
+ nsAutoTArray synthBold;
+ nsAutoTArray synthItalic;
+ gfxFontUtils::GetPrefsFontList("gfx.font_rendering.freetype2.synthBold" , synthBold);
+ gfxFontUtils::GetPrefsFontList("gfx.font_rendering.freetype2.synthItalic", synthItalic);
+
+ for (PRUint32 i = 0; i < synthBold.Length(); i++) {
+ if (synthBold[i].Equals(name) && (aFace->style_flags & FT_STYLE_FLAG_BOLD)) {
+ return true;
+ }
+ }
+ for (PRUint32 i = 0; i < synthItalic.Length(); i++) {
+ if (synthItalic[i].Equals(name) && (aFace->style_flags & FT_STYLE_FLAG_ITALIC)) {
+ return true;
+ }
+ }
+ return false;
+}
+
FT2FontEntry*
gfxFT2Font::GetFontEntry()
{
@@ -400,6 +431,7 @@
SizeOfExcludingThis(aMallocSizeOf, aSizes);
}
+#ifdef ANDROID
/*
* FT2FontFamily
* A standard gfxFontFamily; just adds a method used to support sending
@@ -423,6 +455,7 @@
fe->mFTFontIndex));
}
}
+#endif
/*
* Startup cache support for the font list:
@@ -440,7 +473,7 @@
FontNameCache()
: mWriteNeeded(false)
{
- mOps = (PLDHashTableOps) {
+ PLDHashTableOps ops = {
PL_DHashAllocTable,
PL_DHashFreeTable,
StringHash,
@@ -450,6 +483,7 @@
PL_DHashFinalizeStub,
NULL
};
+ mOps = ops;
if (!PL_DHashTableInit(&mMap, &mOps, nullptr,
sizeof(FNCMapEntry), 0))
@@ -694,9 +728,11 @@
}
int32_t stretch = strtol(beginning, NULL, 10);
+#ifdef ANDROID
FontListEntry fle(familyName, faceName, aFileName,
weight, stretch, italic, index);
AppendFaceFromFontListEntry(fle, aStdFile);
+#endif
beginning = end + 1;
end = strchr(beginning, ',');
@@ -795,32 +831,10 @@
CreateNamedFontEntry(face, aFileName.get(), i);
if (fe) {
NS_ConvertUTF8toUTF16 name(face->family_name);
- BuildKeyNameFromFontName(name);
- gfxFontFamily *family = mFontFamilies.GetWeak(name);
- if (!family) {
- family = new FT2FontFamily(name);
- mFontFamilies.Put(name, family);
- if (mBadUnderlineFamilyNames.Contains(name)) {
- family->SetBadUnderlineFamily();
- }
- }
fe->mStandardFace = aStdFile;
- family->AddFontEntry(fe);
-
- // this depends on the entry having been added to its family
- fe->CheckForBrokenFont();
-
+ AddFontEntry(fe, name);
+ AppendFacesFromFontFileByUnicodeName(fe);
AppendToFaceList(faceList, name, fe);
-#ifdef PR_LOGGING
- if (LOG_ENABLED()) {
- LOG(("(fontinit) added (%s) to family (%s)"
- " with style: %s weight: %d stretch: %d",
- NS_ConvertUTF16toUTF8(fe->Name()).get(),
- NS_ConvertUTF16toUTF8(family->Name()).get(),
- fe->IsItalic() ? "italic" : "normal",
- fe->Weight(), fe->Stretch()));
- }
-#endif
}
}
FT_Done_Face(dummy);
@@ -830,6 +844,59 @@
}
}
+void
+gfxFT2FontList::AppendFacesFromFontFileByUnicodeName(FT2FontEntry* fe)
+{
+ FT_Face face = fe->mFTFace;
+ int n = FT_Get_Sfnt_Name_Count(face);
+ for (int i = 0; i < n; i++) {
+ FT_SfntName sfnt;
+ if (FT_Get_Sfnt_Name(face, i, &sfnt))
+ continue;
+ if (!sfnt.string_len || sfnt.name_id != TT_NAME_ID_FONT_FAMILY)
+ continue;
+
+ int bufsize = sfnt.string_len / 2;
+ PRUnichar* namebuf = new PRUnichar[bufsize + 1];
+ for (int b = 0; b < bufsize; b++)
+ namebuf[b] = (PRUnichar)(sfnt.string[b * 2] << 8) | (PRUnichar)(sfnt.string[b * 2 + 1]);
+ namebuf[bufsize] = 0;
+ nsString name(namebuf);
+ AddFontEntry(fe, name);
+ delete [] namebuf;
+ }
+}
+
+void
+gfxFT2FontList::AddFontEntry(FT2FontEntry* fe, nsString name)
+{
+ nsString family_name(name);
+ BuildKeyNameFromFontName(name);
+ gfxFontFamily *family = mFontFamilies.GetWeak(name);
+ if (!family) {
+ family = new FT2FontFamily(family_name);
+ mFontFamilies.Put(name, family);
+ if (mBadUnderlineFamilyNames.Contains(name))
+ family->SetBadUnderlineFamily();
+ }
+
+ family->AddFontEntry(fe);
+
+ // this depends on the entry having been added to its family
+ fe->CheckForBrokenFont();
+
+#ifdef PR_LOGGING
+ if (LOG_ENABLED()) {
+ LOG(("(fontinit) added (%s) to family (%s)"
+ " with style: %s weight: %d stretch: %d",
+ NS_ConvertUTF16toUTF8(fe->Name()).get(),
+ NS_ConvertUTF16toUTF8(family->Name()).get(),
+ fe->IsItalic() ? "italic" : "normal",
+ fe->Weight(), fe->Stretch()));
+ }
+#endif
+}
+
// Called on each family after all fonts are added to the list;
// this will sort faces to give priority to "standard" font files
// if aUserArg is non-null (i.e. we're using it as a boolean flag)
@@ -874,6 +941,7 @@
searchPaths.AppendElement(resPath);
}
WIN32_FIND_DATAW results;
+ FontNameCache* fnc = new FontNameCache();
for (uint32_t i = 0; i < searchPaths.Length(); i++) {
const nsString& path(searchPaths[i]);
for (uint32_t j = 0; j < fontPatterns.Length(); j++) {
@@ -890,8 +958,10 @@
nsAutoString filePath(path);
filePath.AppendLiteral("\\");
filePath.Append(results.cFileName);
- AppendFacesFromFontFile(NS_ConvertUTF16toUTF8(filePath));
- moreFiles = FindNextFile(handle, &results);
+ char fileName[MAX_PATH];
+ WideCharToMultiByte(CP_ACP, 0, filePath.get(), -1, fileName, MAX_PATH, NULL, NULL);
+ AppendFacesFromFontFile(nsCString(fileName), true, fnc);
+ moreFiles = FindNextFileW(handle, &results);
}
if (handle != INVALID_HANDLE_VALUE)
FindClose(handle);
@@ -999,6 +1069,7 @@
#endif // XP_WIN && ANDROID
}
+#ifdef ANDROID
void
gfxFT2FontList::AppendFaceFromFontListEntry(const FontListEntry& aFLE,
bool aStdFile)
@@ -1041,6 +1112,7 @@
{
mFontFamilies.Enumerate(AddFamilyToFontList, retValue);
}
+#endif
nsresult
gfxFT2FontList::InitFontList()
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxFT2FontList.h comm-esr17/mozilla/gfx/thebes/gfxFT2FontList.h
--- comm-esr17.orig/mozilla/gfx/thebes/gfxFT2FontList.h 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxFT2FontList.h 2013-09-14 03:12:27 +0900
@@ -12,12 +12,14 @@
#endif
#include "gfxPlatformFontList.h"
+#ifdef ANDROID
namespace mozilla {
namespace dom {
class FontListEntry;
};
};
using mozilla::dom::FontListEntry;
+#endif
class FontNameCache;
typedef struct FT_FaceRec_* FT_Face;
@@ -44,11 +46,13 @@
CreateFontEntry(const gfxProxyFontEntry &aProxyEntry,
const uint8_t *aFontData, uint32_t aLength);
+#ifdef ANDROID
// create a font entry representing an installed font, identified by
// a FontListEntry; the freetype and cairo faces will not be instantiated
// until actually needed
static FT2FontEntry*
CreateFontEntry(const FontListEntry& aFLE);
+#endif
// Create a font entry for a given freetype face; if it is an installed font,
// also record the filename and index
@@ -59,6 +63,8 @@
const nsAString& aName,
const uint8_t *aFontData = nullptr);
+ static bool IsSynthFace(FT_Face aFace);
+
virtual gfxFont *CreateFontInstance(const gfxFontStyle *aFontStyle,
bool aNeedsBold);
@@ -90,8 +96,10 @@
FT2FontFamily(const nsAString& aName) :
gfxFontFamily(aName) { }
+#ifdef ANDROID
// Append this family's faces to the IPC fontlist
void AddFacesToFontList(InfallibleTArray* aFontList);
+#endif
};
class gfxFT2FontList : public gfxPlatformFontList
@@ -109,7 +117,9 @@
const uint8_t *aFontData,
uint32_t aLength);
+#ifdef ANDROID
void GetFontList(InfallibleTArray* retValue);
+#endif
static gfxFT2FontList* PlatformFontList() {
return static_cast(gfxPlatformFontList::PlatformFontList());
@@ -118,8 +128,10 @@
protected:
virtual nsresult InitFontList();
+#ifdef ANDROID
void AppendFaceFromFontListEntry(const FontListEntry& aFLE,
bool isStdFile);
+#endif
void AppendFacesFromFontFile(nsCString& aFileName,
bool isStdFile = false,
@@ -129,6 +141,9 @@
bool isStdFile,
nsCString& aFaceList);
+ void AppendFacesFromFontFileByUnicodeName(FT2FontEntry* fe);
+ void AddFontEntry(FT2FontEntry* fe, nsString name);
+
void FindFonts();
};
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxFT2Fonts.cpp comm-esr17/mozilla/gfx/thebes/gfxFT2Fonts.cpp
--- comm-esr17.orig/mozilla/gfx/thebes/gfxFT2Fonts.cpp 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxFT2Fonts.cpp 2013-09-14 03:12:27 +0900
@@ -41,6 +41,15 @@
static PRLogModuleInfo *gFontLog = PR_NewLogModule("ft2fonts");
+static const char *sCJKLangGroup[] = {
+ "ja",
+ "ko",
+ "zh-cn",
+ "zh-hk",
+ "zh-tw"
+};
+#define COUNT_OF_CJK_LANG_GROUP 5
+
// rounding and truncation functions for a Freetype floating point number
// (FT26Dot6) stored in a 32bit integer with high 26 bits for the integer
// part and low 6 bits for the fractional part.
@@ -240,9 +249,9 @@
key.AppendInt(mStyle.weight);
if (!platform->GetPrefFontEntries(key, &aFontEntryList)) {
- NS_ENSURE_TRUE(Preferences::GetRootBranch(), );
+ NS_ENSURE_TRUE(mozilla::Preferences::GetRootBranch(), );
// Add the CJK pref fonts from accept languages, the order should be same order
- nsAdoptingCString list = Preferences::GetLocalizedCString("intl.accept_languages");
+ nsAdoptingCString list = mozilla::Preferences::GetLocalizedCString("intl.accept_languages");
if (!list.IsEmpty()) {
const char kComma = ',';
const char *p, *p_end;
@@ -313,7 +322,7 @@
gfxFontEntry *fe = aFontEntryList[i].get();
if (fe->HasCharacter(aCh)) {
nsRefPtr font =
- gfxFT2Font::GetOrMakeFont(static_cast(fe), &mStyle);
+ gfxFT2Font::GetOrMakeFont(static_cast(fe), &mStyle);
return font.forget();
}
}
@@ -370,7 +379,7 @@
gfxFT2FontGroup::WhichSystemFontSupportsChar(uint32_t aCh, int32_t aRunScript)
{
#if defined(XP_WIN) || defined(ANDROID)
- FontEntry *fe = static_cast
+ FT2FontEntry *fe = static_cast
(gfxPlatformFontList::PlatformFontList()->
SystemFindFontForChar(aCh, aRunScript, &mStyle));
if (fe) {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxPlatformMac.h comm-esr17/mozilla/gfx/thebes/gfxPlatformMac.h
--- comm-esr17.orig/mozilla/gfx/thebes/gfxPlatformMac.h 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxPlatformMac.h 2013-09-14 03:12:27 +0900
@@ -18,7 +18,8 @@
class gfxTextRun;
class gfxFontFamily;
-class mozilla::gfx::DrawTarget;
+
+namespace mozilla { namespace gfx { class DrawTarget; }}
class THEBES_API gfxPlatformMac : public gfxPlatform {
public:
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxWindowsPlatform.cpp comm-esr17/mozilla/gfx/thebes/gfxWindowsPlatform.cpp
--- comm-esr17.orig/mozilla/gfx/thebes/gfxWindowsPlatform.cpp 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxWindowsPlatform.cpp 2013-09-14 03:12:27 +0900
@@ -25,6 +25,14 @@
#include "gfxCrashReporterUtils.h"
+#ifdef MOZ_FT2_FONTS
+#include "ft2build.h"
+#include FT_FREETYPE_H
+#include "gfxFT2Fonts.h"
+#include "gfxFT2FontList.h"
+#include "cairo-ft.h"
+#include "nsAppDirectoryServiceDefs.h"
+#endif
#include "gfxGDIFontList.h"
#include "gfxGDIFont.h"
@@ -157,6 +165,12 @@
#define GFX_CLEARTYPE_PARAMS_STRUCTURE "gfx.font_rendering.cleartype_params.pixel_structure"
#define GFX_CLEARTYPE_PARAMS_MODE "gfx.font_rendering.cleartype_params.rendering_mode"
+#ifdef MOZ_FT2_FONTS
+static FT_Library gPlatformFTLibrary = NULL;
+#define GFX_ENABLED_FT2 "gfx.font_rendering.freetype2.enabled"
+#define GFX_FT2_FORCE_GDI "gfx.font_rendering.freetype2.force_gdi"
+#endif
+
#ifdef CAIRO_HAS_DWRITE_FONT
// DirectWrite is not available on all platforms, we need to use the function
// pointer.
@@ -354,6 +368,10 @@
mScreenDC = GetDC(NULL);
+#ifdef MOZ_FT2_FONTS
+ FT_Init_FreeType(&gPlatformFTLibrary);
+#endif
+
#ifdef CAIRO_HAS_D2D_SURFACE
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(D2DCache));
NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(D2DVram));
@@ -705,6 +723,12 @@
{
mUsingGDIFonts = false;
gfxPlatformFontList *pfl;
+#ifdef MOZ_FT2_FONTS
+ if (Preferences::GetBool(GFX_ENABLED_FT2, false)) {
+ pfl = new gfxFT2FontList();
+ mUsingGDIFonts = Preferences::GetBool(GFX_FT2_FORCE_GDI, true);
+ } else {
+#endif
#ifdef CAIRO_HAS_DWRITE_FONT
if (AllowDirectWrite() && GetDWriteFactory()) {
pfl = new gfxDWriteFontList();
@@ -720,6 +744,9 @@
#endif
pfl = new gfxGDIFontList();
mUsingGDIFonts = true;
+#ifdef MOZ_FT2_FONTS
+ }
+#endif
if (NS_SUCCEEDED(pfl->InitFontList())) {
return pfl;
@@ -1076,7 +1103,15 @@
const gfxFontStyle *aStyle,
gfxUserFontSet *aUserFontSet)
{
+#ifdef MOZ_FT2_FONTS
+ if (Preferences::GetBool(GFX_ENABLED_FT2, false)) {
+ return new gfxFT2FontGroup(aFamilies, aStyle, aUserFontSet);
+ } else {
+#endif
return new gfxFontGroup(aFamilies, aStyle, aUserFontSet);
+#ifdef MOZ_FT2_FONTS
+ }
+#endif
}
gfxFontEntry*
@@ -1139,6 +1174,11 @@
qcms_profile*
gfxWindowsPlatform::GetPlatformCMSOutputProfile()
{
+#ifdef MOZ_FT2_FONTS
+ if (Preferences::GetBool(GFX_ENABLED_FT2, false)) {
+ return nullptr;
+ } else {
+#endif
WCHAR str[MAX_PATH];
DWORD size = MAX_PATH;
BOOL res;
@@ -1169,6 +1209,9 @@
NS_ConvertUTF16toUTF8(str).get());
#endif
return profile;
+#ifdef MOZ_FT2_FONTS
+ }
+#endif
}
bool
@@ -1183,6 +1226,14 @@
mPrefFonts.Put(aKey, array);
}
+#ifdef MOZ_FT2_FONTS
+FT_Library
+gfxWindowsPlatform::GetFTLibrary()
+{
+ return gPlatformFTLibrary;
+}
+#endif
+
bool
gfxWindowsPlatform::UseClearTypeForDownloadableFonts()
{
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/gfx/thebes/gfxWindowsPlatform.h comm-esr17/mozilla/gfx/thebes/gfxWindowsPlatform.h
--- comm-esr17.orig/mozilla/gfx/thebes/gfxWindowsPlatform.h 2013-09-12 09:55:30 +0900
+++ comm-esr17/mozilla/gfx/thebes/gfxWindowsPlatform.h 2013-09-14 03:12:27 +0900
@@ -6,6 +6,9 @@
#ifndef GFX_WINDOWS_PLATFORM_H
#define GFX_WINDOWS_PLATFORM_H
+#if defined(MOZ_TREE_FREETYPE)
+#define MOZ_FT2_FONTS 1
+#endif
/**
* XXX to get CAIRO_HAS_D2D_SURFACE, CAIRO_HAS_DWRITE_FONT
@@ -16,6 +19,9 @@
#include "gfxFontUtils.h"
#include "gfxWindowsSurface.h"
#include "gfxFont.h"
+#ifdef MOZ_FT2_FONTS
+#include "gfxFT2Fonts.h"
+#endif
#ifdef CAIRO_HAS_DWRITE_FONT
#include "gfxDWriteFonts.h"
#endif
@@ -25,6 +31,10 @@
#include "nsTArray.h"
#include "nsDataHashtable.h"
+#ifdef MOZ_FT2_FONTS
+typedef struct FT_LibraryRec_ *FT_Library;
+#endif
+
#include
#include
@@ -238,6 +248,9 @@
cairo_device_t *GetD2DDevice() { return mD2DDevice; }
ID3D10Device1 *GetD3D10Device() { return mD2DDevice ? cairo_d2d_device_get_device(mD2DDevice) : nullptr; }
#endif
+#ifdef MOZ_FT2_FONTS
+ FT_Library GetFTLibrary();
+#endif
static bool IsOptimus();
static bool IsRunningInWindows8Metro();
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/ipc/app/plugin-container.exe.manifest comm-esr17/mozilla/ipc/app/plugin-container.exe.manifest
--- comm-esr17.orig/mozilla/ipc/app/plugin-container.exe.manifest 2013-09-12 09:55:31 +0900
+++ comm-esr17/mozilla/ipc/app/plugin-container.exe.manifest 2013-09-14 03:12:27 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-esr17/mozilla/ipc/chromium/src/base/file_util.cc
--- comm-esr17.orig/mozilla/ipc/chromium/src/base/file_util.cc 2013-09-12 09:55:31 +0900
+++ comm-esr17/mozilla/ipc/chromium/src/base/file_util.cc 2013-09-14 03:12:27 +0900
@@ -194,7 +194,7 @@
FILE* CreateAndOpenTemporaryFile(FilePath* path) {
FilePath directory;
if (!GetTempDir(&directory))
- return false;
+ return NULL;
return CreateAndOpenTemporaryFileInDir(directory, path);
}
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/ipc/chromium/src/base/file_util_posix.cc comm-esr17/mozilla/ipc/chromium/src/base/file_util_posix.cc
--- comm-esr17.orig/mozilla/ipc/chromium/src/base/file_util_posix.cc 2013-09-12 09:55:31 +0900
+++ comm-esr17/mozilla/ipc/chromium/src/base/file_util_posix.cc 2013-09-14 03:12:27 +0900
@@ -392,7 +392,7 @@
FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) {
FilePath directory;
if (!GetShmemTempDir(&directory))
- return false;
+ return NULL;
return CreateAndOpenTemporaryFileInDir(directory, path);
}
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/ipc/chromium/src/base/pickle.cc comm-esr17/mozilla/ipc/chromium/src/base/pickle.cc
--- comm-esr17.orig/mozilla/ipc/chromium/src/base/pickle.cc 2013-09-12 09:55:31 +0900
+++ comm-esr17/mozilla/ipc/chromium/src/base/pickle.cc 2013-09-14 03:12:27 +0900
@@ -492,7 +492,7 @@
"There can only be one variable buffer in a Pickle";
if (!WriteInt(length))
- return false;
+ return NULL;
char *data_ptr = BeginWrite(length, sizeof(uint32));
if (!data_ptr)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/ipc/chromium/src/chrome/common/transport_dib_mac.cc comm-esr17/mozilla/ipc/chromium/src/chrome/common/transport_dib_mac.cc
--- comm-esr17.orig/mozilla/ipc/chromium/src/chrome/common/transport_dib_mac.cc 2013-09-12 09:55:31 +0900
+++ comm-esr17/mozilla/ipc/chromium/src/chrome/common/transport_dib_mac.cc 2013-09-14 03:12:27 +0900
@@ -44,7 +44,7 @@
if (!dib->shared_memory_.Map(st.st_size)) {
delete dib;
HANDLE_EINTR(close(handle.fd));
- return false;
+ return NULL;
}
dib->size_ = st.st_size;
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/Makefile.in comm-esr17/mozilla/js/src/Makefile.in
--- comm-esr17.orig/mozilla/js/src/Makefile.in 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/Makefile.in 2013-09-14 03:12:27 +0900
@@ -659,6 +659,11 @@
CFLAGS += -fp:precise
ifeq ($(CPU_ARCH),x86)
+FrameState.$(OBJ_SUFFIX): CXXFLAGS := $(CXXFLAGS:arch:SSE2=arch:SSE)
+FrameState.$(OBJ_SUFFIX): CXXFLAGS := $(CXXFLAGS:arch:AVX=arch:SSE)
+FastOps.$(OBJ_SUFFIX): CXXFLAGS := $(CXXFLAGS:arch:SSE2=arch:SSE)
+FastOps.$(OBJ_SUFFIX): CXXFLAGS := $(CXXFLAGS:arch:AVX=arch:SSE)
+PolyIC.$(OBJ_SUFFIX): CXXFLAGS += -GL-
# Workaround compiler bug on PGO (Bug 721284)
MonoIC.$(OBJ_SUFFIX): CXXFLAGS += -GL-
Compiler.$(OBJ_SUFFIX): CXXFLAGS += -GL-
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/build/autoconf/compiler-opts.m4 comm-esr17/mozilla/js/src/build/autoconf/compiler-opts.m4
--- comm-esr17.orig/mozilla/js/src/build/autoconf/compiler-opts.m4 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/build/autoconf/compiler-opts.m4 2013-09-14 03:12:27 +0900
@@ -14,7 +14,7 @@
if test -z "$CC"; then CC=cl; fi
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="cl -E -nologo"; fi
- if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; ac_cv_prog_CXXCPP="$CXXCPP"; fi
+ if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo"; fi
if test -z "$LD"; then LD=link; fi
if test -z "$AS"; then
case "${target_cpu}" in
@@ -27,6 +27,7 @@
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
+ ac_cv_prog_CXXCPP="$CXXCPP"
# need override this flag since we don't use $(LDFLAGS) for this.
if test -z "$HOST_LDFLAGS" ; then
@@ -34,19 +35,8 @@
fi
;;
*-darwin*)
- # we prefer gcc-4.2 over gcc on older darwin, so
- # use that specific version if it's available.
- # On newer versions of darwin, gcc is llvm-gcc while gcc-4.2 is the plain
- # one, so we also try that first. If that fails, we fall back to clang
- # as llvm-gcc is an unsupported dead end.
- MOZ_PATH_PROGS(CC, $CC gcc-4.2 clang gcc)
- MOZ_PATH_PROGS(CXX, $CXX g++-4.2 clang++ g++)
- IS_LLVM_GCC=$($CC -v 2>&1 | grep llvm-gcc)
- if test -n "$IS_LLVM_GCC"
- then
- echo llvm-gcc is known to be broken, please use gcc-4.2 or clang.
- exit 1
- fi
+ if test -z "$CC"; then CC=gcc-4.2; fi
+ if test -z "$CXX"; then CXX=g++-4.2; fi
;;
esac
fi
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/config/config.mk comm-esr17/mozilla/js/src/config/config.mk
--- comm-esr17.orig/mozilla/js/src/config/config.mk 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/config/config.mk 2013-09-14 03:12:27 +0900
@@ -291,8 +291,10 @@
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # MOZ_PROFILE_GENERATE
ifdef MOZ_PROFILE_USE
@@ -300,8 +302,10 @@
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
ifeq (WINNT,$(OS_ARCH))
+ifndef GNU_CC
AR_FLAGS += -LTCG
endif
+endif
endif # MOZ_PROFILE_USE
endif # NO_PROFILE_GUIDED_OPTIMIZE
@@ -597,7 +601,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mconsole
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE$(MOZ_SUBSYSTEM_VERSION)
endif
endif
else # MOZ_WINCONSOLE
@@ -608,7 +612,7 @@
ifdef GNU_CC
WIN32_EXE_LDFLAGS += -mwindows
else
-WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS
+WIN32_EXE_LDFLAGS += -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION)
endif
endif
endif
@@ -694,30 +698,12 @@
# overridden by the command line. (Besides, AB_CD is prettier).
AB_CD = $(MOZ_UI_LOCALE)
-ifndef L10NBASEDIR
- L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
-else
- IS_LANGUAGE_REPACK = 1
-endif
-
EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
ifdef relativesrcdir
LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
endif
-ifdef LOCALE_SRCDIR
-# if LOCALE_MERGEDIR is set, use mergedir first, then the localization,
-# and finally en-US
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
-endif
-MAKE_JARS_FLAGS += -c $(LOCALE_SRCDIR)
-ifdef LOCALE_MERGEDIR
-MAKE_JARS_FLAGS += -c $(topsrcdir)/$(relativesrcdir)/en-US
-endif
-endif
-
ifdef LOCALE_MERGEDIR
MERGE_FILE = $(firstword \
$(wildcard $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))/$(1)) \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/config/rules.mk comm-esr17/mozilla/js/src/config/rules.mk
--- comm-esr17.orig/mozilla/js/src/config/rules.mk 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/config/rules.mk 2013-09-14 03:12:27 +0900
@@ -523,7 +523,7 @@
ifeq ($(OS_ARCH),WINNT)
ifdef GNU_CC
ifndef IS_COMPONENT
-DSO_LDOPTS += -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
+DSO_LDOPTS += -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY)
endif
endif
endif
@@ -1443,13 +1443,35 @@
$(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)
+L10N = $(AB_CD)
+ifdef relativesrcdir
+ifdef L10NBASEDIR
+L10N = en-US $(shell ls $(L10NBASEDIR))
+endif
+ifdef LOCALE_MERGEDIR
+LOCALE_MERGEDIR_MERGE = -c $(LOCALE_MERGEDIR)/$(subst /locales,,$(relativesrcdir))
+LOCALE_MERGEDIR_EN_US = -c $(topsrcdir)/$(relativesrcdir)/en-US
+endif
+endif
+
ifneq (,$(wildcard $(JAR_MANIFEST)))
ifndef NO_DIST_INSTALL
libs realchrome:: $(CHROME_DEPS) $(FINAL_TARGET)/chrome
+ for AB_CD in $(L10N) ; do \
+ if test "$(relativesrcdir)" ; then \
+ if test "$${AB_CD}" = "en-US" ; then \
+ LOCALE_SRCDIR=$(topsrcdir)/$(relativesrcdir)/en-US ; \
+ else \
+ LOCALE_SRCDIR=$(L10NBASEDIR)/$${AB_CD}/$(subst /locales,,$(relativesrcdir)) ; \
+ fi ; \
+ MAKE_JARS_FLAGS="-DAB_CD=$${AB_CD} $(LOCALE_MERGEDIR_MERGE) -c $${LOCALE_SRCDIR} $(LOCALE_MERGEDIR_EN_US)" ; \
+ fi ; \
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
- $(JAR_MANIFEST)
+ $${MAKE_JARS_FLAGS} \
+ $(JAR_MANIFEST) ; \
+ done
endif
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/configure.in comm-esr17/mozilla/js/src/configure.in
--- comm-esr17.orig/mozilla/js/src/configure.in 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/configure.in 2013-09-14 03:12:27 +0900
@@ -545,7 +545,7 @@
fi
# Check windres version
AC_MSG_CHECKING([for windres version >= $WINDRES_VERSION])
- _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'`
+ _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $5 }'`.0
AC_MSG_RESULT([$_WINDRES_VERSION])
_WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'`
_WINDRES_MINOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $2 }'`
@@ -1741,7 +1741,7 @@
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom -lxpcom_core -lmozalloc'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/lib -lxpcom -lmozalloc'
DLL_PREFIX=
- IMPORT_LIB_SUFFIX=dll.a
+ IMPORT_LIB_SUFFIX=a
GCC_VERSION=`$CC -v 2>&1 | awk '/^gcc version/ { print $3 }'`
else
TARGET_COMPILER_ABI=msvc
@@ -1769,7 +1769,7 @@
MKCSHLIB='$(LD) -NOLOGO -DLL -OUT:$@ -PDB:$(LINK_PDBFILE) $(DSO_LDOPTS)'
MKSHLIB_FORCE_ALL=
MKSHLIB_UNFORCE_ALL=
- DSO_LDOPTS=-SUBSYSTEM:WINDOWS
+ DSO_LDOPTS=-SUBSYSTEM:WINDOWS'$(MOZ_SUBSYSTEM_VERSION)'
_USE_CPP_INCLUDE_FLAG=1
_DEFINES_CFLAGS='-FI $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT'
_DEFINES_CXXFLAGS='-FI $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT'
@@ -4197,6 +4197,13 @@
MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS=
fi
+if test -z "$CC_VERSION"; then
+ CC_VERSION=`$CC -v 2>&1 | grep -i 'version'`
+fi
+if test -z "$CXX_VERSION"; then
+ CXX_VERSION=`$CXX -v 2>&1 | grep -i 'version'`
+fi
+
dnl ========================================================
dnl =
dnl = Maintainer debug option (no --enable equivalent)
@@ -4551,6 +4558,12 @@
cache_file=$_objdir/ctypes/libffi/config.cache
old_config_files=$CONFIG_FILES
unset CONFIG_FILES
+ for args in $ac_configure_args; do
+ case "$args" in
+ CFLAGS=*) LIBFFI_CFLAGS="$LIBFFI_CFLAGS `echo $args | $AWK -F= '{ print $2 }'`" ;;
+ esac
+ done
+ ac_configure_args="$ac_configure_args CFLAGS=\"$LIBFFI_CFLAGS $ANDROID_CFLAGS $MOZ_OPTIMIZE_FLAGS\""
AC_OUTPUT_SUBDIRS(ctypes/libffi)
cache_file=$old_cache_file
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/ctypes/libffi/Makefile.in comm-esr17/mozilla/js/src/ctypes/libffi/Makefile.in
--- comm-esr17.orig/mozilla/js/src/ctypes/libffi/Makefile.in 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/ctypes/libffi/Makefile.in 2013-09-14 03:12:27 +0900
@@ -65,8 +65,6 @@
# Build debug. Define FFI_DEBUG on the commandline so that, when building with
# MSVC, it can link against the debug CRT.
@FFI_DEBUG_TRUE@am__append_27 = -DFFI_DEBUG
-# Build opt.
-@FFI_DEBUG_FALSE@am__append_28 = -O2
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/doc/stamp-vti \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/gc/Root.h comm-esr17/mozilla/js/src/gc/Root.h
--- comm-esr17.orig/mozilla/js/src/gc/Root.h 2013-09-12 09:55:32 +0900
+++ comm-esr17/mozilla/js/src/gc/Root.h 2013-09-14 03:12:27 +0900
@@ -182,17 +182,7 @@
class MutableHandle : public MutableHandleBase
{
public:
- template
- MutableHandle(MutableHandle handle,
- typename mozilla::EnableIf::value, int>::Type dummy = 0)
- {
- this->ptr = reinterpret_cast(handle.address());
- }
-
- template
- inline
- MutableHandle(Rooted *root,
- typename mozilla::EnableIf::value, int>::Type dummy = 0);
+ inline MutableHandle(Rooted *root);
void set(T v)
{
@@ -375,10 +365,9 @@
ptr = reinterpret_cast(root.address());
}
-template template
+template
inline
-MutableHandle::MutableHandle(Rooted *root,
- typename mozilla::EnableIf::value, int>::Type dummy)
+MutableHandle::MutableHandle(Rooted *root)
{
ptr = root->address();
}
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/jsinterp.cpp comm-esr17/mozilla/js/src/jsinterp.cpp
--- comm-esr17.orig/mozilla/js/src/jsinterp.cpp 2013-09-12 09:55:33 +0900
+++ comm-esr17/mozilla/js/src/jsinterp.cpp 2013-09-14 03:12:27 +0900
@@ -905,16 +905,7 @@
* Currently it's broken for JS_VERSION < 160, though this isn't worth fixing.
* Add your compiler support macros here.
*/
-#ifndef JS_THREADED_INTERP
-# if JS_VERSION >= 160 && ( \
- __GNUC__ >= 3 || \
- (__IBMC__ >= 700 && defined __IBM_COMPUTED_GOTO) || \
- __SUNPRO_C >= 0x570)
-# define JS_THREADED_INTERP 1
-# else
# define JS_THREADED_INTERP 0
-# endif
-#endif
template
class GenericInterruptEnabler : public InterpreterFrames::InterruptEnablerBase {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/js/src/jstypedarray.cpp comm-esr17/mozilla/js/src/jstypedarray.cpp
--- comm-esr17.orig/mozilla/js/src/jstypedarray.cpp 2013-09-12 09:55:33 +0900
+++ comm-esr17/mozilla/js/src/jstypedarray.cpp 2013-09-14 03:12:27 +0900
@@ -1409,7 +1409,7 @@
CallArgs args = CallArgsFromVp(argc, vp);
// FIXME: Hack to keep us building with gcc 4.2. Remove this once we
// drop support for gcc 4.2. See bug 783505 for the details.
-#if defined(__GNUC__) && __GNUC_MINOR__ <= 2
+#if defined(__GNUC__) && __GNUC_MINOR__ <= 3
return CallNonGenericMethod(cx, IsThisClass, GetterImpl, args);
#else
return CallNonGenericMethod&1 | awk '/^gcc version/ { print $3 }'`
else
CC=cl
CXX=cl
@@ -1952,11 +1950,19 @@
CFLAGS="$CFLAGS -Od"
fi
+ if test -n "$USE_STATIC_LIBS"; then
+ if test -n "$USE_DEBUG_RTL"; then
+ CFLAGS="$CFLAGS -MTd"
+ else
+ CFLAGS="$CFLAGS -MT"
+ fi
+ else
if test -n "$USE_DEBUG_RTL"; then
CFLAGS="$CFLAGS -MDd"
else
CFLAGS="$CFLAGS -MD"
fi
+ fi
if test -n "$MOZ_DEBUG"; then
AC_DEFINE(_DEBUG)
@@ -1974,7 +1980,7 @@
fi
fi
- OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS"
+ OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS"'$(MOZ_SUBSYSTEM_VERSION)'
if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then
OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE"
fi
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/nsprpub/pr/include/prtypes.h comm-esr17/mozilla/nsprpub/pr/include/prtypes.h
--- comm-esr17.orig/mozilla/nsprpub/pr/include/prtypes.h 2013-09-12 09:55:44 +0900
+++ comm-esr17/mozilla/nsprpub/pr/include/prtypes.h 2013-09-14 03:12:27 +0900
@@ -48,7 +48,7 @@
**
**
***********************************************************************/
-#if defined(WIN32)
+#if defined(WIN32) && !defined(__GNUC__)
#define PR_EXPORT(__type) extern __declspec(dllexport) __type
#define PR_EXPORT_DATA(__type) extern __declspec(dllexport) __type
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/build/Makefile.in comm-esr17/mozilla/security/build/Makefile.in
--- comm-esr17.orig/mozilla/security/build/Makefile.in 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/build/Makefile.in 2013-09-14 03:12:27 +0900
@@ -13,6 +13,8 @@
CXX_WRAPPER =
include $(topsrcdir)/config/config.mk
+export MOZ_OPTIMIZE MOZ_OPTIMIZE_FLAGS MOZ_OPTIMIZE_LDFLAGS MOZ_OPTIMIZE_SIZE_TWEAK
+
ifndef MOZ_NATIVE_NSS
LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
endif
@@ -210,7 +212,7 @@
NATIVE_CC="$(HOST_CC)" \
CC="$(CC)" \
CCC="$(CXX)" \
- LINK="$(LD)" \
+ LD="$(LD)" \
AS="$(AS)" \
AR='$(AR) $(AR_FLAGS:$@=$$@)' \
RANLIB="$(RANLIB)" \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/AIX.mk comm-esr17/mozilla/security/coreconf/AIX.mk
--- comm-esr17.orig/mozilla/security/coreconf/AIX.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/AIX.mk 2013-09-14 03:12:27 +0900
@@ -56,8 +56,12 @@
sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER += -qmaxmem=-1
endif
+endif
ifeq ($(USE_64), 1)
OS_CFLAGS += -DAIX_64BIT
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/BeOS.mk comm-esr17/mozilla/security/coreconf/BeOS.mk
--- comm-esr17.orig/mozilla/security/coreconf/BeOS.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/BeOS.mk 2013-09-14 03:12:27 +0900
@@ -29,8 +29,12 @@
MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER = -O2
endif
+endif
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe
OS_LIBS = -lbe
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/Darwin.mk comm-esr17/mozilla/security/coreconf/Darwin.mk
--- comm-esr17.orig/mozilla/security/coreconf/Darwin.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/Darwin.mk 2013-09-14 03:12:27 +0900
@@ -84,11 +84,15 @@
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+else
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER = -Oz
else
OPTIMIZER = -O2
endif
+endif
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_DEBUG_FLAGS
OPTIMIZER += $(MOZ_DEBUG_FLAGS)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/IRIX.mk comm-esr17/mozilla/security/coreconf/IRIX.mk
--- comm-esr17.orig/mozilla/security/coreconf/IRIX.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/IRIX.mk 2013-09-14 03:12:27 +0900
@@ -23,18 +23,26 @@
AS = $(CC) -x assembler-with-cpp
ODD_CFLAGS = -Wall -Wno-format -Wno-switch
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+ else
OPTIMIZER = -O6
endif
+ endif
else
CC = cc
CCC = CC
ODD_CFLAGS = -fullwarn -xansi -woff 1209
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+ else
ifeq ($(USE_N32),1)
OPTIMIZER = -O -OPT:Olimit=4000
else
OPTIMIZER = -O -Olimit 4000
endif
+ endif
endif
# For 6.x machines, include this flag
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/Linux.mk comm-esr17/mozilla/security/coreconf/Linux.mk
--- comm-esr17.orig/mozilla/security/coreconf/Linux.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/Linux.mk 2013-09-14 03:12:27 +0900
@@ -104,11 +104,15 @@
endif
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+else
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER = -Os
else
OPTIMIZER = -O2
endif
+endif
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_DEBUG_FLAGS
OPTIMIZER += $(MOZ_DEBUG_FLAGS)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/OS2.mk comm-esr17/mozilla/security/coreconf/OS2.mk
--- comm-esr17.orig/mozilla/security/coreconf/OS2.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/OS2.mk 2013-09-14 03:12:27 +0900
@@ -20,7 +20,7 @@
CCC = gcc
-LINK = gcc
+LD = gcc
AR = emxomfar r $@
# Keep AR_FLAGS blank so that we do not have to change rules.mk
AR_FLAGS =
@@ -68,11 +68,15 @@
OS_CFLAGS = -Wall -Wno-unused -Wpointer-arith -Wcast-align -Wno-switch -Zomf -DDEBUG -DTRACING -g
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+else
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER += -Os -s
else
OPTIMIZER += -O2 -s
endif
+endif
DEFINES += -UDEBUG -U_DEBUG -DNDEBUG
DLLFLAGS = -DLL -OUT:$@ -MAP:$(@:.dll=.map) $(HIGHMEM_LDFLAG)
EXEFLAGS = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE $(HIGHMEM_LDFLAG)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/OSF1.mk comm-esr17/mozilla/security/coreconf/OSF1.mk
--- comm-esr17.orig/mozilla/security/coreconf/OSF1.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/OSF1.mk 2013-09-14 03:12:27 +0900
@@ -21,8 +21,12 @@
CPU_ARCH = alpha
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER += -Olimit 4000
endif
+endif
NON_LD_FLAGS += -ieee_with_inexact
OS_CFLAGS += -DOSF1 -D_REENTRANT
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/QNX.mk comm-esr17/mozilla/security/coreconf/QNX.mk
--- comm-esr17.orig/mozilla/security/coreconf/QNX.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/QNX.mk 2013-09-14 03:12:28 +0900
@@ -24,8 +24,12 @@
MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER = -O2
endif
+endif
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Vgcc_ntox86 -Wall -pipe -DNTO -DHAVE_STRERROR -D_QNX_SOURCE -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=500
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/RISCOS.mk comm-esr17/mozilla/security/coreconf/RISCOS.mk
--- comm-esr17.orig/mozilla/security/coreconf/RISCOS.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/RISCOS.mk 2013-09-14 03:12:28 +0900
@@ -18,5 +18,9 @@
DSO_LDOPTS = -shared
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER = -O3
endif
+endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/ReliantUNIX.mk comm-esr17/mozilla/security/coreconf/ReliantUNIX.mk
--- comm-esr17.orig/mozilla/security/coreconf/ReliantUNIX.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/ReliantUNIX.mk 2013-09-14 03:12:28 +0900
@@ -16,8 +16,12 @@
LD = gld
ODD_CFLAGS = -pipe -Wall -Wno-format -Wno-switch
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+ else
OPTIMIZER += -O6
endif
+ endif
MKSHLIB = $(LD)
MKSHLIB += -G -h $(@:$(OBJDIR)/%.so=%.so)
DSO_LDOPTS += -G -Xlinker -Blargedynsym
@@ -29,8 +33,12 @@
AS = /usr/bin/cc
ODD_CFLAGS =
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+ else
OPTIMIZER += -O -F Olimit,4000
endif
+ endif
MKSHLIB = $(CC)
MKSHLIB += -G -h $(@:$(OBJDIR)/%.so=%.so)
DSO_LDOPTS += -G -W l,-Blargedynsym
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/SunOS5.mk comm-esr17/mozilla/security/coreconf/SunOS5.mk
--- comm-esr17.orig/mozilla/security/coreconf/SunOS5.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/SunOS5.mk 2013-09-14 03:12:28 +0900
@@ -43,10 +43,14 @@
OS_CFLAGS += -MDupdate $(DEPENDENCIES)
endif
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+ else
OPTIMIZER = -O2
# Enable this for accurate dtrace profiling
# OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif
+ endif
else
CC = cc
CCC = CC
@@ -55,8 +59,12 @@
ifndef BUILD_OPT
OS_CFLAGS += -xs
else
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
+ else
OPTIMIZER = -xO4
endif
+ endif
ifdef USE_TCOV
CC += -xprofile=tcov
CCC += -xprofile=tcov
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/UNIX.mk comm-esr17/mozilla/security/coreconf/UNIX.mk
--- comm-esr17.orig/mozilla/security/coreconf/UNIX.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/UNIX.mk 2013-09-14 03:12:28 +0900
@@ -10,7 +10,11 @@
LDOPTS += -L$(SOURCE_LIB_DIR)
ifdef BUILD_OPT
+ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+else
OPTIMIZER += -O
+endif
DEFINES += -UDEBUG -DNDEBUG
else
OPTIMIZER += -g
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/WIN32.mk comm-esr17/mozilla/security/coreconf/WIN32.mk
--- comm-esr17.orig/mozilla/security/coreconf/WIN32.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/WIN32.mk 2013-09-14 03:12:28 +0900
@@ -13,7 +13,7 @@
ifdef NS_USE_GCC
CC = gcc
CCC = g++
- LINK = ld
+ LD = ld
AR = ar
AR += cr $@
RANLIB = ranlib
@@ -23,7 +23,7 @@
else
CC = cl
CCC = cl
- LINK = link
+ LD = link
AR = lib
AR += -NOLOGO -OUT:"$@"
RANLIB = echo
@@ -96,11 +96,15 @@
_GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
ifdef BUILD_OPT
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+ else
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER += -Os
else
OPTIMIZER += -O2
endif
+ endif
DEFINES += -UDEBUG -U_DEBUG -DNDEBUG
else
OPTIMIZER += -g
@@ -113,7 +117,7 @@
else # !NS_USE_GCC
OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \
-D_CRT_NONSTDC_NO_WARNINGS
- OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
+ OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS$(MOZ_SUBSYSTEM_VERSION)
ifeq ($(_MSC_VER),$(_MSC_VER_6))
ifndef MOZ_DEBUG_SYMBOLS
OS_DLLFLAGS += -PDB:NONE
@@ -123,12 +127,20 @@
OS_DLLFLAGS += -DYNAMICBASE
endif
ifdef BUILD_OPT
+ ifdef USE_STATIC_LIBS
+ OS_CFLAGS += -MT
+ else
OS_CFLAGS += -MD
+ endif
+ ifeq ($(MOZ_OPTIMIZE),2)
+ OPTIMIZER += $(MOZ_OPTIMIZE_FLAGS)
+ else
ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
OPTIMIZER += -O1
else
OPTIMIZER += -O2
endif
+ endif
DEFINES += -UDEBUG -U_DEBUG -DNDEBUG
DLLFLAGS += -OUT:"$@"
ifdef MOZ_DEBUG_SYMBOLS
@@ -145,11 +157,19 @@
# Define USE_DEBUG_RTL if you want to use the debug runtime library
# (RTL) in the debug build
#
+ ifdef USE_STATIC_LIBS
+ ifdef USE_DEBUG_RTL
+ OS_CFLAGS += -MTd -D_CRTDBG_MAP_ALLOC
+ else
+ OS_CFLAGS += -MT
+ endif
+ else
ifdef USE_DEBUG_RTL
OS_CFLAGS += -MDd -D_CRTDBG_MAP_ALLOC
else
OS_CFLAGS += -MD
endif
+ endif
OPTIMIZER += -Zi -Fd$(OBJDIR)/ -Od
NULLSTRING :=
SPACE := $(NULLSTRING) # end of the line
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/command.mk comm-esr17/mozilla/security/coreconf/command.mk
--- comm-esr17.orig/mozilla/security/coreconf/command.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/command.mk 2013-09-14 03:12:28 +0900
@@ -11,8 +11,8 @@
AS = $(CC)
ASFLAGS += $(CFLAGS)
CCF = $(CC) $(CFLAGS)
-LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
-LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
+LINK_DLL = $(LD) $(OS_DLLFLAGS) $(DLLFLAGS)
+LINK_EXE = $(LD) $(OS_LFLAGS) $(LFLAGS)
CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
$(XCFLAGS)
PERL = perl
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/coreconf/location.mk comm-esr17/mozilla/security/coreconf/location.mk
--- comm-esr17.orig/mozilla/security/coreconf/location.mk 2013-09-12 09:55:45 +0900
+++ comm-esr17/mozilla/security/coreconf/location.mk 2013-09-14 03:12:28 +0900
@@ -68,7 +68,7 @@
endif
ifndef SQLITE_LIB_NAME
- SQLITE_LIB_NAME = sqlite3
+ SQLITE_LIB_NAME = mozsqlite3
endif
MK_LOCATION = included
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/nss/lib/freebl/Makefile comm-esr17/mozilla/security/nss/lib/freebl/Makefile
--- comm-esr17.orig/mozilla/security/nss/lib/freebl/Makefile 2013-09-12 09:55:46 +0900
+++ comm-esr17/mozilla/security/nss/lib/freebl/Makefile 2013-09-14 03:12:28 +0900
@@ -133,8 +133,10 @@
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
DEFINES += -DMP_ASSEMBLY_DIV_2DX1D -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD
ifdef BUILD_OPT
+ ifneq ($(MOZ_OPTIMIZE),2)
OPTIMIZER += -Ox # maximum optimization for freebl
endif
+ endif
endif
else
# -DMP_NO_MP_WORD
@@ -145,8 +147,10 @@
else
# MSVC
ifdef BUILD_OPT
+ ifneq ($(MOZ_OPTIMIZE),2)
OPTIMIZER += -Ox # maximum optimization for freebl
endif
+ endif
ASFILES = arcfour-amd64-masm.asm mpi_amd64_masm.asm mp_comba_amd64_masm.asm
DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
DEFINES += -DNSS_USE_COMBA
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/security/nss/lib/freebl/config.mk comm-esr17/mozilla/security/nss/lib/freebl/config.mk
--- comm-esr17.orig/mozilla/security/nss/lib/freebl/config.mk 2013-09-12 09:55:46 +0900
+++ comm-esr17/mozilla/security/nss/lib/freebl/config.mk 2013-09-14 03:12:28 +0900
@@ -55,6 +55,7 @@
ifdef NS_USE_GCC
OS_LIBS += -lshell32
+DEFINES += -D_WIN32_IE=0x0500
else
OS_LIBS += shell32.lib
endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/content/Makefile.in comm-esr17/mozilla/toolkit/content/Makefile.in
--- comm-esr17.orig/mozilla/toolkit/content/Makefile.in 2013-09-12 09:55:49 +0900
+++ comm-esr17/mozilla/toolkit/content/Makefile.in 2013-09-14 03:12:28 +0900
@@ -13,13 +13,16 @@
include $(DEPTH)/config/autoconf.mk
+RAW_CC := $(CC)
+RAW_CXX := $(CXX)
+
DEFINES += \
-Dtarget="$(target)" \
- -Dac_configure_args="$(ac_configure_args)" \
- -DCC="$(CC)" \
+ -Dac_configure_args="$(buildconfig_configure_args)" \
+ -DCC="$(RAW_CC)" \
-DCC_VERSION="$(CC_VERSION)" \
-DCFLAGS="$(CFLAGS)" \
- -DCXX="$(CXX)" \
+ -DCXX="$(RAW_CXX)" \
-DCXX_VERSION="$(CXX_VERSION)" \
-DCXXFLAGS="$(CXXFLAGS)" \
-DCPPFLAGS="$(CPPFLAGS)" \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/crashreporter/LoadLibraryRemote.cpp comm-esr17/mozilla/toolkit/crashreporter/LoadLibraryRemote.cpp
--- comm-esr17.orig/mozilla/toolkit/crashreporter/LoadLibraryRemote.cpp 2013-09-12 09:55:49 +0900
+++ comm-esr17/mozilla/toolkit/crashreporter/LoadLibraryRemote.cpp 2013-09-14 03:12:28 +0900
@@ -22,8 +22,6 @@
#include "nsWindowsHelpers.h"
-namespace {
-
typedef const unsigned char* FileView;
template<>
@@ -43,8 +41,6 @@
}
};
-} // anonymous namespace
-
#ifndef IMAGE_SIZEOF_BASE_RELOCATION
// Vista SDKs no longer define IMAGE_SIZEOF_BASE_RELOCATION!?
#define IMAGE_SIZEOF_BASE_RELOCATION (sizeof(IMAGE_BASE_RELOCATION))
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/crashreporter/client/crashreporter.exe.manifest comm-esr17/mozilla/toolkit/crashreporter/client/crashreporter.exe.manifest
--- comm-esr17.orig/mozilla/toolkit/crashreporter/client/crashreporter.exe.manifest 2013-09-12 09:55:49 +0900
+++ comm-esr17/mozilla/toolkit/crashreporter/client/crashreporter.exe.manifest 2013-09-14 03:12:28 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/mozapps/installer/Packager.pm comm-esr17/mozilla/toolkit/mozapps/installer/Packager.pm
--- comm-esr17.orig/mozilla/toolkit/mozapps/installer/Packager.pm 2013-09-12 09:55:51 +0900
+++ comm-esr17/mozilla/toolkit/mozapps/installer/Packager.pm 2013-09-14 03:12:28 +0900
@@ -240,7 +240,7 @@
if ($flat) {
# WebappRuntime has manifests that shouldn't be flattened, even though it
# gets packaged with Firefox, which does get flattened, so special-case it.
- if ($srcsuffix eq ".manifest" && $srcpath =~ m'/(chrome|components)/$' &&
+ if ($srcsuffix eq ".manifest" && $srcpath =~ m'/(chrome|components)/$' && $srcpath !~ m'/extensions/.+?/(chrome|components)/' &&
$component ne "WebappRuntime") {
my $subdir = $1;
if ($component eq "") {
@@ -250,7 +250,7 @@
$destpathcomp = "$srcdir/manifests/$component/$subdir";
$altdest = "$srcname$srcsuffix";
}
- elsif ($srcsuffix eq ".xpt" && $srcpath =~ m|/components/$|) {
+ elsif ($srcsuffix eq ".xpt" && $srcpath =~ m|/components/$| && $srcpath !~ m|/extensions/.+?/components/|) {
if ($component eq "") {
die ("XPT file was not part of a component.");
}
@@ -328,6 +328,13 @@
}
}
+ if ("$srcname$srcsuffix" =~ /^\.mkdir\.done$/) {
+ if ( $debug >= 3 ) {
+ print "source file is .mkdir.done, do not copy\n";
+ }
+ return;
+ }
+
if (stat("$destpath$destname$destsuffix") &&
stat("$srcpath$srcname$srcsuffix")->mtime < stat("$destpath$destname$destsuffix")->mtime) {
if ( $debug >= 3 ) {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/mozapps/installer/packager.mk comm-esr17/mozilla/toolkit/mozapps/installer/packager.mk
--- comm-esr17.orig/mozilla/toolkit/mozapps/installer/packager.mk 2013-09-12 09:55:51 +0900
+++ comm-esr17/mozilla/toolkit/mozapps/installer/packager.mk 2013-09-14 03:12:28 +0900
@@ -406,7 +406,7 @@
endif
INNER_MAKE_PACKAGE = $(_ABS_MOZSRCDIR)/build/package/mac_osx/pkg-dmg \
--source "$(PKG_DMG_SOURCE)" --target "$(PACKAGE)" \
- --volname "$(MOZ_APP_DISPLAYNAME)" $(PKG_DMG_FLAGS)
+ --volname "$(MOZ_APP_NAME)" $(PKG_DMG_FLAGS)
INNER_UNMAKE_PACKAGE = \
set -ex; \
rm -rf $(_ABS_DIST)/unpack.tmp; \
@@ -783,27 +783,25 @@
$(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
$(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
ifdef MOZ_WEBAPP_RUNTIME
- mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
- sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ cp $(DIST)/bin/webapprt/chrome.manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ echo "manifest chrome/localized.manifest" >> $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ for AB_CD in $(MOZ_LOCALIZED_PKG_LIST) ; do \
+ cat $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$${AB_CD}.manifest >> $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest ; \
+ $(RM) $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$${AB_CD}.manifest ; \
+ sed "s/^manifest\ chrome\/$${AB_CD}.manifest$$//" $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest.sed ; \
+ mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest.sed $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest ; \
+ done
endif
printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
else # !MOZ_PKG_MANIFEST
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
ifndef STAGE_SDK
@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
- @echo "Linking XPT files..."
- @rm -rf $(DIST)/xpt
- @$(NSINSTALL) -D $(DIST)/xpt
- @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
else
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
endif
else
@cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
- @echo "Linking XPT files..."
- @rm -rf $(DIST)/xpt
- @$(NSINSTALL) -D $(DIST)/xpt
- @($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)/components/. Continuing...
endif # DMG
endif # MOZ_PKG_MANIFEST
endif # UNIVERSAL_BINARY
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/mozapps/update/updater/updater.cpp comm-esr17/mozilla/toolkit/mozapps/update/updater/updater.cpp
--- comm-esr17.orig/mozilla/toolkit/mozapps/update/updater/updater.cpp 2013-09-12 09:55:51 +0900
+++ comm-esr17/mozilla/toolkit/mozapps/update/updater/updater.cpp 2013-09-14 03:12:28 +0900
@@ -3524,3 +3524,15 @@
list.Finish(rv);
return rv;
}
+
+#if defined(XP_WIN) && defined(__GNUC__)
+int main(int argc, char **argv){
+ wchar_t **argv_ = new wchar_t*[argc];
+ for(int i = 0; i < argc; i++){
+ int ws = MultiByteToWideChar(0, 0, argv[i], -1, NULL, 0);
+ argv_[i] = new wchar_t[ws];
+ MultiByteToWideChar(0, 0, argv[i], -1, argv_[i], ws);
+ }
+ return wmain(argc, argv_);
+}
+#endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/mozapps/update/updater/updater.exe.manifest comm-esr17/mozilla/toolkit/mozapps/update/updater/updater.exe.manifest
--- comm-esr17.orig/mozilla/toolkit/mozapps/update/updater/updater.exe.manifest 2013-09-12 09:55:51 +0900
+++ comm-esr17/mozilla/toolkit/mozapps/update/updater/updater.exe.manifest 2013-09-14 03:12:28 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/toolkit/toolkit-makefiles.sh comm-esr17/mozilla/toolkit/toolkit-makefiles.sh
--- comm-esr17.orig/mozilla/toolkit/toolkit-makefiles.sh 2013-09-12 09:55:52 +0900
+++ comm-esr17/mozilla/toolkit/toolkit-makefiles.sh 2013-09-14 03:12:28 +0900
@@ -1712,3 +1712,9 @@
media/libspeex_resampler/src/Makefile
"
fi
+
+if [ "$MOZ_TREE_FREETYPE" ] && [ "$_WIN32_MSVC" ]; then
+ add_makefiles "
+ modules/freetype2/Makefile
+ "
+fi
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/webapprt/win/webapprt.exe.manifest comm-esr17/mozilla/webapprt/win/webapprt.exe.manifest
--- comm-esr17.orig/mozilla/webapprt/win/webapprt.exe.manifest 2013-09-12 09:55:54 +0900
+++ comm-esr17/mozilla/webapprt/win/webapprt.exe.manifest 2013-09-14 03:12:28 +0900
@@ -34,6 +34,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/xpcom/base/nscore.h comm-esr17/mozilla/xpcom/base/nscore.h
--- comm-esr17.orig/mozilla/xpcom/base/nscore.h 2013-09-12 09:55:55 +0900
+++ comm-esr17/mozilla/xpcom/base/nscore.h 2013-09-14 03:12:28 +0900
@@ -127,7 +127,7 @@
#define NS_CONSTRUCTOR_FASTCALL
#endif
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(__GNUC__)
#define NS_IMPORT __declspec(dllimport)
#define NS_IMPORT_(type) __declspec(dllimport) type __stdcall
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp
--- comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp 2013-09-12 09:55:55 +0900
+++ comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp 2013-09-14 03:12:28 +0900
@@ -9,7 +9,7 @@
#include "xptc_gcc_x86_unix.h"
extern "C" {
-static void ATTRIBUTE_USED __attribute__ ((regparm(3)))
+void ATTRIBUTE_USED __attribute__ ((regparm(3)))
invoke_copy_to_stack(uint32_t paramCount, nsXPTCVariant* s, uint32_t* d)
{
for(uint32_t i = paramCount; i >0; i--, d++, s++)
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
--- comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp 2013-09-12 09:55:55 +0900
+++ comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp 2013-09-14 03:12:28 +0900
@@ -10,7 +10,7 @@
#include "xptc_gcc_x86_unix.h"
extern "C" {
-static nsresult ATTRIBUTE_USED
+nsresult ATTRIBUTE_USED
__attribute__ ((regparm (3)))
PrepareAndDispatch(uint32 methodIndex, nsXPTCStubBase* self, uint32_t* args)
{
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp
--- comm-esr17.orig/mozilla/xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp 2013-09-12 09:55:55 +0900
+++ comm-esr17/mozilla/xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp 2013-09-14 03:12:28 +0900
@@ -122,7 +122,7 @@
// these macros get expanded (many times) in the file #included below
#define STUB_ENTRY(n) \
-__declspec(naked) nsresult __stdcall nsXPTCStubBase::Stub##n() \
+__declspec(naked) nsresult NS_STDCALL nsXPTCStubBase::Stub##n() \
{ __asm mov ecx, n __asm jmp SharedStub }
#else
@@ -183,7 +183,7 @@
#endif /* __GNUC__ */
#define SENTINEL_ENTRY(n) \
-nsresult __stdcall nsXPTCStubBase::Sentinel##n() \
+nsresult NS_STDCALL nsXPTCStubBase::Sentinel##n() \
{ \
NS_ERROR("nsXPTCStubBase::Sentinel called"); \
return NS_ERROR_NOT_IMPLEMENTED; \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/app/Makefile.in comm-esr17/suite/app/Makefile.in
--- comm-esr17.orig/suite/app/Makefile.in 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/app/Makefile.in 2013-09-14 03:12:28 +0900
@@ -208,7 +208,7 @@
# Anything below the above ifdef won't be included in mac builds. So be very
# careful what you add here.
-MAC_APP_NAME = $(MOZ_APP_DISPLAYNAME)
+MAC_APP_NAME = $(MOZ_APP_NAME)
ifdef MOZ_DEBUG
MAC_APP_NAME := $(MAC_APP_NAME)Debug
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/app/seamonkey.exe.manifest comm-esr17/suite/app/seamonkey.exe.manifest
--- comm-esr17.orig/suite/app/seamonkey.exe.manifest 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/app/seamonkey.exe.manifest 2013-09-14 03:12:28 +0900
@@ -29,6 +29,7 @@
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/branding/nightly/package/windows/branding.nsi comm-esr17/suite/branding/nightly/package/windows/branding.nsi
--- comm-esr17.orig/suite/branding/nightly/package/windows/branding.nsi 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/branding/nightly/package/windows/branding.nsi 2013-09-14 03:12:28 +0900
@@ -3,9 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#NSIS defines
-!define BrandShortName "SeaMonkey"
-!define BrandFullName "SeaMonkey"
-!define BrandFullNameInternal "SeaMonkey"
+!define BrandShortName "seamonkey"
+!define BrandFullName "seamonkey"
+!define BrandFullNameInternal "seamonkey"
!define CompanyName "mozilla.org"
!define URLInfoAbout "http://www.mozilla.org"
!define URLUpdateInfo "http://www.seamonkey-project.org"
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/browser/browser-prefs.js comm-esr17/suite/browser/browser-prefs.js
--- comm-esr17.orig/suite/browser/browser-prefs.js 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/browser/browser-prefs.js 2013-09-14 03:12:28 +0900
@@ -9,7 +9,7 @@
*/
pref("startup.homepage_override_url","chrome://navigator-region/locale/region.properties");
-pref("general.skins.selectedSkin", "classic/1.0");
+pref("general.skins.selectedSkin", "modern/1.0");
pref("browser.chromeURL","chrome://navigator/content/navigator.xul");
pref("browser.hiddenWindowChromeURL", "chrome://navigator/content/hiddenWindow.xul");
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/build/Makefile.in comm-esr17/suite/build/Makefile.in
--- comm-esr17.orig/suite/build/Makefile.in 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/build/Makefile.in 2013-09-14 03:12:28 +0900
@@ -15,6 +15,7 @@
IS_COMPONENT = 1
MODULE_NAME = nsSuiteModule
+USE_STATIC_LIBS = 1
CPPSRCS = \
nsSuiteModule.cpp \
@@ -42,6 +43,10 @@
SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
endif
+ifeq ($(OS_ARCH),WINNT)
+XPCOM_GLUE_LDOPTS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)
+endif
+
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/build.mk comm-esr17/suite/build.mk
--- comm-esr17.orig/suite/build.mk 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/build.mk 2013-09-14 03:12:28 +0900
@@ -59,6 +59,9 @@
package-compare:
@$(MAKE) -C suite/installer package-compare
+stage-package:
+ @$(MAKE) -C suite/installer stage-package
+
install::
@$(MAKE) -C suite/installer install
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/feeds/src/Makefile.in comm-esr17/suite/feeds/src/Makefile.in
--- comm-esr17.orig/suite/feeds/src/Makefile.in 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/feeds/src/Makefile.in 2013-09-14 03:12:28 +0900
@@ -12,6 +12,7 @@
MODULE = suitefeeds
LIBRARY_NAME = suitefeeds_s
FORCE_STATIC_LIB = 1
+USE_STATIC_LIBS = 1
DEFINES += \
-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/installer/Makefile.in comm-esr17/suite/installer/Makefile.in
--- comm-esr17.orig/suite/installer/Makefile.in 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/installer/Makefile.in 2013-09-14 03:12:28 +0900
@@ -25,16 +25,22 @@
mail \
$(NULL)
+ifdef L10NBASEDIR
+MOZ_LOCALIZED_PKG_LIST = en-US $(shell ls $(L10NBASEDIR))
+else
MOZ_LOCALIZED_PKG_LIST = \
$(AB_CD) \
$(NULL)
+endif
DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
ifeq ($(MOZ_CHROME_FILE_FORMAT), jar)
DEFINES += -DJAREXT=.jar
+JAREXT = .jar
else
DEFINES += -DJAREXT=
+JAREXT =
endif
ifdef ENABLE_TESTS
@@ -123,8 +129,22 @@
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = package-manifest
+ifeq (Darwin, $(OS_ARCH))
+CHROME_PATH = $(_BINPATH)/chrome
+else
+CHROME_PATH = bin/chrome
+endif
+
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+ for AB_CD in $(MOZ_LOCALIZED_PKG_LIST) ; do \
+ if test "$${AB_CD}" != "$(AB_CD)" ; then \
+ echo "" >> $@ ; \
+ echo "[$${AB_CD}]" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}$(JAREXT)" >> $@ ; \
+ echo "$(CHROME_PATH)/$${AB_CD}.manifest" >> $@ ; \
+ fi ; \
+ done
GARBAGE += $(MOZ_PKG_MANIFEST)
endif
@@ -148,6 +168,7 @@
GENERATE_CACHE=1
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin, $(OS_ARCH))
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/installer/package-manifest.in comm-esr17/suite/installer/package-manifest.in
--- comm-esr17.orig/suite/installer/package-manifest.in 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/installer/package-manifest.in 2013-09-16 16:08:49 +0900
@@ -72,6 +72,9 @@
#else
@BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
#endif
+#ifdef MOZ_TREE_FREETYPE
+@BINPATH@/@DLL_PREFIX@freetype2@DLL_SUFFIX@
+#endif
#ifdef XP_MACOSX
@BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
@BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
@@ -82,8 +85,6 @@
#ifdef MOZ_ANGLE
@BINPATH@/libEGL.dll
@BINPATH@/libGLESv2.dll
-@BINPATH@/@MOZ_D3DX9_DLL@
-@BINPATH@/@MOZ_D3DCOMPILER_DLL@
#endif
#ifdef XP_WIN32
#ifndef MOZ_DEBUG
@@ -180,7 +181,6 @@
@BINPATH@/components/dom_browserelement.xpt
@BINPATH@/components/dom_camera.xpt
@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_contacts.xpt
@BINPATH@/components/dom_core.xpt
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_devicestorage.xpt
@@ -353,8 +353,6 @@
@BINPATH@/components/ColorAnalyzer.js
@BINPATH@/components/ConsoleAPI.js
@BINPATH@/components/ConsoleAPI.manifest
-@BINPATH@/components/ContactManager.js
-@BINPATH@/components/ContactManager.manifest
@BINPATH@/components/contentAreaDropListener.js
@BINPATH@/components/contentAreaDropListener.manifest
@BINPATH@/components/contentSecurityPolicy.js
@@ -817,6 +815,8 @@
; New message notification
@BINPATH@/components/newMailNotificationService.js
+#ifdef
+
[chatzilla]
#ifdef MOZ_OMNIJAR
@BINPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
@@ -895,3 +895,5 @@
@BINPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
#endif
#endif
+
+#endif
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/locales/en-US/chrome/branding/brand.dtd comm-esr17/suite/locales/en-US/chrome/branding/brand.dtd
--- comm-esr17.orig/suite/locales/en-US/chrome/branding/brand.dtd 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/locales/en-US/chrome/branding/brand.dtd 2013-09-14 03:12:28 +0900
@@ -2,7 +2,7 @@
- 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/. -->
-
-
-
+
+
+
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/locales/en-US/chrome/branding/brand.properties comm-esr17/suite/locales/en-US/chrome/branding/brand.properties
--- comm-esr17.orig/suite/locales/en-US/chrome/branding/brand.properties 2013-09-12 09:49:38 +0900
+++ comm-esr17/suite/locales/en-US/chrome/branding/brand.properties 2013-09-14 03:12:28 +0900
@@ -2,9 +2,9 @@
# 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/.
-brandFullName=SeaMonkey
-brandShortName=SeaMonkey
-vendorShortName=SeaMonkey
+brandFullName=seamonkey
+brandShortName=seamonkey
+vendorShortName=seamonkey
sidebarName=Sidebar
extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes
extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/personas
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/profile/Makefile.in comm-esr17/suite/profile/Makefile.in
--- comm-esr17.orig/suite/profile/Makefile.in 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/profile/Makefile.in 2013-09-14 03:12:28 +0900
@@ -14,6 +14,7 @@
MODULE = suiteprofile
LIBRARY_NAME = suiteprofile_s
+USE_STATIC_LIBS = 1
CPPSRCS = \
nsSuiteDirectoryProvider.cpp \
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/profile/migration/src/Makefile.in comm-esr17/suite/profile/migration/src/Makefile.in
--- comm-esr17.orig/suite/profile/migration/src/Makefile.in 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/profile/migration/src/Makefile.in 2013-09-14 03:12:28 +0900
@@ -22,4 +22,6 @@
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
+USE_STATIC_LIBS = 1
+
include $(topsrcdir)/config/rules.mk
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/shell/src/Makefile.in comm-esr17/suite/shell/src/Makefile.in
--- comm-esr17.orig/suite/shell/src/Makefile.in 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/shell/src/Makefile.in 2013-09-14 03:12:28 +0900
@@ -12,6 +12,7 @@
MODULE = shellservice
FORCE_STATIC_LIB=1
+USE_STATIC_LIBS = 1
ifeq ($(OS_ARCH),WINNT)
CPPSRCS = nsWindowsShellService.cpp
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/classic/communicator/toolbar.css comm-esr17/suite/themes/classic/communicator/toolbar.css
--- comm-esr17.orig/suite/themes/classic/communicator/toolbar.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/classic/communicator/toolbar.css 2013-09-14 03:12:28 +0900
@@ -32,6 +32,7 @@
width: 10px;
padding: 2px 1px;
list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
+ display: none !important;
}
toolbargrippy:hover {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/classic/mac/communicator/toolbar.css comm-esr17/suite/themes/classic/mac/communicator/toolbar.css
--- comm-esr17.orig/suite/themes/classic/mac/communicator/toolbar.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/classic/mac/communicator/toolbar.css 2013-09-14 03:12:28 +0900
@@ -27,6 +27,7 @@
width: 10px;
padding: 2px 1px;
list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
+ display: none !important;
}
toolbargrippy:hover {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/classic/messenger/messageHeader.css comm-esr17/suite/themes/classic/messenger/messageHeader.css
--- comm-esr17.orig/suite/themes/classic/messenger/messageHeader.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/classic/messenger/messageHeader.css 2013-09-14 03:12:28 +0900
@@ -32,6 +32,8 @@
#msgHeaderView {
border-right: 1px solid ThreeDShadow;
border-left: 1px solid ThreeDShadow;
+ max-height: 8em !important;
+ overflow: auto !important;
}
#collapsedHeaderView,
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/classic/os2/communicator/toolbar.css comm-esr17/suite/themes/classic/os2/communicator/toolbar.css
--- comm-esr17.orig/suite/themes/classic/os2/communicator/toolbar.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/classic/os2/communicator/toolbar.css 2013-09-14 03:12:28 +0900
@@ -28,6 +28,7 @@
width: 10px;
padding: 2px 1px;
list-style-image: url("chrome://communicator/skin/toolbar/tbgrip-arrow.gif");
+ display: none !important;
}
toolbargrippy:hover {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/modern/communicator/toolbar.css comm-esr17/suite/themes/modern/communicator/toolbar.css
--- comm-esr17.orig/suite/themes/modern/communicator/toolbar.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/modern/communicator/toolbar.css 2013-09-14 03:12:28 +0900
@@ -55,6 +55,10 @@
}
/* ::::: toolbargrippy ::::: */
+
+toolbargrippy {
+ display: none !important;
+}
.toolbar-primary-grippy {
-moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbargrippy-primary");
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/modern/global/toolbar.css comm-esr17/suite/themes/modern/global/toolbar.css
--- comm-esr17.orig/suite/themes/modern/global/toolbar.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/modern/global/toolbar.css 2013-09-14 03:12:28 +0900
@@ -65,6 +65,7 @@
border-bottom: 1px solid #86929E;
border-left: 1px solid #EEF0F3;
list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow.gif");
+ display: none !important;
}
toolbargrippy:hover:active {
diff -urN -x CVS -x '*.pyc' -x '*.pyo' -x '*.stackdump' -x configure -x '.mozconfig.mk*' -x .mozconfig.out -x '*.egg-info' comm-esr17.orig/suite/themes/modern/messenger/messageHeader.css comm-esr17/suite/themes/modern/messenger/messageHeader.css
--- comm-esr17.orig/suite/themes/modern/messenger/messageHeader.css 2013-09-12 09:49:39 +0900
+++ comm-esr17/suite/themes/modern/messenger/messageHeader.css 2013-09-14 03:12:28 +0900
@@ -37,6 +37,8 @@
border-right: 1px solid #7B969C;
border-bottom: 1px solid #000000;
border-left: 1px solid #7B969C;
+ max-height: 8em !important;
+ overflow: auto !important;
}
#collapsedHeaderView,