]> git.pld-linux.org Git - packages/firefox.git/blame - mozilla-firefox-packaging.patch
- up to 25.0
[packages/firefox.git] / mozilla-firefox-packaging.patch
CommitLineData
c5cd9be2
JB
1diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in iceweasel-24.0/mozilla/browser/installer/package-manifest.in
2--- iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in 2013-09-11 01:14:52.000000000 +0200
3+++ iceweasel-24.0/mozilla/browser/installer/package-manifest.in 2013-10-23 08:51:36.788646262 +0200
4@@ -32,14 +32,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@@ -51,17 +55,23 @@
96ef4151
JB
24 #endif
25
26 [xpcom]
27+#ifndef LIBXUL_SDK
28 @BINPATH@/dependentlibs.list
29+#endif
30 #ifdef XP_WIN32
31 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
32 #endif
33+#ifndef LIBXUL_SDK
34 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
35+#endif
36 #ifdef MOZ_SHARED_MOZGLUE
37 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
38 #endif
96ef4151 39 #ifndef MOZ_STATIC_JS
c5cd9be2 40+#ifndef LIBXUL_SDK
96ef4151
JB
41 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
42 #endif
43+#endif
44 #ifndef MOZ_NATIVE_NSPR
c5cd9be2 45 #ifndef MOZ_FOLD_LIBS
96ef4151 46 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
c5cd9be2 47@@ -72,14 +82,18 @@
96ef4151
JB
48 #ifdef XP_MACOSX
49 @BINPATH@/XUL
50 #else
c5cd9be2 51+#ifndef LIBXUL_SDK
96ef4151
JB
52 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
53 #endif
54+#endif
55 #ifdef XP_MACOSX
56 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
57 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
58 #else
59+#ifndef LIBXUL_SDK
60 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
61 #endif
62+#endif
63 #ifdef XP_WIN32
c5cd9be2 64 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
96ef4151 65 #ifndef MOZ_DEBUG
c5cd9be2 66@@ -118,7 +132,9 @@
96ef4151
JB
67 #ifdef MOZ_UPDATER
68 @BINPATH@/update-settings.ini
69 #endif
70+#ifndef LIBXUL_SDK
71 @BINPATH@/platform.ini
72+#endif
73 #ifndef XP_OS2
74 #ifndef MOZ_NATIVE_SQLITE
c5cd9be2
JB
75 #ifndef MOZ_FOLD_LIBS
76@@ -132,25 +148,34 @@
96ef4151
JB
77 #ifdef XP_UNIX
78 #ifndef XP_MACOSX
96ef4151 79 @BINPATH@/run-mozilla.sh
c5cd9be2 80+#ifndef LIBXUL_SDK
96ef4151
JB
81 @BINPATH@/mozilla-xremote-client
82 #endif
83 #endif
84+#endif
85
86 ; [Components]
c5cd9be2 87 @BINPATH@/browser/components/components.manifest
96ef4151
JB
88+#ifndef LIBXUL_SDK
89 @BINPATH@/components/alerts.xpt
c5cd9be2 90+#endif
96ef4151
JB
91 #ifdef ACCESSIBILITY
92 #ifdef XP_WIN32
c5cd9be2
JB
93 @BINPATH@/AccessibleMarshal.dll
94 #endif
95+#ifndef LIBXUL_SDK
96 @BINPATH@/components/accessibility.xpt
97 #endif
98+#endif
99+#ifndef LIBXUL_SDK
100 @BINPATH@/components/appshell.xpt
96ef4151
JB
101 @BINPATH@/components/appstartup.xpt
102 @BINPATH@/components/autocomplete.xpt
103 @BINPATH@/components/autoconfig.xpt
104+#endif
c5cd9be2
JB
105 @BINPATH@/browser/components/browsercompsbase.xpt
106 @BINPATH@/browser/components/browser-feeds.xpt
96ef4151
JB
107+#ifndef LIBXUL_SDK
108 @BINPATH@/components/caps.xpt
109 @BINPATH@/components/chrome.xpt
110 @BINPATH@/components/commandhandler.xpt
c5cd9be2
JB
111@@ -169,6 +194,7 @@
112 @BINPATH@/components/dom_apps.xpt
113 @BINPATH@/components/dom_base.xpt
114 @BINPATH@/components/dom_system.xpt
115+#endif
116 #ifdef MOZ_B2G_RIL
117 @BINPATH@/components/dom_telephony.xpt
118 @BINPATH@/components/dom_voicemail.xpt
119@@ -212,6 +212,7 @@
120 #ifdef MOZ_B2G_BT
121 @BINPATH@/components/dom_bluetooth.xpt
122 #endif
123+#ifndef LIBXUL_SDK
124 @BINPATH@/components/dom_camera.xpt
125 @BINPATH@/components/dom_canvas.xpt
126 @BINPATH@/components/dom_contacts.xpt
127@@ -216,6 +243,8 @@
128 @BINPATH@/components/dom_xbl.xpt
129 @BINPATH@/components/dom_xpath.xpt
130 @BINPATH@/components/dom_xul.xpt
131+#endif
132+#ifndef LIBXUL_SDK
133 #ifdef MOZ_GAMEPAD
134 @BINPATH@/components/dom_gamepad.xpt
135 #endif
136@@ -231,7 +260,9 @@
96ef4151
JB
137 @BINPATH@/components/filepicker.xpt
138 #endif
139 @BINPATH@/components/find.xpt
140+#endif
c5cd9be2 141 @BINPATH@/browser/components/fuel.xpt
96ef4151
JB
142+#ifndef LIBXUL_SDK
143 @BINPATH@/components/gfx.xpt
144 @BINPATH@/components/html5.xpt
145 @BINPATH@/components/htmlparser.xpt
c5cd9be2 146@@ -254,7 +285,9 @@
96ef4151
JB
147 @BINPATH@/components/layout_xul.xpt
148 @BINPATH@/components/locale.xpt
149 @BINPATH@/components/lwbrk.xpt
150+#endif
c5cd9be2 151 @BINPATH@/browser/components/migration.xpt
96ef4151
JB
152+#ifndef LIBXUL_SDK
153 @BINPATH@/components/mimetype.xpt
154 @BINPATH@/components/mozfind.xpt
155 @BINPATH@/components/necko_about.xpt
c5cd9be2 156@@ -289,12 +322,16 @@
96ef4151
JB
157 @BINPATH@/components/rdf.xpt
158 @BINPATH@/components/satchel.xpt
159 @BINPATH@/components/saxparser.xpt
160+#endif
c5cd9be2 161 @BINPATH@/browser/components/sessionstore.xpt
96ef4151
JB
162+#ifndef LIBXUL_SDK
163 @BINPATH@/components/services-crypto-component.xpt
164+#endif
c5cd9be2
JB
165 #ifdef MOZ_CAPTIVEDETECT
166 @BINPATH@/components/captivedetect.xpt
167 #endif
168 @BINPATH@/browser/components/shellservice.xpt
96ef4151
JB
169+#ifndef LIBXUL_SDK
170 @BINPATH@/components/shistory.xpt
171 @BINPATH@/components/spellchecker.xpt
172 @BINPATH@/components/storage.xpt
c5cd9be2
JB
173@@ -312,9 +349,11 @@
174 @BINPATH@/components/webBrowser_core.xpt
175 @BINPATH@/components/webbrowserpersist.xpt
176 @BINPATH@/components/widget.xpt
177+#endif
178 #ifdef XP_MACOSX
179 @BINPATH@/components/widget_cocoa.xpt
180 #endif
181+#ifndef LIBXUL_SDK
182 @BINPATH@/components/windowds.xpt
183 @BINPATH@/components/windowwatcher.xpt
184 @BINPATH@/components/xpcom_base.xpt
185@@ -339,6 +378,7 @@
96ef4151
JB
186 @BINPATH@/components/BrowserElementParent.js
187 @BINPATH@/components/FeedProcessor.manifest
188 @BINPATH@/components/FeedProcessor.js
189+#endif
c5cd9be2
JB
190 @BINPATH@/browser/components/BrowserFeeds.manifest
191 @BINPATH@/browser/components/FeedConverter.js
192 @BINPATH@/browser/components/FeedWriter.js
193@@ -354,6 +394,7 @@
194 @BINPATH@/browser/components/DownloadsStartup.js
195 @BINPATH@/browser/components/DownloadsUI.js
196 @BINPATH@/browser/components/BrowserPlaces.manifest
96ef4151 197+#ifndef LIBXUL_SDK
c5cd9be2
JB
198 @BINPATH@/components/Downloads.manifest
199 @BINPATH@/components/DownloadLegacy.js
200 @BINPATH@/components/BrowserPageThumbs.manifest
201@@ -381,31 +422,39 @@
202 @BINPATH@/components/nsDownloadManagerUI.js
203 @BINPATH@/components/NetworkGeolocationProvider.manifest
96ef4151 204 @BINPATH@/components/NetworkGeolocationProvider.js
96ef4151 205+#endif
c5cd9be2
JB
206 @BINPATH@/browser/components/nsSidebar.manifest
207 @BINPATH@/browser/components/nsSidebar.js
96ef4151
JB
208+#ifndef LIBXUL_SDK
209 @BINPATH@/components/extensions.manifest
210 @BINPATH@/components/addonManager.js
211 @BINPATH@/components/amContentHandler.js
212 @BINPATH@/components/amWebInstallListener.js
213 @BINPATH@/components/nsBlocklistService.js
214+#endif
215 #ifdef MOZ_UPDATER
216 @BINPATH@/components/nsUpdateService.manifest
217 @BINPATH@/components/nsUpdateService.js
218 @BINPATH@/components/nsUpdateServiceStub.js
219 #endif
220+#ifndef LIBXUL_SDK
221 @BINPATH@/components/nsUpdateTimerManager.manifest
222 @BINPATH@/components/nsUpdateTimerManager.js
223 @BINPATH@/components/pluginGlue.manifest
224+#endif
c5cd9be2
JB
225 @BINPATH@/browser/components/nsSessionStore.manifest
226 @BINPATH@/browser/components/nsSessionStartup.js
227 @BINPATH@/browser/components/nsSessionStore.js
96ef4151
JB
228+#ifndef LIBXUL_SDK
229 @BINPATH@/components/nsURLFormatter.manifest
230 @BINPATH@/components/nsURLFormatter.js
231+#endif
232 #ifndef XP_OS2
c5cd9be2 233 @BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
96ef4151 234 #else
c5cd9be2 235 @BINPATH@/browser/components/brwsrcmp@DLL_SUFFIX@
96ef4151
JB
236 #endif
237+#ifndef LIBXUL_SDK
238 @BINPATH@/components/txEXSLTRegExFunctions.manifest
239 @BINPATH@/components/txEXSLTRegExFunctions.js
240 @BINPATH@/components/toolkitplaces.manifest
c5cd9be2 241@@ -414,7 +463,9 @@
96ef4151
JB
242 @BINPATH@/components/nsPlacesAutoComplete.manifest
243 @BINPATH@/components/nsPlacesAutoComplete.js
244 @BINPATH@/components/nsPlacesExpiration.js
245+#endif
c5cd9be2 246 @BINPATH@/browser/components/PlacesProtocolHandler.js
96ef4151
JB
247+#ifndef LIBXUL_SDK
248 @BINPATH@/components/PlacesCategoriesStarter.js
249 @BINPATH@/components/ColorAnalyzer.js
96ef4151 250 @BINPATH@/components/PageThumbsProtocol.js
c5cd9be2 251@@ -437,6 +488,7 @@
96ef4151
JB
252 @BINPATH@/components/contentSecurityPolicy.js
253 @BINPATH@/components/contentAreaDropListener.manifest
254 @BINPATH@/components/contentAreaDropListener.js
255+#endif
256 #ifdef MOZ_B2G_RIL
257 @BINPATH@/components/RadioInterfaceLayer.manifest
258 @BINPATH@/components/RadioInterfaceLayer.js
c5cd9be2
JB
259@@ -462,17 +514,24 @@
260 @BINPATH@/browser/components/SafariProfileMigrator.js
96ef4151 261 #endif
96ef4151 262 #ifdef MOZ_ENABLE_DBUS
c5cd9be2 263+#ifndef LIBXUL_SDK
96ef4151
JB
264 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
265 #endif
c5cd9be2
JB
266+#endif
267 #ifdef MOZ_ENABLE_GNOME_COMPONENT
268+#ifndef LIBXUL_SDK
269 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
270 #endif
271+#endif
272 #ifdef MOZ_ENABLE_GNOMEVFS
273 @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@
274 #endif
275 #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) || defined(MOZ_ENABLE_GNOMEVFS)
276+#ifndef LIBXUL_SDK
277 @BINPATH@/components/components.manifest
278 #endif
279+#endif
280+#ifndef LIBXUL_SDK
281 @BINPATH@/components/nsINIProcessor.manifest
96ef4151
JB
282 @BINPATH@/components/nsINIProcessor.js
283 @BINPATH@/components/nsPrompter.manifest
c5cd9be2 284@@ -488,10 +547,12 @@
96ef4151
JB
285 @BINPATH@/components/SyncComponents.manifest
286 @BINPATH@/components/Weave.js
287 #endif
96ef4151 288+#endif
c5cd9be2
JB
289 #ifdef MOZ_CAPTIVEDETECT
290 @BINPATH@/components/CaptivePortalDetectComponents.manifest
291 @BINPATH@/components/captivedetect.js
292 #endif
96ef4151 293+#ifndef LIBXUL_SDK
c5cd9be2
JB
294 @BINPATH@/components/servicesComponents.manifest
295 @BINPATH@/components/cryptoComponents.manifest
296 @BINPATH@/components/TelemetryPing.js
297@@ -532,28 +593,37 @@
96ef4151
JB
298 @BINPATH@/components/PeerConnection.js
299 @BINPATH@/components/PeerConnection.manifest
300 #endif
301+#endif
302
c5cd9be2 303+#ifndef LIBXUL_SDK
96ef4151 304 @BINPATH@/chrome/marionette@JAREXT@
c5cd9be2
JB
305 @BINPATH@/chrome/marionette.manifest
306 @BINPATH@/components/MarionetteComponents.manifest
307 @BINPATH@/components/marionettecomponent.js
308+#endif
309
310 #ifdef MOZ_WEBSPEECH
311+#ifndef LIBXUL_SDK
312 @BINPATH@/components/dom_webspeechsynth.xpt
313 #endif
314+#endif
315
96ef4151 316 ; Modules
c5cd9be2
JB
317 @BINPATH@/browser/modules/*
318+#ifndef LIBXUL_SDK
96ef4151 319 @BINPATH@/modules/*
c5cd9be2 320+#endif
96ef4151 321
96ef4151
JB
322 ; Safe Browsing
323 #ifdef MOZ_URL_CLASSIFIER
c5cd9be2 324+#ifndef LIBXUL_SDK
96ef4151 325 @BINPATH@/components/nsURLClassifier.manifest
c5cd9be2
JB
326 @BINPATH@/components/nsUrlClassifierHashCompleter.js
327 @BINPATH@/components/nsUrlClassifierListManager.js
328 @BINPATH@/components/nsUrlClassifierLib.js
329 @BINPATH@/components/url-classifier.xpt
96ef4151
JB
330 #endif
331+#endif
332
333 ; ANGLE GLES-on-D3D rendering library
334 #ifdef MOZ_ANGLE_RENDERER
c5cd9be2
JB
335@@ -570,10 +640,12 @@
336 @BINPATH@/browser/chrome/pdfjs/*
337 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
338 @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
96ef4151
JB
339+#ifndef LIBXUL_SDK
340 @BINPATH@/chrome/toolkit@JAREXT@
341 @BINPATH@/chrome/toolkit.manifest
c5cd9be2
JB
342 @BINPATH@/chrome/recording.manifest
343 @BINPATH@/chrome/recording/*
96ef4151 344+#endif
c5cd9be2
JB
345 #ifdef MOZ_GTK
346 @BINPATH@/browser/chrome/icons/default/default16.png
347 @BINPATH@/browser/chrome/icons/default/default32.png
348@@ -596,9 +668,11 @@
349 ; All the pref files must be part of base to prevent migration bugs
350 @BINPATH@/browser/@PREF_DIR@/firefox.js
351 @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
96ef4151
JB
352+#ifndef LIBXUL_SDK
353 @BINPATH@/greprefs.js
354 @BINPATH@/defaults/autoconfig/platform.js
355 @BINPATH@/defaults/autoconfig/prefcalls.js
c5cd9be2
JB
356+#endif
357 @BINPATH@/browser/defaults/profile/prefs.js
358
359 #ifndef LIBXUL_SDK
360@@ -608,7 +682,7 @@
96ef4151
JB
361 @BINPATH@/defaults/pref/channel-prefs.js
362 #else
c5cd9be2
JB
363 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
364-@BINPATH@/@PREF_DIR@/channel-prefs.js
365+@BINPATH@/browser/@PREF_DIR@/channel-prefs.js
366 #endif
96ef4151 367
c5cd9be2
JB
368 ; Services (gre) prefs
369@@ -616,11 +690,14 @@
370 @BINPATH@/defaults/pref/services-notifications.js
96ef4151 371 #endif
c5cd9be2 372 #ifdef MOZ_SERVICES_SYNC
96ef4151 373+#ifndef LIBXUL_SDK
c5cd9be2 374 @BINPATH@/defaults/pref/services-sync.js
96ef4151 375 #endif
c5cd9be2 376+#endif
96ef4151 377
c5cd9be2
JB
378 ; [Layout Engine Resources]
379 ; Style Sheets, Graphics and other Resources used by the layout engine.
96ef4151 380+#ifndef LIBXUL_SDK
c5cd9be2
JB
381 @BINPATH@/res/EditorOverride.css
382 @BINPATH@/res/contenteditable.css
383 @BINPATH@/res/designmode.css
384@@ -663,6 +740,7 @@
96ef4151
JB
385 @BINPATH@/res/svg.css
386 @BINPATH@/components/dom_svg.xpt
387 @BINPATH@/components/dom_smil.xpt
388+#endif
389
390 ; [Personal Security Manager]
391 ;
c5cd9be2
JB
392@@ -683,11 +761,13 @@
393 #endif
96ef4151 394 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
96ef4151
JB
395 #endif
396+#ifndef LIBXUL_SDK
397 @BINPATH@/chrome/pippki@JAREXT@
398 @BINPATH@/chrome/pippki.manifest
399 @BINPATH@/components/pipboot.xpt
400 @BINPATH@/components/pipnss.xpt
401 @BINPATH@/components/pippki.xpt
402+#endif
403
404 ; for Solaris SPARC
405 #ifdef SOLARIS
This page took 0.082924 seconds and 4 git commands to generate.