]> git.pld-linux.org Git - packages/iceweasel.git/blame - iceweasel-packaging.patch
- updated packaging patch
[packages/iceweasel.git] / iceweasel-packaging.patch
CommitLineData
5a357718 1--- iceweasel-17.0/mozilla/browser/installer/package-manifest.in.orig 2012-11-27 08:03:11.673587982 +0100
7aacf613 2+++ iceweasel-17.0/mozilla/browser/installer/package-manifest.in 2012-11-27 08:31:24.343528272 +0100
d5be93be
JR
3@@ -32,14 +32,18 @@
4 [@AB_CD@]
5 @BINPATH@/browser/chrome/@AB_CD@@JAREXT@
6 @BINPATH@/browser/chrome/@AB_CD@.manifest
7+#ifndef LIBXUL_SDK
8 @BINPATH@/chrome/@AB_CD@@JAREXT@
9 @BINPATH@/chrome/@AB_CD@.manifest
10+#endif
11 @BINPATH@/browser/defaults/profile/bookmarks.html
12 @BINPATH@/browser/defaults/profile/chrome/*
13 @BINPATH@/browser/defaults/profile/localstore.rdf
14 @BINPATH@/browser/defaults/profile/mimeTypes.rdf
15+#ifndef LIBXUL_SDK
16 @BINPATH@/dictionaries/*
17 @BINPATH@/hyphenation/*
18+#endif
19 @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
20 @BINPATH@/browser/searchplugins/*
21 #ifdef XP_WIN32
22@@ -51,17 +55,23 @@
d8c2b732
JR
23 #endif
24
25 [xpcom]
26+#ifndef LIBXUL_SDK
27 @BINPATH@/dependentlibs.list
28+#endif
29 #ifdef XP_WIN32
30 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
31 #endif
32+#ifndef LIBXUL_SDK
33 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
34+#endif
35 #ifdef MOZ_SHARED_MOZGLUE
36 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
37 #endif
38+#ifndef LIBXUL_SDK
39 #ifndef MOZ_STATIC_JS
40 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
41 #endif
d8c2b732 42+#endif
5a357718 43 #ifndef MOZ_NATIVE_NSPR
6b81c9be 44 #ifndef MOZ_FOLD_LIBS
5a357718 45 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
d5be93be 46@@ -69,17 +79,21 @@
5a357718
JR
47 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
48 #endif
6b81c9be 49 #endif
d8c2b732 50+#ifndef LIBXUL_SDK
d8c2b732
JR
51 #ifdef XP_MACOSX
52 @BINPATH@/XUL
53 #else
54 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
55 #endif
56+#endif
57 #ifdef XP_MACOSX
58 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
59 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
60 #else
61+#ifndef LIBXUL_SDK
62 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
63 #endif
64+#endif
65 #ifdef XP_WIN32
6b81c9be 66 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
d8c2b732 67 #ifndef MOZ_DEBUG
d5be93be 68@@ -111,14 +125,18 @@
d8c2b732
JR
69 #ifndef XP_UNIX
70 @BINPATH@/@MOZ_APP_NAME@.exe
71 #else
72+#ifndef LIBXUL_SDK
73 @BINPATH@/@MOZ_APP_NAME@-bin
74+#endif
75 @BINPATH@/@MOZ_APP_NAME@
76 #endif
77 @BINPATH@/application.ini
78 #ifdef MOZ_UPDATER
79 @BINPATH@/update-settings.ini
80 #endif
81+#ifndef LIBXUL_SDK
82 @BINPATH@/platform.ini
d8c2b732 83+#endif
5a357718
JR
84 #ifndef XP_OS2
85 #ifndef MOZ_NATIVE_SQLITE
d5be93be
JR
86 #ifndef MOZ_FOLD_LIBS
87@@ -131,13 +149,16 @@
88 @BINPATH@/browser/blocklist.xml
d8c2b732 89 #ifdef XP_UNIX
d8c2b732
JR
90 #ifndef XP_MACOSX
91+#ifndef LIBXUL_SDK
53fa112e 92 @BINPATH@/run-mozilla.sh
d8c2b732
JR
93 @BINPATH@/mozilla-xremote-client
94 #endif
95 #endif
96+#endif
97
98 ; [Components]
6b81c9be 99 @BINPATH@/browser/components/components.manifest
d8c2b732
JR
100+#ifndef LIBXUL_SDK
101 @BINPATH@/components/alerts.xpt
d8c2b732
JR
102 #ifdef ACCESSIBILITY
103 #ifdef XP_WIN32
d5be93be 104@@ -149,8 +170,10 @@
d8c2b732
JR
105 @BINPATH@/components/appstartup.xpt
106 @BINPATH@/components/autocomplete.xpt
107 @BINPATH@/components/autoconfig.xpt
108+#endif
6b81c9be
JR
109 @BINPATH@/browser/components/browsercompsbase.xpt
110 @BINPATH@/browser/components/browser-feeds.xpt
d8c2b732
JR
111+#ifndef LIBXUL_SDK
112 @BINPATH@/components/caps.xpt
113 @BINPATH@/components/chrome.xpt
114 @BINPATH@/components/commandhandler.xpt
d5be93be 115@@ -233,7 +256,9 @@
d8c2b732
JR
116 @BINPATH@/components/filepicker.xpt
117 #endif
118 @BINPATH@/components/find.xpt
119+#endif
6b81c9be 120 @BINPATH@/browser/components/fuel.xpt
d8c2b732
JR
121+#ifndef LIBXUL_SDK
122 @BINPATH@/components/gfx.xpt
123 @BINPATH@/components/html5.xpt
124 @BINPATH@/components/htmlparser.xpt
d5be93be 125@@ -256,7 +281,9 @@
d8c2b732
JR
126 @BINPATH@/components/layout_xul.xpt
127 @BINPATH@/components/locale.xpt
128 @BINPATH@/components/lwbrk.xpt
129+#endif
6b81c9be 130 @BINPATH@/browser/components/migration.xpt
d8c2b732
JR
131+#ifndef LIBXUL_SDK
132 @BINPATH@/components/mimetype.xpt
133 @BINPATH@/components/mozfind.xpt
134 @BINPATH@/components/necko_about.xpt
d5be93be 135@@ -291,12 +318,16 @@
d8c2b732
JR
136 @BINPATH@/components/rdf.xpt
137 @BINPATH@/components/satchel.xpt
138 @BINPATH@/components/saxparser.xpt
139+#endif
6b81c9be 140 @BINPATH@/browser/components/sessionstore.xpt
d8c2b732
JR
141+#ifndef LIBXUL_SDK
142 @BINPATH@/components/services-crypto-component.xpt
143+#endif
6b81c9be
JR
144 #ifdef MOZ_CAPTIVEDETECT
145 @BINPATH@/components/captivedetect.xpt
146 #endif
147 @BINPATH@/browser/components/shellservice.xpt
d8c2b732
JR
148+#ifndef LIBXUL_SDK
149 @BINPATH@/components/shistory.xpt
150 @BINPATH@/components/spellchecker.xpt
151 @BINPATH@/components/storage.xpt
d5be93be 152@@ -341,6 +372,7 @@
09927094 153 @BINPATH@/components/BrowserElementParent.js
d8c2b732
JR
154 @BINPATH@/components/FeedProcessor.manifest
155 @BINPATH@/components/FeedProcessor.js
156+#endif
6b81c9be
JR
157 @BINPATH@/browser/components/BrowserFeeds.manifest
158 @BINPATH@/browser/components/FeedConverter.js
159 @BINPATH@/browser/components/FeedWriter.js
d5be93be
JR
160@@ -356,6 +388,7 @@
161 @BINPATH@/browser/components/DownloadsStartup.js
6b81c9be
JR
162 @BINPATH@/browser/components/DownloadsUI.js
163 @BINPATH@/browser/components/BrowserPlaces.manifest
d8c2b732 164+#ifndef LIBXUL_SDK
d5be93be 165 @BINPATH@/components/BrowserPageThumbs.manifest
5a357718
JR
166 @BINPATH@/components/SiteSpecificUserAgent.js
167 @BINPATH@/components/SiteSpecificUserAgent.manifest
d5be93be 168@@ -383,31 +416,39 @@
d8c2b732
JR
169 @BINPATH@/components/NetworkGeolocationProvider.js
170 @BINPATH@/components/GPSDGeolocationProvider.manifest
171 @BINPATH@/components/GPSDGeolocationProvider.js
172+#endif
6b81c9be
JR
173 @BINPATH@/browser/components/nsSidebar.manifest
174 @BINPATH@/browser/components/nsSidebar.js
d8c2b732
JR
175+#ifndef LIBXUL_SDK
176 @BINPATH@/components/extensions.manifest
177 @BINPATH@/components/addonManager.js
178 @BINPATH@/components/amContentHandler.js
179 @BINPATH@/components/amWebInstallListener.js
180 @BINPATH@/components/nsBlocklistService.js
181+#endif
182 #ifdef MOZ_UPDATER
183 @BINPATH@/components/nsUpdateService.manifest
184 @BINPATH@/components/nsUpdateService.js
185 @BINPATH@/components/nsUpdateServiceStub.js
5a357718
JR
186 #endif
187+#ifndef LIBXUL_SDK
d8c2b732
JR
188 @BINPATH@/components/nsUpdateTimerManager.manifest
189 @BINPATH@/components/nsUpdateTimerManager.js
d8c2b732
JR
190 @BINPATH@/components/pluginGlue.manifest
191+#endif
6b81c9be
JR
192 @BINPATH@/browser/components/nsSessionStore.manifest
193 @BINPATH@/browser/components/nsSessionStartup.js
194 @BINPATH@/browser/components/nsSessionStore.js
d8c2b732
JR
195+#ifndef LIBXUL_SDK
196 @BINPATH@/components/nsURLFormatter.manifest
197 @BINPATH@/components/nsURLFormatter.js
198+#endif
199 #ifndef XP_OS2
6b81c9be 200 @BINPATH@/browser/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
d8c2b732 201 #else
6b81c9be 202 @BINPATH@/browser/components/brwsrcmp@DLL_SUFFIX@
d8c2b732
JR
203 #endif
204+#ifndef LIBXUL_SDK
205 @BINPATH@/components/txEXSLTRegExFunctions.manifest
206 @BINPATH@/components/txEXSLTRegExFunctions.js
207 @BINPATH@/components/toolkitplaces.manifest
d5be93be 208@@ -416,9 +457,13 @@
d8c2b732
JR
209 @BINPATH@/components/nsPlacesAutoComplete.manifest
210 @BINPATH@/components/nsPlacesAutoComplete.js
211 @BINPATH@/components/nsPlacesExpiration.js
212+#endif
6b81c9be 213 @BINPATH@/browser/components/PlacesProtocolHandler.js
d8c2b732
JR
214+#ifndef LIBXUL_SDK
215 @BINPATH@/components/PlacesCategoriesStarter.js
5a357718 216 @BINPATH@/components/ColorAnalyzer.js
d8c2b732 217+#endif
d8c2b732 218+#ifndef LIBXUL_SDK
d5be93be 219 @BINPATH@/components/PageThumbsProtocol.js
d8c2b732
JR
220 @BINPATH@/components/nsDefaultCLH.manifest
221 @BINPATH@/components/nsDefaultCLH.js
d5be93be 222@@ -438,6 +483,7 @@
d8c2b732
JR
223 @BINPATH@/components/contentSecurityPolicy.js
224 @BINPATH@/components/contentAreaDropListener.manifest
225 @BINPATH@/components/contentAreaDropListener.js
226+#endif
227 #ifdef MOZ_B2G_RIL
228 @BINPATH@/components/RadioInterfaceLayer.manifest
229 @BINPATH@/components/RadioInterfaceLayer.js
d5be93be
JR
230@@ -462,6 +508,7 @@
231 #ifdef XP_MACOSX
232 @BINPATH@/browser/components/SafariProfileMigrator.js
d8c2b732
JR
233 #endif
234+#ifndef LIBXUL_SDK
235 #ifdef MOZ_ENABLE_DBUS
236 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
237 #endif
d5be93be 238@@ -478,6 +525,8 @@
6b81c9be
JR
239 @BINPATH@/components/nsINIProcessor.js
240 @BINPATH@/components/nsPrompter.manifest
241 @BINPATH@/components/nsPrompter.js
5ba965bd 242+#endif
d5be93be 243+#ifndef LIBXUL_SDK
5ba965bd
JR
244 #ifdef MOZ_DATA_REPORTING
245 @BINPATH@/components/DataReporting.manifest
246 @BINPATH@/components/DataReportingService.js
d5be93be 247@@ -524,7 +573,9 @@
5a357718 248 @BINPATH@/components/TCPSocket.js
d5be93be 249 @BINPATH@/components/TCPSocketParentIntermediary.js
5a357718 250 @BINPATH@/components/TCPSocket.manifest
d8c2b732
JR
251+#endif
252
d5be93be 253+#ifndef LIBXUL_SDK
6b81c9be
JR
254 @BINPATH@/components/AppProtocolHandler.js
255 @BINPATH@/components/AppProtocolHandler.manifest
256
d5be93be 257@@ -532,6 +583,7 @@
c91f2619
JR
258 @BINPATH@/components/PeerConnection.js
259 @BINPATH@/components/PeerConnection.manifest
260 #endif
261+#endif
262
5a357718
JR
263 #ifdef ENABLE_MARIONETTE
264 @BINPATH@/chrome/marionette@JAREXT@
d5be93be
JR
265@@ -542,6 +594,7 @@
266
7aacf613 267 ; Modules
d5be93be
JR
268 @BINPATH@/browser/modules/*
269+#ifndef LIBXUL_SDK
7aacf613
JR
270 @BINPATH@/modules/*
271
7aacf613 272 ; Safe Browsing
d5be93be
JR
273@@ -559,6 +612,7 @@
274 @BINPATH@/libGLESv2.dll
275 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
7aacf613
JR
276 #endif
277+#endif
278
d5be93be
JR
279 ; [Browser Chrome Files]
280 @BINPATH@/browser/chrome.manifest
281@@ -571,10 +625,12 @@
7aacf613 282 #ifdef SHIP_FEEDBACK
6b81c9be 283 @BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi
7aacf613
JR
284 #endif
285+#ifndef LIBXUL_SDK
286 @BINPATH@/chrome/toolkit@JAREXT@
287 @BINPATH@/chrome/toolkit.manifest
6b81c9be
JR
288 @BINPATH@/chrome/recording.manifest
289 @BINPATH@/chrome/recording/*
d5be93be 290+#endif
7aacf613 291 #ifdef MOZ_GTK2
d5be93be
JR
292 @BINPATH@/browser/chrome/icons/default/default16.png
293 @BINPATH@/browser/chrome/icons/default/default32.png
294@@ -595,31 +651,36 @@
47c1233f 295 ; All the pref files must be part of base to prevent migration bugs
6b81c9be
JR
296 @BINPATH@/browser/@PREF_DIR@/firefox.js
297 @BINPATH@/browser/@PREF_DIR@/firefox-branding.js
d5be93be 298+#ifndef LIBXUL_SDK
7aacf613
JR
299 @BINPATH@/greprefs.js
300 @BINPATH@/defaults/autoconfig/platform.js
301 @BINPATH@/defaults/autoconfig/prefcalls.js
d5be93be 302+#endif
6b81c9be 303 @BINPATH@/browser/defaults/profile/prefs.js
47c1233f 304
d5be93be 305 #ifndef LIBXUL_SDK
7aacf613 306 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
6b81c9be
JR
307 ; Technically this is an app pref file, but we are keeping it in the original
308 ; gre location for now.
d5be93be
JR
309 @BINPATH@/defaults/pref/channel-prefs.js
310 #else
311 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
312-@BINPATH@/@PREF_DIR@/channel-prefs.js
313+@BINPATH@/browser/@PREF_DIR@/channel-prefs.js
314 #endif
315
316 ; Services (gre) prefs
5ba965bd
JR
317 #ifdef MOZ_SERVICES_NOTIFICATIONS
318 @BINPATH@/defaults/pref/services-notifications.js
319 #endif
320+#ifndef LIBXUL_SDK
321 #ifdef MOZ_SERVICES_SYNC
322 @BINPATH@/defaults/pref/services-sync.js
323 #endif
324+#endif
325
7aacf613
JR
326 ; [Layout Engine Resources]
327 ; Style Sheets, Graphics and other Resources used by the layout engine.
328+#ifndef LIBXUL_SDK
329 @BINPATH@/res/EditorOverride.css
330 @BINPATH@/res/contenteditable.css
331 @BINPATH@/res/designmode.css
d5be93be 332@@ -646,23 +705,28 @@
7aacf613
JR
333 @BINPATH@/res/table-remove-row-hover.gif
334 @BINPATH@/res/table-remove-row.gif
335 @BINPATH@/res/grabber.gif
336+#endif
337 #ifdef XP_MACOSX
338 @BINPATH@/res/cursors/*
339 #endif
d5be93be 340+#ifndef LIBXUL_SDK
7aacf613
JR
341 @BINPATH@/res/fonts/*
342 @BINPATH@/res/dtd/*
343 @BINPATH@/res/html/*
7aacf613
JR
344 @BINPATH@/res/langGroups.properties
345 @BINPATH@/res/language.properties
7aacf613 346 @BINPATH@/res/entityTables/*
d5be93be 347+#endif
7aacf613
JR
348 #ifdef XP_MACOSX
349 @BINPATH@/res/MainMenu.nib/
350 #endif
351
352 ; svg
353+#ifndef LIBXUL_SDK
354 @BINPATH@/res/svg.css
355 @BINPATH@/components/dom_svg.xpt
356 @BINPATH@/components/dom_smil.xpt
357+#endif
358
359 ; [Personal Security Manager]
360 ;
d5be93be
JR
361@@ -683,11 +747,13 @@
362 #endif
7aacf613 363 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
7aacf613
JR
364 #endif
365+#ifndef LIBXUL_SDK
366 @BINPATH@/chrome/pippki@JAREXT@
367 @BINPATH@/chrome/pippki.manifest
368 @BINPATH@/components/pipboot.xpt
369 @BINPATH@/components/pipnss.xpt
370 @BINPATH@/components/pippki.xpt
371+#endif
372
373 ; for Solaris SPARC
374 #ifdef SOLARIS
This page took 0.082954 seconds and 4 git commands to generate.