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 85e4798b74da9c377f84cf8f5dd59a7f952d92eb |
6 # Parent 86d7ace0b36abf542e56fbb702a5f9b308b9bf77 |
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 |
12 |
12 |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
13 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
14 --- a/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
15 +++ b/modules/libpref/Preferences.cpp |
16 @@ -83,16 +83,17 @@ |
16 @@ -88,16 +88,17 @@ |
17 #include "nsXPCOM.h" |
17 #include "nsXPCOM.h" |
18 #include "nsXULAppAPI.h" |
18 #include "nsXULAppAPI.h" |
19 #include "nsZipArchive.h" |
19 #include "nsZipArchive.h" |
20 #include "plbase64.h" |
20 #include "plbase64.h" |
21 #include "PLDHashTable.h" |
21 #include "PLDHashTable.h" |
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 @@ -4623,25 +4624,37 @@ Result<Ok, const char*> Preferences::Ini |
34 @@ -4542,25 +4543,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 @@ -4688,17 +4701,17 @@ Result<Ok, const char*> Preferences::Ini |
72 @@ -4606,17 +4619,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 @@ -31,16 +31,20 @@ EXPORTS.mozilla += [ |
94 @@ -110,16 +110,20 @@ EXPORTS.mozilla += [ |
95 'StaticPrefs.h', |
|
96 ] |
95 ] |
|
96 EXPORTS.mozilla += sorted(['!' + g for g in gen_h]) |
97 |
97 |
98 UNIFIED_SOURCES += [ |
98 UNIFIED_SOURCES += [ |
99 'Preferences.cpp', |
99 'Preferences.cpp', |
100 'SharedPrefMap.cpp', |
100 'SharedPrefMap.cpp', |
101 ] |
101 ] |
102 |
102 |
103 +LOCAL_INCLUDES += [ |
103 +LOCAL_INCLUDES += [ |
104 + '/toolkit/xre' |
104 + '/toolkit/xre' |
105 +] |
105 +] |
106 + |
106 + |
107 XPCOM_MANIFESTS += [ |
107 gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs) |
108 'components.conf', |
108 |
109 ] |
109 GENERATED_FILES += [gen_all_tuple] |
110 |
110 |
111 include('/ipc/chromium/chromium-config.mozbuild') |
111 static_pref_list = GENERATED_FILES[gen_all_tuple] |
112 |
112 static_pref_list.script = 'init/generate_static_pref_list.py:emit_code' |
113 FINAL_LIBRARY = 'xul' |
113 static_pref_list.inputs = ['init/StaticPrefList.yaml'] |
114 |
114 |
115 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
115 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py |
116 --- a/python/mozbuild/mozpack/chrome/flags.py |
116 --- a/python/mozbuild/mozpack/chrome/flags.py |
117 +++ b/python/mozbuild/mozpack/chrome/flags.py |
117 +++ b/python/mozbuild/mozpack/chrome/flags.py |
118 @@ -227,16 +227,17 @@ class Flags(OrderedDict): |
118 @@ -227,16 +227,17 @@ class Flags(OrderedDict): |
173 with Files('**'): |
173 with Files('**'): |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
174 BUG_COMPONENT = ('Toolkit', 'Downloads API') |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
175 diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
176 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
177 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm |
178 @@ -1204,36 +1204,66 @@ nsUnknownContentTypeDialog.prototype = { |
178 @@ -1199,36 +1199,66 @@ nsUnknownContentTypeDialog.prototype = { |
179 params.handlerApp && |
179 params.handlerApp && |
180 params.handlerApp.executable && |
180 params.handlerApp.executable && |
181 params.handlerApp.executable.isFile() |
181 params.handlerApp.executable.isFile() |
182 ) { |
182 ) { |
183 // Remember the file they chose to run. |
183 // Remember the file they chose to run. |
300 |
300 |
301 NS_IMETHODIMP |
301 NS_IMETHODIMP |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
302 nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { |
303 // dbus prevents us from being threadsafe, but this routine should not block |
303 // dbus prevents us from being threadsafe, but this routine should not block |
304 // anyhow |
304 // anyhow |
305 @@ -382,21 +385,50 @@ nsresult nsUnixSystemProxySettings::GetP |
305 @@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP |
306 return NS_OK; |
306 return NS_OK; |
307 } |
307 } |
308 |
308 |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
309 nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, |
310 const nsACString& aScheme, |
310 const nsACString& aScheme, |
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 @@ -83,17 +83,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co |
359 @@ -85,17 +85,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', |
365 'UIKitDirProvider.mm', |
365 'UIKitDirProvider.mm', |
366 ] |
366 ] |
367 elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
367 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
368 + EXPORTS += ['nsKDEUtils.h'] |
368 + EXPORTS += ['nsKDEUtils.h'] |
369 UNIFIED_SOURCES += [ |
369 UNIFIED_SOURCES += [ |
370 + 'nsKDEUtils.cpp', |
370 + 'nsKDEUtils.cpp', |
371 'nsNativeAppSupportUnix.cpp', |
371 'nsNativeAppSupportUnix.cpp', |
372 ] |
372 ] |
779 + |
779 + |
780 +#endif // nsKDEUtils |
780 +#endif // nsKDEUtils |
781 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp |
781 diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp |
782 --- a/uriloader/exthandler/HandlerServiceParent.cpp |
782 --- a/uriloader/exthandler/HandlerServiceParent.cpp |
783 +++ b/uriloader/exthandler/HandlerServiceParent.cpp |
783 +++ b/uriloader/exthandler/HandlerServiceParent.cpp |
784 @@ -1,17 +1,17 @@ |
784 @@ -7,17 +7,17 @@ |
785 #include "mozilla/ipc/ProtocolUtils.h" |
785 #include "mozilla/ipc/ProtocolUtils.h" |
786 #include "mozilla/Logging.h" |
786 #include "mozilla/Logging.h" |
787 #include "HandlerServiceParent.h" |
787 #include "HandlerServiceParent.h" |
788 #include "nsIHandlerService.h" |
788 #include "nsIHandlerService.h" |
789 #include "nsIMIMEInfo.h" |
789 #include "nsIMIMEInfo.h" |
798 using mozilla::dom::HandlerApp; |
798 using mozilla::dom::HandlerApp; |
799 using mozilla::dom::HandlerInfo; |
799 using mozilla::dom::HandlerInfo; |
800 using mozilla::dom::RemoteHandlerApp; |
800 using mozilla::dom::RemoteHandlerApp; |
801 |
801 |
802 namespace { |
802 namespace { |
803 @@ -282,17 +282,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
803 @@ -288,17 +288,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
804 mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( |
804 mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS( |
805 const nsCString& aProtocolScheme, bool* aHandlerExists) { |
805 const nsCString& aProtocolScheme, bool* aHandlerExists) { |
806 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
806 if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) { |
807 *aHandlerExists = false; |
807 *aHandlerExists = false; |
808 return IPC_OK(); |
808 return IPC_OK(); |
817 return IPC_OK(); |
817 return IPC_OK(); |
818 } |
818 } |
819 |
819 |
820 /* |
820 /* |
821 * Check if a handler exists for the provided protocol. Check the datastore |
821 * Check if a handler exists for the provided protocol. Check the datastore |
822 @@ -311,17 +311,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
822 @@ -317,17 +317,17 @@ mozilla::ipc::IPCResult HandlerServicePa |
823 nsCOMPtr<nsIExternalProtocolService> protoSvc = |
823 nsCOMPtr<nsIExternalProtocolService> protoSvc = |
824 do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); |
824 do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv); |
825 if (NS_WARN_IF(NS_FAILED(rv))) { |
825 if (NS_WARN_IF(NS_FAILED(rv))) { |
826 *aHandlerExists = false; |
826 *aHandlerExists = false; |
827 return IPC_OK(); |
827 return IPC_OK(); |
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'] |
850 |
850 |
851 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: |
851 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
852 UNIFIED_SOURCES += [ |
852 UNIFIED_SOURCES += [ |
853 + 'unix/nsCommonRegistry.cpp', |
853 + 'unix/nsCommonRegistry.cpp', |
854 'unix/nsGNOMERegistry.cpp', |
854 'unix/nsGNOMERegistry.cpp', |
855 + 'unix/nsKDERegistry.cpp', |
855 + 'unix/nsKDERegistry.cpp', |
856 'unix/nsMIMEInfoUnix.cpp', |
856 'unix/nsMIMEInfoUnix.cpp', |
875 |
875 |
876 if CONFIG['MOZ_ENABLE_DBUS']: |
876 if CONFIG['MOZ_ENABLE_DBUS']: |
877 CXXFLAGS += CONFIG['TK_CFLAGS'] |
877 CXXFLAGS += CONFIG['TK_CFLAGS'] |
878 CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] |
878 CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] |
879 |
879 |
880 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': |
880 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk': |
881 CXXFLAGS += CONFIG['TK_CFLAGS'] |
881 CXXFLAGS += CONFIG['TK_CFLAGS'] |
882 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
882 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
883 new file mode 100644 |
883 new file mode 100644 |
884 --- /dev/null |
884 --- /dev/null |
885 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
885 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |