mozilla-firefox-packaging.patch

   1 diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-release/browser/installer/package-manifest.in
   2 --- mozilla-release.orig/browser/installer/package-manifest.in  2015-01-09 05:38:16.000000000 +0100
   3 +++ mozilla-release/browser/installer/package-manifest.in       2015-01-24 14:11:47.692555975 +0100
   4 @@ -31,14 +31,18 @@
   5  [@AB_CD@]
   6  @BINPATH@/browser/chrome/@AB_CD@@JAREXT@
   7  @BINPATH@/browser/chrome/@AB_CD@.manifest
   8 +#ifndef LIBXUL_SDK
   9  @BINPATH@/chrome/@AB_CD@@JAREXT@
  10  @BINPATH@/chrome/@AB_CD@.manifest
  11 +#endif
  12  @BINPATH@/browser/defaults/profile/bookmarks.html
  13  @BINPATH@/browser/defaults/profile/chrome/*
  14  @BINPATH@/browser/defaults/profile/localstore.rdf
  15  @BINPATH@/browser/defaults/profile/mimeTypes.rdf
  16 +#ifndef LIBXUL_SDK
  17  @BINPATH@/dictionaries/*
  18  @BINPATH@/hyphenation/*
  19 +#endif
  20  @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
  21  @BINPATH@/browser/searchplugins/*
  22  #ifdef XP_WIN32
  23 @@ -50,15 +54,19 @@
  24  #endif
  25
  26  [xpcom]
  27 +#ifndef LIBXUL_SDK
  28  @BINPATH@/dependentlibs.list
  29 +#endif
  30  #ifdef GKMEDIAS_SHARED_LIBRARY
  31  @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
  32  #endif
  33 +#ifndef LIBXUL_SDK
  34  #ifdef XP_MACOSX
  35  @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
  36  #else
  37  @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
  38  #endif
  39 +#endif
  40  #ifdef MOZ_SHARED_MOZGLUE
  41  #ifdef XP_MACOSX
  42  @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozglue@DLL_SUFFIX@
  43 @@ -67,12 +75,14 @@
  44  #endif
  45  #endif
  46  #ifndef MOZ_STATIC_JS
  47 +#ifndef LIBXUL_SDK
  48  #ifdef XP_MACOSX
  49  @APPNAME@/Contents/MacOS/@DLL_PREFIX@mozjs@DLL_SUFFIX@
  50  #else
  51  @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
  52  #endif
  53  #endif
  54 +#endif
  55  #ifdef MOZ_DMD
  56  #ifdef XP_MACOSX
  57  @APPNAME@/Contents/MacOS/@DLL_PREFIX@dmd@DLL_SUFFIX@
  58 @@ -90,14 +100,18 @@
  59  #ifdef XP_MACOSX
  60  @APPNAME@/Contents/MacOS/XUL
  61  #else
  62 +#ifndef LIBXUL_SDK
  63  @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
  64  #endif
  65 +#endif
  66  #ifdef XP_MACOSX
  67  @APPNAME@/Contents/MacOS/@MOZ_CHILD_PROCESS_NAME@.app/
  68  @APPNAME@/Contents/MacOS/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
  69  #else
  70 +#ifndef LIBXUL_SDK
  71  @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
  72  #endif
  73 +#endif
  74  #ifdef XP_WIN32
  75  @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
  76  #if MOZ_PACKAGE_MSVC_DLLS
  77 @@ -151,7 +165,9 @@
  78  #ifdef MOZ_UPDATER
  79  @BINPATH@/update-settings.ini
  80  #endif
  81 +#ifndef LIBXUL_SDK
  82  @BINPATH@/platform.ini
  83 +#endif
  84  #ifndef MOZ_NATIVE_SQLITE
  85  #ifndef MOZ_FOLD_LIBS
  86  @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
  87 @@ -161,12 +177,15 @@
  88  #ifdef XP_UNIX
  89  #ifndef XP_MACOSX
  90  @BINPATH@/run-mozilla.sh
  91 +#ifndef LIBXUL_SDK
  92  @BINPATH@/mozilla-xremote-client
  93  #endif
  94  #endif
  95 +#endif
  96
  97  ; [Components]
  98  @BINPATH@/browser/components/components.manifest
  99 +#ifndef LIBXUL_SDK
 100  @BINPATH@/components/alerts.xpt
 101  #ifdef ACCESSIBILITY
 102  #ifdef XP_WIN32
 103 @@ -178,9 +197,11 @@
 104  @BINPATH@/components/appstartup.xpt
 105  @BINPATH@/components/autocomplete.xpt
 106  @BINPATH@/components/autoconfig.xpt
 107 +#endif
 108  @BINPATH@/browser/components/browsercompsbase.xpt
 109  @BINPATH@/browser/components/browser-feeds.xpt
 110  @BINPATH@/browser/components/browsermodules.manifest
 111 +#ifndef LIBXUL_SDK
 112  @BINPATH@/components/caps.xpt
 113  @BINPATH@/components/chrome.xpt
 114  @BINPATH@/components/commandhandler.xpt
 115 @@ -258,7 +279,9 @@
 116  @BINPATH@/components/filepicker.xpt
 117  #endif
 118  @BINPATH@/components/find.xpt
 119 +#endif
 120  @BINPATH@/browser/components/fuel.xpt
 121 +#ifndef LIBXUL_SDK
 122  @BINPATH@/components/gfx.xpt
 123  @BINPATH@/components/html5.xpt
 124  @BINPATH@/components/htmlparser.xpt
 125 @@ -279,7 +302,9 @@
 126  @BINPATH@/components/layout_xul.xpt
 127  @BINPATH@/components/locale.xpt
 128  @BINPATH@/components/lwbrk.xpt
 129 +#endif
 130  @BINPATH@/browser/components/migration.xpt
 131 +#ifndef LIBXUL_SDK
 132  @BINPATH@/components/mimetype.xpt
 133  @BINPATH@/components/mozfind.xpt
 134  @BINPATH@/components/necko_about.xpt
 135 @@ -316,12 +341,16 @@
 136  @BINPATH@/components/rdf.xpt
 137  @BINPATH@/components/satchel.xpt
 138  @BINPATH@/components/saxparser.xpt
 139 +#endif
 140  @BINPATH@/browser/components/sessionstore.xpt
 141 +#ifndef LIBXUL_SDK
 142  @BINPATH@/components/services-crypto-component.xpt
 143  #ifdef MOZ_CAPTIVEDETECT
 144  @BINPATH@/components/captivedetect.xpt
 145  #endif
 146 +#endif
 147  @BINPATH@/browser/components/shellservice.xpt
 148 +#ifndef LIBXUL_SDK
 149  @BINPATH@/components/shistory.xpt
 150  @BINPATH@/components/spellchecker.xpt
 151  @BINPATH@/components/storage.xpt
 152 @@ -364,8 +393,10 @@
 153  @BINPATH@/components/xultmpl.xpt
 154  @BINPATH@/components/zipwriter.xpt
 155  @BINPATH@/components/telemetry.xpt
 156 +#endif
 157
 158  ; JavaScript components
 159 +#ifndef LIBXUL_SDK
 160  @BINPATH@/components/ChromeNotifications.js
 161  @BINPATH@/components/ChromeNotifications.manifest
 162  @BINPATH@/components/ConsoleAPI.manifest
 163 @@ -374,6 +405,7 @@
 164  @BINPATH@/components/BrowserElementParent.js
 165  @BINPATH@/components/FeedProcessor.manifest
 166  @BINPATH@/components/FeedProcessor.js
 167 +#endif
 168  @BINPATH@/browser/components/BrowserFeeds.manifest
 169  @BINPATH@/browser/components/FeedConverter.js
 170  @BINPATH@/browser/components/FeedWriter.js
 171 @@ -396,6 +428,7 @@
 172  @BINPATH@/browser/components/Experiments.manifest
 173  @BINPATH@/browser/components/ExperimentsService.js
 174  @BINPATH@/browser/components/translation.manifest
 175 +#ifndef LIBXUL_SDK
 176  @BINPATH@/components/Downloads.manifest
 177  @BINPATH@/components/DownloadLegacy.js
 178  @BINPATH@/components/BrowserPageThumbs.manifest
 179 @@ -427,8 +460,10 @@
 180  @BINPATH@/components/nsDownloadManagerUI.js
 181  @BINPATH@/components/NetworkGeolocationProvider.manifest
 182  @BINPATH@/components/NetworkGeolocationProvider.js
 183 +#endif
 184  @BINPATH@/browser/components/nsSidebar.manifest
 185  @BINPATH@/browser/components/nsSidebar.js
 186 +#ifndef LIBXUL_SDK
 187  @BINPATH@/components/extensions.manifest
 188  @BINPATH@/components/addonManager.js
 189  @BINPATH@/components/amContentHandler.js
 190 @@ -448,12 +483,16 @@
 191  @BINPATH@/components/ProcessSingleton.manifest
 192  @BINPATH@/components/MainProcessSingleton.js
 193  @BINPATH@/components/ContentProcessSingleton.js
 194 +#endif
 195  @BINPATH@/browser/components/nsSessionStore.manifest
 196  @BINPATH@/browser/components/nsSessionStartup.js
 197  @BINPATH@/browser/components/nsSessionStore.js
 198 +#ifndef LIBXUL_SDK
 199  @BINPATH@/components/nsURLFormatter.manifest
 200  @BINPATH@/components/nsURLFormatter.js
 201 +#endif
 202  @BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
 203 +#ifndef LIBXUL_SDK
 204  @BINPATH@/components/txEXSLTRegExFunctions.manifest
 205  @BINPATH@/components/txEXSLTRegExFunctions.js
 206  @BINPATH@/components/toolkitplaces.manifest
 207 @@ -464,7 +503,9 @@
 208  @BINPATH@/components/UnifiedComplete.manifest
 209  @BINPATH@/components/UnifiedComplete.js
 210  @BINPATH@/components/nsPlacesExpiration.js
 211 +#endif
 212  @BINPATH@/browser/components/PlacesProtocolHandler.js
 213 +#ifndef LIBXUL_SDK
 214  @BINPATH@/components/PlacesCategoriesStarter.js
 215  @BINPATH@/components/ColorAnalyzer.js
 216  @BINPATH@/components/PageThumbsProtocol.js
 217 @@ -488,6 +529,7 @@
 218  @BINPATH@/components/FormAutofillStartup.js
 219  @BINPATH@/components/contentAreaDropListener.manifest
 220  @BINPATH@/components/contentAreaDropListener.js
 221 +#endif
 222  @BINPATH@/browser/components/BrowserProfileMigrators.manifest
 223  @BINPATH@/browser/components/ProfileMigrator.js
 224  @BINPATH@/browser/components/ChromeProfileMigrator.js
 225 @@ -499,6 +541,7 @@
 226  #ifdef XP_MACOSX
 227  @BINPATH@/browser/components/SafariProfileMigrator.js
 228  #endif
 229 +#ifndef LIBXUL_SDK
 230  #ifdef MOZ_ENABLE_DBUS
 231  @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
 232  #endif
 233 @@ -622,19 +665,24 @@
 234  @BINPATH@/components/TestInterfaceJS.js
 235  @BINPATH@/components/TestInterfaceJS.manifest
 236  #endif
 237 +#endif
 238
 239  ; Modules
 240  @BINPATH@/browser/modules/*
 241 +#ifndef LIBXUL_SDK
 242  @BINPATH@/modules/*
 243 +#endif
 244
 245  ; Safe Browsing
 246  #ifdef MOZ_URL_CLASSIFIER
 247 +#ifndef LIBXUL_SDK
 248  @BINPATH@/components/nsURLClassifier.manifest
 249  @BINPATH@/components/nsUrlClassifierHashCompleter.js
 250  @BINPATH@/components/nsUrlClassifierListManager.js
 251  @BINPATH@/components/nsUrlClassifierLib.js
 252  @BINPATH@/components/url-classifier.xpt
 253  #endif
 254 +#endif
 255
 256  ; ANGLE GLES-on-D3D rendering library
 257  #ifdef MOZ_ANGLE_RENDERER
 258 @@ -662,10 +710,12 @@
 259  #endif
 260  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 261  @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 262 +#ifndef LIBXUL_SDK
 263  @BINPATH@/chrome/toolkit@JAREXT@
 264  @BINPATH@/chrome/toolkit.manifest
 265  @BINPATH@/chrome/recording.manifest
 266  @BINPATH@/chrome/recording/*
 267 +#endif
 268  #ifdef MOZ_GTK
 269  @BINPATH@/browser/chrome/icons/default/default16.png
 270  @BINPATH@/browser/chrome/icons/default/default32.png
 271 @@ -693,9 +743,11 @@
 272  ; All the pref files must be part of base to prevent migration bugs
 273  @BINPATH@/browser/@PREF_DIR@/firefox.js
 274  @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
 275 +#ifndef LIBXUL_SDK
 276  @BINPATH@/greprefs.js
 277  @BINPATH@/defaults/autoconfig/platform.js
 278  @BINPATH@/defaults/autoconfig/prefcalls.js
 279 +#endif
 280  @BINPATH@/browser/defaults/profile/prefs.js
 281
 282  #ifndef LIBXUL_SDK
 283 @@ -705,7 +757,7 @@
 284  @BINPATH@/defaults/pref/channel-prefs.js
 285  #else
 286  ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
 287 -@BINPATH@/@PREF_DIR@/channel-prefs.js
 288 +@BINPATH@/browser/@PREF_DIR@/channel-prefs.js
 289  #endif
 290
 291  ; Services (gre) prefs
 292 @@ -713,11 +765,14 @@
 293  @BINPATH@/defaults/pref/services-notifications.js
 294  #endif
 295  #ifdef MOZ_SERVICES_SYNC
 296 +#ifndef LIBXUL_SDK
 297  @BINPATH@/defaults/pref/services-sync.js
 298  #endif
 299 +#endif
 300
 301  ; [Layout Engine Resources]
 302  ; Style Sheets, Graphics and other Resources used by the layout engine.
 303 +#ifndef LIBXUL_SDK
 304  @BINPATH@/res/EditorOverride.css
 305  @BINPATH@/res/contenteditable.css
 306  @BINPATH@/res/designmode.css
 307 @@ -755,11 +810,14 @@
 308  #ifdef XP_MACOSX
 309  @BINPATH@/res/MainMenu.nib/
 310  #endif
 311 +#endif
 312
 313  ; svg
 314 +#ifndef LIBXUL_SDK
 315  @BINPATH@/res/svg.css
 316  @BINPATH@/components/dom_svg.xpt
 317  @BINPATH@/components/dom_smil.xpt
 318 +#endif
 319
 320  ; [Personal Security Manager]
 321  ;
 322 @@ -794,11 +852,13 @@
 323  @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 324  #endif
 325  #endif
 326 +#ifndef LIBXUL_SDK
 327  @BINPATH@/chrome/pippki@JAREXT@
 328  @BINPATH@/chrome/pippki.manifest
 329  @BINPATH@/components/pipboot.xpt
 330  @BINPATH@/components/pipnss.xpt
 331  @BINPATH@/components/pippki.xpt
 332 +#endif
 333
 334  ; For process sandboxing
 335  #if defined(MOZ_SANDBOX)
 336 @@ -913,9 +973,11 @@
 337  @BINPATH@/metro/modules
 338  #endif
 339
 340 +#ifndef LIBXUL_SDK
 341  @BINPATH@/components/DataStore.manifest
 342  @BINPATH@/components/DataStoreImpl.js
 343  @BINPATH@/components/dom_datastore.xpt
 344 +#endif
 345
 346
 347  #ifdef MOZ_ASAN