diff -r 90e1f32cf034 -r b70ce330958c firefox-kde.patch --- a/firefox-kde.patch Sat Jun 09 09:37:05 2018 +0200 +++ b/firefox-kde.patch Sun Jun 10 16:57:31 2018 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent a01c6385626ce90528d02e5127de5c1444c07efc +# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1439,25 +1439,25 @@ diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build -@@ -21,16 +21,18 @@ XPIDL_SOURCES += [ - - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - XPIDL_SOURCES += [ - 'nsIMacShellService.idl', +@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': + ] + elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + SOURCES += [ + 'nsMacShellService.cpp', ] elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: - XPIDL_SOURCES += [ - 'nsIGNOMEShellService.idl', + SOURCES += [ + 'nsGNOMEShellService.cpp', + 'nsKDEShellService.cpp', + 'nsUnixShellService.cpp', ] - XPIDL_MODULE = 'shellservice' + if SOURCES: + FINAL_LIBRARY = 'browsercomps' - if CONFIG['OS_ARCH'] == 'WINNT': - SOURCES += [ - 'nsWindowsShellService.cpp', - ] + EXTRA_JS_MODULES += [ + 'HeadlessShell.jsm', + 'ShellService.jsm', diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp new file mode 100644 --- /dev/null @@ -1550,7 +1550,7 @@ +} + +NS_IMETHODIMP -+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, ++nsKDEShellService::SetDesktopBackground(dom::Element* aElement, + int32_t aPosition, + const nsACString& aImageName) +{ @@ -1690,8 +1690,8 @@ + nsKDEShellService() : mCheckedThisSession(false) { } + + NS_DECL_ISUPPORTS ++ NS_DECL_NSISHELLSERVICE + NS_DECL_NSIGNOMESHELLSERVICE -+ NS_DECL_NSISHELLSERVICE + + nsresult Init(); +