equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 21f164ba2522a31ab9cfb4766acff17526183f8e |
2 # Parent 1e6ab61ae64f601da61197f34ad145f54a400b1f |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
38 #include "nsAutoPtr.h" |
38 #include "nsAutoPtr.h" |
39 #include "nsPrintfCString.h" |
39 #include "nsPrintfCString.h" |
40 +#include "nsKDEUtils.h" |
40 +#include "nsKDEUtils.h" |
41 |
41 |
42 #include "nsQuickSort.h" |
42 #include "nsQuickSort.h" |
43 #include "pldhash.h" |
43 #include "PLDHashTable.h" |
44 |
44 |
45 #include "prefapi.h" |
45 #include "prefapi.h" |
46 #include "prefread.h" |
46 #include "prefread.h" |
47 #include "prefapi_private_data.h" |
47 #include "prefapi_private_data.h" |
48 |
48 |
182 self.base = base |
182 self.base = base |
183 self.flags = Flags(*flags) |
183 self.flags = Flags(*flags) |
184 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
184 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build |
185 --- a/toolkit/components/downloads/moz.build |
185 --- a/toolkit/components/downloads/moz.build |
186 +++ b/toolkit/components/downloads/moz.build |
186 +++ b/toolkit/components/downloads/moz.build |
187 @@ -67,15 +67,16 @@ if not CONFIG['MOZ_SUITE']: |
187 @@ -65,15 +65,16 @@ if not CONFIG['MOZ_SUITE']: |
|
188 'nsDownloadManagerUI.js', |
|
189 'nsDownloadManagerUI.manifest', |
188 ] |
190 ] |
189 |
|
190 FAIL_ON_WARNINGS = True |
|
191 |
191 |
192 FINAL_LIBRARY = 'xul' |
192 FINAL_LIBRARY = 'xul' |
193 |
193 |
194 LOCAL_INCLUDES += [ |
194 LOCAL_INCLUDES += [ |
195 '../protobuf', |
195 '../protobuf', |
271 if (fileURL && |
271 if (fileURL && |
272 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
272 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && |
273 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
273 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn |
274 --- a/toolkit/content/jar.mn |
274 --- a/toolkit/content/jar.mn |
275 +++ b/toolkit/content/jar.mn |
275 +++ b/toolkit/content/jar.mn |
276 @@ -60,29 +60,33 @@ toolkit.jar: |
276 @@ -63,29 +63,33 @@ toolkit.jar: |
277 content/global/viewZoomOverlay.js (viewZoomOverlay.js) |
277 content/global/viewZoomOverlay.js |
278 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
278 *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) |
279 content/global/bindings/browser.xml (widgets/browser.xml) |
279 content/global/bindings/browser.xml (widgets/browser.xml) |
280 content/global/bindings/button.xml (widgets/button.xml) |
280 content/global/bindings/button.xml (widgets/button.xml) |
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
281 content/global/bindings/checkbox.xml (widgets/checkbox.xml) |
282 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
282 content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) |
2715 UNIFIED_SOURCES += [ |
2715 UNIFIED_SOURCES += [ |
2716 'android/nsAndroidHandlerApp.cpp', |
2716 'android/nsAndroidHandlerApp.cpp', |
2717 'android/nsExternalSharingAppService.cpp', |
2717 'android/nsExternalSharingAppService.cpp', |
2718 'android/nsExternalURLHandlerService.cpp', |
2718 'android/nsExternalURLHandlerService.cpp', |
2719 'android/nsMIMEInfoAndroid.cpp', |
2719 'android/nsMIMEInfoAndroid.cpp', |
2720 @@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m |
2720 @@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m |
2721 |
2721 |
2722 FINAL_LIBRARY = 'xul' |
2722 FINAL_LIBRARY = 'xul' |
2723 |
2723 |
2724 LOCAL_INCLUDES += [ |
2724 LOCAL_INCLUDES += [ |
2725 '/dom/base', |
2725 '/dom/base', |
3151 return gnomeInfo.forget(); |
3151 return gnomeInfo.forget(); |
3152 } |
3152 } |
3153 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3153 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
3154 --- a/widget/gtk/moz.build |
3154 --- a/widget/gtk/moz.build |
3155 +++ b/widget/gtk/moz.build |
3155 +++ b/widget/gtk/moz.build |
3156 @@ -80,16 +80,17 @@ else: |
3156 @@ -81,16 +81,17 @@ else: |
3157 include('/ipc/chromium/chromium-config.mozbuild') |
3157 include('/ipc/chromium/chromium-config.mozbuild') |
3158 |
3158 |
3159 FINAL_LIBRARY = 'xul' |
3159 FINAL_LIBRARY = 'xul' |
3160 |
3160 |
3161 LOCAL_INCLUDES += [ |
3161 LOCAL_INCLUDES += [ |
3659 } |
3659 } |
3660 |
3660 |
3661 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3661 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
3662 --- a/xpcom/components/moz.build |
3662 --- a/xpcom/components/moz.build |
3663 +++ b/xpcom/components/moz.build |
3663 +++ b/xpcom/components/moz.build |
3664 @@ -46,12 +46,13 @@ FINAL_LIBRARY = 'xul' |
3664 @@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul' |
3665 GENERATED_INCLUDES += ['..'] |
3665 GENERATED_INCLUDES += ['..'] |
3666 LOCAL_INCLUDES += [ |
3666 LOCAL_INCLUDES += [ |
3667 '../base', |
3667 '../base', |
3668 '../build', |
3668 '../build', |
3669 '../ds', |
3669 '../ds', |