commit e50a4c667cec1dadb18cf73f89d33343f17a8257 Author: Arlo Breault arlolra@gmail.com Date: Tue Sep 29 15:17:55 2015 +0200

Ifdef performance_toolkit.xpt

* https://bugzilla.mozilla.org/show_bug.cgi?id=1209505 --- projects/instantbird/config | 1 + .../ifdef-performance-toolkit-xpt.patch | 31 ++++++++++++++++++++ 2 files changed, 32 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config index bd8b89c..ba71fa9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -86,6 +86,7 @@ input_files: - filename: search-context-menu.patch - filename: search-preferences-xul.patch - filename: log-preferences-xul.patch + - filename: ifdef-performance-toolkit-xpt.patch - filename: branding/blistWindow.png - filename: branding/blistWindow16.png - filename: branding/blistWindow48.png diff --git a/projects/instantbird/ifdef-performance-toolkit-xpt.patch b/projects/instantbird/ifdef-performance-toolkit-xpt.patch new file mode 100644 index 0000000..863f9b7 --- /dev/null +++ b/projects/instantbird/ifdef-performance-toolkit-xpt.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Arlo Breault arlolra@gmail.com +# Date 1443532131 -7200 +# Tue Sep 29 15:08:51 2015 +0200 +# Node ID 3c43eb71066949342af540518d3051565de9cb8a +# Parent e1a209673d05dc27dd5a8230b257b1ddcc1cb055 +Port bug 1164707 to /im + +diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in +--- a/im/installer/package-manifest.in ++++ b/im/installer/package-manifest.in +@@ -422,17 +422,19 @@ + #ifdef MOZ_WEBRTC + @RESPATH@/components/PeerConnection.js + @RESPATH@/components/PeerConnection.manifest + #endif + @RESPATH@/components/toolkit_asyncshutdown.xpt + @RESPATH@/components/toolkit_filewatcher.xpt + @RESPATH@/components/toolkit_formautofill.xpt + @RESPATH@/components/toolkit_osfile.xpt ++#ifdef NIGHTLY_BUILD + @RESPATH@/components/toolkit_perfmonitoring.xpt ++#endif + @RESPATH@/components/toolkit_xulstore.xpt + @RESPATH@/components/toolkitplaces.manifest + @RESPATH@/components/toolkitsearch.manifest + #ifdef UNIX_BUT_NOT_MAC + @RESPATH@/components/toolkitremote.xpt + #endif + #ifdef MOZ_GTK + @RESPATH@/components/filepicker.xpt