]> git.pld-linux.org Git - packages/iceweasel.git/blame - iceweasel-packaging.patch
projects / packages / iceweasel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- drop install patch, it only causes problems on each and every update
[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
5a357718 3@@ -49,34 +49,44 @@
d8c2b732
JR		 4 #endif
5
6 [xpcom]
7+#ifndef LIBXUL_SDK
8 @BINPATH@/dependentlibs.list
9+#endif
10 #ifdef XP_WIN32
11 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
12 #endif
13+#ifndef LIBXUL_SDK
14 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
15+#endif
16 #ifdef MOZ_SHARED_MOZGLUE
17 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
18 #endif
19+#ifndef LIBXUL_SDK
20 #ifndef MOZ_STATIC_JS
21 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
22 #endif
d8c2b732 23+#endif
5a357718
JR		 24 #ifndef MOZ_NATIVE_NSPR
25 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
26 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
27 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
28 #endif
d8c2b732
JR		 29+#ifndef LIBXUL_SDK
30 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
31 #ifdef XP_MACOSX
32 @BINPATH@/XUL
33 #else
34 @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@
35 #endif
36+#endif
37 #ifdef XP_MACOSX
38 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/
39 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
40 #else
41+#ifndef LIBXUL_SDK
42 @BINPATH@/@MOZ_CHILD_PROCESS_NAME@
43 #endif
44+#endif
45 #ifdef XP_WIN32
46 #ifndef MOZ_DEBUG
47 #if MOZ_MSVC_REDIST == 1400
5a357718 48@@ -107,14 +117,18 @@
d8c2b732
JR		 49 #ifndef XP_UNIX
50 @BINPATH@/@MOZ_APP_NAME@.exe
51 #else
52+#ifndef LIBXUL_SDK
53 @BINPATH@/@MOZ_APP_NAME@-bin
54+#endif
55 @BINPATH@/@MOZ_APP_NAME@
56 #endif
57 @BINPATH@/application.ini
58 #ifdef MOZ_UPDATER
59 @BINPATH@/update-settings.ini
60 #endif
61+#ifndef LIBXUL_SDK
62 @BINPATH@/platform.ini
d8c2b732 63+#endif
5a357718
JR		 64 #ifndef XP_OS2
65 #ifndef MOZ_NATIVE_SQLITE
66 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
53fa112e
JR		 67@@ -126,13 +140,16 @@
68 @BINPATH@/blocklist.xml
d8c2b732 69 #ifdef XP_UNIX
d8c2b732
JR		 70 #ifndef XP_MACOSX
71+#ifndef LIBXUL_SDK
53fa112e 72 @BINPATH@/run-mozilla.sh
d8c2b732
JR		 73 @BINPATH@/mozilla-xremote-client
74 #endif
75 #endif
76+#endif
77
78 ; [Components]
79 @BINPATH@/components/components.manifest
80+#ifndef LIBXUL_SDK
81 @BINPATH@/components/alerts.xpt
d8c2b732
JR		 82 #ifdef ACCESSIBILITY
83 #ifdef XP_WIN32
3e529974 84@@ -144,8 +161,10 @@
d8c2b732
JR		 85 @BINPATH@/components/appstartup.xpt
86 @BINPATH@/components/autocomplete.xpt
87 @BINPATH@/components/autoconfig.xpt
88+#endif
89 @BINPATH@/components/browsercompsbase.xpt
90 @BINPATH@/components/browser-feeds.xpt
91+#ifndef LIBXUL_SDK
92 @BINPATH@/components/caps.xpt
93 @BINPATH@/components/chrome.xpt
94 @BINPATH@/components/commandhandler.xpt
5a357718 95@@ -219,7 +238,9 @@
d8c2b732
JR		 96 @BINPATH@/components/filepicker.xpt
97 #endif
98 @BINPATH@/components/find.xpt
99+#endif
100 @BINPATH@/components/fuel.xpt
101+#ifndef LIBXUL_SDK
102 @BINPATH@/components/gfx.xpt
103 @BINPATH@/components/html5.xpt
104 @BINPATH@/components/htmlparser.xpt
5a357718 105@@ -243,7 +264,9 @@
d8c2b732
JR		 106 @BINPATH@/components/layout_xul.xpt
107 @BINPATH@/components/locale.xpt
108 @BINPATH@/components/lwbrk.xpt
109+#endif
110 @BINPATH@/components/migration.xpt
111+#ifndef LIBXUL_SDK
112 @BINPATH@/components/mimetype.xpt
113 @BINPATH@/components/mozfind.xpt
114 @BINPATH@/components/necko_about.xpt
5a357718 115@@ -275,9 +298,13 @@
d8c2b732
JR		 116 @BINPATH@/components/rdf.xpt
117 @BINPATH@/components/satchel.xpt
118 @BINPATH@/components/saxparser.xpt
119+#endif
120 @BINPATH@/components/sessionstore.xpt
121+#ifndef LIBXUL_SDK
122 @BINPATH@/components/services-crypto-component.xpt
123+#endif
124 @BINPATH@/components/shellservice.xpt
125+#ifndef LIBXUL_SDK
126 @BINPATH@/components/shistory.xpt
127 @BINPATH@/components/spellchecker.xpt
128 @BINPATH@/components/storage.xpt
5a357718 129@@ -322,6 +349,7 @@
09927094 130 @BINPATH@/components/BrowserElementParent.js
d8c2b732
JR		 131 @BINPATH@/components/FeedProcessor.manifest
132 @BINPATH@/components/FeedProcessor.js
133+#endif
134 @BINPATH@/components/BrowserFeeds.manifest
135 @BINPATH@/components/FeedConverter.js
136 @BINPATH@/components/FeedWriter.js
5a357718 137@@ -340,6 +368,7 @@
d8c2b732
JR		 138 @BINPATH@/components/nsPrivateBrowsingService.manifest
139 @BINPATH@/components/nsPrivateBrowsingService.js
47c1233f 140 #endif
d8c2b732 141+#ifndef LIBXUL_SDK
5a357718
JR		 142 @BINPATH@/components/SiteSpecificUserAgent.js
143 @BINPATH@/components/SiteSpecificUserAgent.manifest
d8c2b732 144 @BINPATH@/components/toolkitsearch.manifest
5a357718 145@@ -368,31 +397,39 @@
d8c2b732
JR		 146 @BINPATH@/components/NetworkGeolocationProvider.js
147 @BINPATH@/components/GPSDGeolocationProvider.manifest
148 @BINPATH@/components/GPSDGeolocationProvider.js
149+#endif
150 @BINPATH@/components/nsSidebar.manifest
151 @BINPATH@/components/nsSidebar.js
152+#ifndef LIBXUL_SDK
153 @BINPATH@/components/extensions.manifest
154 @BINPATH@/components/addonManager.js
155 @BINPATH@/components/amContentHandler.js
156 @BINPATH@/components/amWebInstallListener.js
157 @BINPATH@/components/nsBlocklistService.js
158+#endif
159 #ifdef MOZ_UPDATER
160 @BINPATH@/components/nsUpdateService.manifest
161 @BINPATH@/components/nsUpdateService.js
162 @BINPATH@/components/nsUpdateServiceStub.js
5a357718
JR		 163 #endif
164+#ifndef LIBXUL_SDK
d8c2b732
JR		 165 @BINPATH@/components/nsUpdateTimerManager.manifest
166 @BINPATH@/components/nsUpdateTimerManager.js
d8c2b732
JR		 167 @BINPATH@/components/pluginGlue.manifest
168+#endif
169 @BINPATH@/components/nsSessionStore.manifest
170 @BINPATH@/components/nsSessionStartup.js
171 @BINPATH@/components/nsSessionStore.js
172+#ifndef LIBXUL_SDK
173 @BINPATH@/components/nsURLFormatter.manifest
174 @BINPATH@/components/nsURLFormatter.js
175+#endif
176 #ifndef XP_OS2
177 @BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
178 #else
179 @BINPATH@/components/brwsrcmp@DLL_SUFFIX@
180 #endif
181+#ifndef LIBXUL_SDK
182 @BINPATH@/components/txEXSLTRegExFunctions.manifest
183 @BINPATH@/components/txEXSLTRegExFunctions.js
184 @BINPATH@/components/toolkitplaces.manifest
5a357718 185@@ -401,10 +438,14 @@
d8c2b732
JR		 186 @BINPATH@/components/nsPlacesAutoComplete.manifest
187 @BINPATH@/components/nsPlacesAutoComplete.js
188 @BINPATH@/components/nsPlacesExpiration.js
189+#endif
190 @BINPATH@/components/PlacesProtocolHandler.js
191+#ifndef LIBXUL_SDK
192 @BINPATH@/components/PlacesCategoriesStarter.js
5a357718 193 @BINPATH@/components/ColorAnalyzer.js
d8c2b732
JR		 194+#endif
195 @BINPATH@/components/PageThumbsProtocol.js
196+#ifndef LIBXUL_SDK
197 @BINPATH@/components/nsDefaultCLH.manifest
198 @BINPATH@/components/nsDefaultCLH.js
199 @BINPATH@/components/nsContentPrefService.manifest
5a357718 200@@ -425,6 +466,7 @@
d8c2b732
JR		 201 @BINPATH@/components/contentSecurityPolicy.js
202 @BINPATH@/components/contentAreaDropListener.manifest
203 @BINPATH@/components/contentAreaDropListener.js
204+#endif
205 #ifdef MOZ_B2G_RIL
206 @BINPATH@/components/RadioInterfaceLayer.manifest
207 @BINPATH@/components/RadioInterfaceLayer.js
5a357718 208@@ -450,6 +492,7 @@
d8c2b732
JR		 209 @BINPATH@/components/SafariProfileMigrator.js
210 @BINPATH@/components/libalerts.dylib
211 #endif
212+#ifndef LIBXUL_SDK
213 #ifdef MOZ_ENABLE_DBUS
214 @BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
215 #endif
5a357718 216@@ -457,6 +500,7 @@
09927094 217 @BINPATH@/components/AitcComponents.manifest
09927094 218 @BINPATH@/components/Aitc.js
5ba965bd
JR		 219 #endif
220+#endif
221 #ifdef MOZ_DATA_REPORTING
222 @BINPATH@/components/DataReporting.manifest
223 @BINPATH@/components/DataReportingService.js
5a357718 224@@ -468,6 +512,7 @@
5ba965bd
JR		 225 #ifdef MOZ_SERVICES_HEALTHREPORT
226 @BINPATH@/components/HealthReportComponents.manifest
d8c2b732
JR		 227 #endif
228+#ifndef LIBXUL_SDK
5ba965bd
JR		 229 #ifdef MOZ_SERVICES_SYNC
230 @BINPATH@/components/SyncComponents.manifest
231 @BINPATH@/components/Weave.js
c91f2619 232@@ -488,11 +533,14 @@
5a357718
JR		 233 @BINPATH@/components/AlarmsManager.manifest
234 @BINPATH@/components/TCPSocket.js
235 @BINPATH@/components/TCPSocket.manifest
d8c2b732
JR		 236+#endif
237
c91f2619
JR		 238+#ifndef LIBXUL_SDK
239 #ifdef MOZ_WEBRTC
240 @BINPATH@/components/PeerConnection.js
241 @BINPATH@/components/PeerConnection.manifest
242 #endif
243+#endif
244
5a357718
JR		 245 #ifdef ENABLE_MARIONETTE
246 @BINPATH@/chrome/marionette@JAREXT@
7aacf613
JR		 247@@ -499,6 +545,7 @@
248 ; Modules
249 @BINPATH@/modules/*
250
251+#ifndef LIBXUL_SDK
252 ; Safe Browsing
253 #ifdef MOZ_URL_CLASSIFIER
254 @BINPATH@/components/nsURLClassifier.manifest
255@@ -512,6 +559,7 @@
256 #ifdef MOZ_ENABLE_GNOME_COMPONENT
257 @BINPATH@/components/@DLL_PREFIX@mozgnome@DLL_SUFFIX@
258 #endif
259+#endif
260
261 ; ANGLE GLES-on-D3D rendering library
262 #ifdef MOZ_ANGLE_RENDERER
263@@ -531,8 +579,10 @@
264 #ifdef SHIP_FEEDBACK
265 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
266 #endif
267+#ifndef LIBXUL_SDK
268 @BINPATH@/chrome/toolkit@JAREXT@
269 @BINPATH@/chrome/toolkit.manifest
270+#endif
271 #ifdef MOZ_GTK2
272 @BINPATH@/chrome/icons/default/default16.png
273 @BINPATH@/chrome/icons/default/default32.png
47c1233f
JR		 274@@ -560,14 +610,14 @@
275
276 ; [Default Preferences]
277 ; All the pref files must be part of base to prevent migration bugs
7aacf613 278+#ifndef LIBXUL_SDK
47c1233f
JR		 279 @BINPATH@/@PREF_DIR@/firefox.js
280 @BINPATH@/@PREF_DIR@/firefox-branding.js
7aacf613
JR		 281 @BINPATH@/greprefs.js
282 @BINPATH@/defaults/autoconfig/platform.js
283 @BINPATH@/defaults/autoconfig/prefcalls.js
47c1233f
JR		 284 @BINPATH@/defaults/profile/prefs.js
285
7aacf613
JR		 286-#ifndef LIBXUL_SDK
287 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
288 @BINPATH@/defaults/pref/channel-prefs.js
289 #else
5ba965bd
JR		 290@@ -566,15 +616,19 @@
291 #endif
292
293 ; Services (gre) prefs
294+#ifndef LIBXUL_SDK
295 #ifdef MOZ_SERVICES_AITC
296 @BINPATH@/defaults/pref/services-aitc.js
297 #endif
298+#endif
299 #ifdef MOZ_SERVICES_NOTIFICATIONS
300 @BINPATH@/defaults/pref/services-notifications.js
301 #endif
302+#ifndef LIBXUL_SDK
303 #ifdef MOZ_SERVICES_SYNC
304 @BINPATH@/defaults/pref/services-sync.js
305 #endif
306+#endif
307
308 ; [Layout Engine Resources]
309 ; Style Sheets, Graphics and other Resources used by the layout engine.
7aacf613
JR		 310@@ -573,6 +623,7 @@
311
312 ; [Layout Engine Resources]
313 ; Style Sheets, Graphics and other Resources used by the layout engine.
314+#ifndef LIBXUL_SDK
315 @BINPATH@/res/EditorOverride.css
316 @BINPATH@/res/contenteditable.css
317 @BINPATH@/res/designmode.css
318@@ -597,23 +648,28 @@
319 @BINPATH@/res/table-remove-row-hover.gif
320 @BINPATH@/res/table-remove-row.gif
321 @BINPATH@/res/grabber.gif
322+#endif
323 #ifdef XP_MACOSX
324 @BINPATH@/res/cursors/*
325 #endif
326 @BINPATH@/res/fonts/*
327 @BINPATH@/res/dtd/*
328 @BINPATH@/res/html/*
329+#ifndef LIBXUL_SDK
330 @BINPATH@/res/langGroups.properties
331 @BINPATH@/res/language.properties
332+#endif
333 @BINPATH@/res/entityTables/*
334 #ifdef XP_MACOSX
335 @BINPATH@/res/MainMenu.nib/
336 #endif
337
338 ; svg
339+#ifndef LIBXUL_SDK
340 @BINPATH@/res/svg.css
341 @BINPATH@/components/dom_svg.xpt
342 @BINPATH@/components/dom_smil.xpt
343+#endif
344
345 ; [Personal Security Manager]
346 ;
347@@ -632,11 +688,13 @@
348 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
349 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
350 #endif
351+#ifndef LIBXUL_SDK
352 @BINPATH@/chrome/pippki@JAREXT@
353 @BINPATH@/chrome/pippki.manifest
354 @BINPATH@/components/pipboot.xpt
355 @BINPATH@/components/pipnss.xpt
356 @BINPATH@/components/pippki.xpt
357+#endif
358
359 ; for Solaris SPARC
360 #ifdef SOLARIS
Iceweasel web browser
This page took 0.065254 seconds and 4 git commands to generate.