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 86d7ace0b36abf542e56fbb702a5f9b308b9bf77 |
6 # Parent 52a515e07938d75f7c33e7b724845ce6dc315c0c |
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 |
29 #endif |
29 #endif |
30 |
30 |
31 #ifdef MOZ_MEMORY |
31 #ifdef MOZ_MEMORY |
32 # include "mozmemory.h" |
32 # include "mozmemory.h" |
33 #endif |
33 #endif |
34 @@ -4542,25 +4543,37 @@ nsresult Preferences::InitInitialObjects |
34 @@ -4543,25 +4544,37 @@ nsresult Preferences::InitInitialObjects |
35 // application pref files for backwards compatibility. |
35 // application pref files for backwards compatibility. |
36 static const char* specialFiles[] = { |
36 static const char* specialFiles[] = { |
37 #if defined(XP_MACOSX) |
37 #if defined(XP_MACOSX) |
38 "macprefs.js" |
38 "macprefs.js" |
39 #elif defined(XP_WIN) |
39 #elif defined(XP_WIN) |
67 NS_WARNING("Error parsing application default preferences."); |
67 NS_WARNING("Error parsing application default preferences."); |
68 } |
68 } |
69 |
69 |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
70 // Load jar:$app/omni.jar!/defaults/preferences/*.js |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
71 // or jar:$gre/omni.jar!/defaults/preferences/*.js. |
72 @@ -4606,17 +4619,17 @@ nsresult Preferences::InitInitialObjects |
72 @@ -4607,17 +4620,17 @@ nsresult Preferences::InitInitialObjects |
73 } |
73 } |
74 |
74 |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
75 nsCOMPtr<nsIFile> path = do_QueryInterface(elem); |
76 if (!path) { |
76 if (!path) { |
77 continue; |
77 continue; |
89 |
89 |
90 NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, |
90 NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, nullptr, |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
91 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
92 --- a/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
93 +++ b/modules/libpref/moz.build |
94 @@ -110,16 +110,20 @@ EXPORTS.mozilla += [ |
94 @@ -113,16 +113,20 @@ EXPORTS.mozilla += [ |
95 ] |
95 ] |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
97 |
97 |
98 UNIFIED_SOURCES += [ |
98 UNIFIED_SOURCES += [ |
99 'Preferences.cpp', |
99 'Preferences.cpp', |
354 return result.forget().downcast<nsISupports>(); |
354 return result.forget().downcast<nsISupports>(); |
355 } |
355 } |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
356 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
357 --- a/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
358 +++ b/toolkit/xre/moz.build |
359 @@ -85,17 +85,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
359 @@ -87,17 +87,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
360 '../components/printingui', |
360 '../components/printingui', |
361 ] |
361 ] |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
362 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit': |
363 UNIFIED_SOURCES += [ |
363 UNIFIED_SOURCES += [ |
364 'nsNativeAppSupportDefault.cpp', |
364 'nsNativeAppSupportDefault.cpp', |
839 #endif |
839 #endif |
840 return IPC_OK(); |
840 return IPC_OK(); |
841 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
841 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build |
842 --- a/uriloader/exthandler/moz.build |
842 --- a/uriloader/exthandler/moz.build |
843 +++ b/uriloader/exthandler/moz.build |
843 +++ b/uriloader/exthandler/moz.build |
844 @@ -83,17 +83,19 @@ else: |
844 @@ -85,17 +85,19 @@ else: |
845 SOURCES += [ |
845 SOURCES += [ |
846 osdir + '/nsOSHelperAppService.cpp', |
846 osdir + '/nsOSHelperAppService.cpp', |
847 ] |
847 ] |
848 if CONFIG['CC_TYPE'] in ('clang', 'gcc'): |
848 if CONFIG['CC_TYPE'] in ('clang', 'gcc'): |
849 CXXFLAGS += ['-Wno-error=shadow'] |
849 CXXFLAGS += ['-Wno-error=shadow'] |
859 UNIFIED_SOURCES += [ |
859 UNIFIED_SOURCES += [ |
860 'android/nsAndroidHandlerApp.cpp', |
860 'android/nsAndroidHandlerApp.cpp', |
861 'android/nsExternalURLHandlerService.cpp', |
861 'android/nsExternalURLHandlerService.cpp', |
862 'android/nsMIMEInfoAndroid.cpp', |
862 'android/nsMIMEInfoAndroid.cpp', |
863 ] |
863 ] |
864 @@ -133,16 +135,17 @@ include('/ipc/chromium/chromium-config.m |
864 @@ -135,16 +137,17 @@ include('/ipc/chromium/chromium-config.m |
865 FINAL_LIBRARY = 'xul' |
865 FINAL_LIBRARY = 'xul' |
866 |
866 |
867 LOCAL_INCLUDES += [ |
867 LOCAL_INCLUDES += [ |
868 '/docshell/base', |
868 '/docshell/base', |
869 '/dom/base', |
869 '/dom/base', |
1250 #else |
1250 #else |
1251 return NS_ERROR_NOT_AVAILABLE; |
1251 return NS_ERROR_NOT_AVAILABLE; |
1252 #endif |
1252 #endif |
1253 } |
1253 } |
1254 |
1254 |
1255 nsresult nsOSHelperAppService::GetFileTokenForPath( |
1255 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol( |
1256 const char16_t* platformAppPath, nsIFile** aFile) { |
1256 const nsACString& aScheme, bool* _retval) { |
1257 @@ -1136,17 +1136,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1257 @@ -1142,17 +1142,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1258 nsresult rv = |
1258 nsresult rv = |
1259 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1259 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1260 minorType, mime_types_description, true); |
1260 minorType, mime_types_description, true); |
1261 |
1261 |
1262 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1262 if (NS_FAILED(rv) || majorType.IsEmpty()) { |
1271 } |
1271 } |
1272 #endif |
1272 #endif |
1273 |
1273 |
1274 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1274 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, |
1275 minorType, mime_types_description, false); |
1275 minorType, mime_types_description, false); |
1276 @@ -1248,17 +1248,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1276 @@ -1254,17 +1254,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel |
1277 |
1277 |
1278 // Now look up our extensions |
1278 // Now look up our extensions |
1279 nsAutoString extensions, mime_types_description; |
1279 nsAutoString extensions, mime_types_description; |
1280 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1280 LookUpExtensionsAndDescription(majorType, minorType, extensions, |
1281 mime_types_description); |
1281 mime_types_description); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1293 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?"); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1294 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions)); |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1295 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1296 --- a/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1297 +++ b/widget/gtk/moz.build |
1298 @@ -126,16 +126,17 @@ include('/ipc/chromium/chromium-config.m |
1298 @@ -127,16 +127,17 @@ include('/ipc/chromium/chromium-config.m |
1299 |
1299 |
1300 FINAL_LIBRARY = 'xul' |
1300 FINAL_LIBRARY = 'xul' |
1301 |
1301 |
1302 LOCAL_INCLUDES += [ |
1302 LOCAL_INCLUDES += [ |
1303 '/layout/base', |
1303 '/layout/base', |
1812 |
1812 |
1813 if (directive->regfunc) { |
1813 if (directive->regfunc) { |
1814 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
1814 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build |
1815 --- a/xpcom/components/moz.build |
1815 --- a/xpcom/components/moz.build |
1816 +++ b/xpcom/components/moz.build |
1816 +++ b/xpcom/components/moz.build |
1817 @@ -66,16 +66,17 @@ LOCAL_INCLUDES += [ |
1817 @@ -62,16 +62,17 @@ LOCAL_INCLUDES += [ |
1818 '!..', |
1818 '!..', |
1819 '../base', |
1819 '../base', |
1820 '../build', |
1820 '../build', |
1821 '../ds', |
1821 '../ds', |
1822 '/chrome', |
1822 '/chrome', |