equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User msirringhaus@suse.de |
2 # User msirringhaus@suse.de |
3 # Date 1559294891 -7200 |
3 # Date 1559294891 -7200 |
4 # Fri May 31 11:28:11 2019 +0200 |
4 # Fri May 31 11:28:11 2019 +0200 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
5 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 |
6 # Parent d065e5213c971b1f80d4a13458c412a3a25f7c1c |
6 # Parent 9db1669be16001a48b62d147070fb75f60bac251 |
7 Description: Add KDE integration to Firefox (toolkit parts) |
7 Description: Add KDE integration to Firefox (toolkit parts) |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
8 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
9 Author: Lubos Lunak <lunak@suse.com> |
9 Author: Lubos Lunak <lunak@suse.com> |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
10 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
11 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
79 |
79 |
80 if (aIsStartup) { |
80 if (aIsStartup) { |
81 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
81 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
82 --- a/modules/libpref/moz.build |
82 --- a/modules/libpref/moz.build |
83 +++ b/modules/libpref/moz.build |
83 +++ b/modules/libpref/moz.build |
84 @@ -118,16 +118,20 @@ EXPORTS.mozilla += [ |
84 @@ -119,16 +119,20 @@ EXPORTS.mozilla += [ |
85 ] |
85 ] |
86 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
86 EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) |
87 |
87 |
88 UNIFIED_SOURCES += [ |
88 UNIFIED_SOURCES += [ |
89 "Preferences.cpp", |
89 "Preferences.cpp", |
806 #endif |
806 #endif |
807 return IPC_OK(); |
807 return IPC_OK(); |
808 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
808 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
809 --- a/uriloader/exthandler/moz.build |
809 --- a/uriloader/exthandler/moz.build |
810 +++ b/uriloader/exthandler/moz.build |
810 +++ b/uriloader/exthandler/moz.build |
811 @@ -80,17 +80,19 @@ else: |
811 @@ -78,17 +78,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "ui |
|
812 else: |
|
813 # These files can't be built in unified mode because they redefine LOG. |
812 SOURCES += [ |
814 SOURCES += [ |
813 osdir + "/nsOSHelperAppService.cpp", |
815 osdir + "/nsOSHelperAppService.cpp", |
814 ] |
816 ] |
815 if CONFIG["CC_TYPE"] in ("clang", "gcc"): |
|
816 CXXFLAGS += ["-Wno-error=shadow"] |
|
817 |
817 |
818 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
818 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": |
819 UNIFIED_SOURCES += [ |
819 UNIFIED_SOURCES += [ |
820 + "unix/nsCommonRegistry.cpp", |
820 + "unix/nsCommonRegistry.cpp", |
821 "unix/nsGNOMERegistry.cpp", |
821 "unix/nsGNOMERegistry.cpp", |
826 UNIFIED_SOURCES += [ |
826 UNIFIED_SOURCES += [ |
827 "android/nsMIMEInfoAndroid.cpp", |
827 "android/nsMIMEInfoAndroid.cpp", |
828 ] |
828 ] |
829 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": |
829 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": |
830 UNIFIED_SOURCES += [ |
830 UNIFIED_SOURCES += [ |
831 @@ -128,16 +130,17 @@ include("/ipc/chromium/chromium-config.m |
831 @@ -126,16 +128,17 @@ include("/ipc/chromium/chromium-config.m |
832 FINAL_LIBRARY = "xul" |
832 FINAL_LIBRARY = "xul" |
833 |
833 |
834 LOCAL_INCLUDES += [ |
834 LOCAL_INCLUDES += [ |
835 "/docshell/base", |
835 "/docshell/base", |
836 "/dom/base", |
836 "/dom/base", |
1258 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1258 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1259 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1259 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1260 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1260 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1261 --- a/widget/gtk/moz.build |
1261 --- a/widget/gtk/moz.build |
1262 +++ b/widget/gtk/moz.build |
1262 +++ b/widget/gtk/moz.build |
1263 @@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul" |
1263 @@ -135,16 +135,17 @@ FINAL_LIBRARY = "xul" |
1264 |
1264 |
1265 LOCAL_INCLUDES += [ |
1265 LOCAL_INCLUDES += [ |
1266 "/layout/base", |
1266 "/layout/base", |
1267 "/layout/forms", |
1267 "/layout/forms", |
1268 "/layout/generic", |
1268 "/layout/generic", |