# HG changeset patch # User Wolfgang Rosenauer # Date 1509950648 -3600 # Node ID 65e317e42effd6f0a2b65ba76db27af0bf09b960 # Parent 5ba9b67de55487a6bbd34443f4d7c85610208876 fixed KDE custom code and replaced obsolete types diff -r 5ba9b67de554 -r 65e317e42eff firefox-kde.patch --- a/firefox-kde.patch Sun Nov 05 08:25:41 2017 +0100 +++ b/firefox-kde.patch Mon Nov 06 07:44:08 2017 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 2de38c90f96ae846bb664f9a02ddfbcd5f662357 +# Parent 9f19902f8bcde21fa63172a85818fb11714878d8 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1421,7 +1421,7 @@ new file mode 100644 --- /dev/null +++ b/browser/components/shell/nsKDEShellService.cpp -@@ -0,0 +1,203 @@ +@@ -0,0 +1,204 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -1510,7 +1510,8 @@ + +NS_IMETHODIMP +nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, -+ PRInt32 aPosition) ++ int32_t aPosition, ++ const nsACString& aImageName) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} diff -r 5ba9b67de554 -r 65e317e42eff mozilla-kde.patch --- a/mozilla-kde.patch Sun Nov 05 08:25:41 2017 +0100 +++ b/mozilla-kde.patch Mon Nov 06 07:44:08 2017 +0100 @@ -2883,7 +2883,7 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp -@@ -0,0 +1,88 @@ +@@ -0,0 +1,87 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -2893,7 +2893,6 @@ +#include "prlink.h" +#include "prmem.h" +#include "nsString.h" -+#include "nsILocalFile.h" +#include "nsMIMEInfoUnix.h" +#include "nsAutoPtr.h" +#include "nsKDEUtils.h" @@ -2989,8 +2988,8 @@ +#include "nsTArray.h" + +class nsMIMEInfoBase; -+class nsAutoCString; -+class nsCString; ++//class nsAutoCString; ++//class nsCString; + +class nsKDERegistry +{ @@ -3354,7 +3353,7 @@ + if( mMode == modeOpen && mFilters.Length() == 1 && mFilters[ 0 ].EqualsLiteral( "..apps" )) + return kdeAppsDialog( aReturn ); + -+ nsXPIDLCString title; ++ nsCString title; + title.Adopt(ToNewUTF8String(mTitle)); + + const char* arg = NULL; @@ -3521,7 +3520,7 @@ + { + NS_ENSURE_ARG_POINTER(aReturn); + -+ nsXPIDLCString title; ++ nsCString title; + title.Adopt(ToNewUTF8String(mTitle)); + + nsTArray command;