Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2025-01-03 03:10:07 -05:00
Code Issues Activity

update kde patches for 101

Browse source
This commit is contained in:
ohfp 2022-06-10 11:45:28 +02:00
parent c44698586f
commit 414f219628
2 changed files with 55 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
patches/mozilla-kde.patch
View file

@ -3,7 +3,7 @@
# Date 1559294891 -7200 # Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200 # Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent 8d1110b6918acc4e7d3f655d1e55f4b4ff630abe # Parent eeedc49c16aba3b50d1547315a88091a1c765904
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -13,12 +13,12 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -84,16 +84,17 @@ @@ -88,16 +88,17 @@
#include "plbase64.h"
#include "PLDHashTable.h" #include "PLDHashTable.h"
#include "plstr.h" #include "plstr.h"
#include "prlink.h" #include "prlink.h"
#include "xpcpublic.h" #include "xpcpublic.h"
#include "js/RootingAPI.h"
#ifdef MOZ_BACKGROUNDTASKS #ifdef MOZ_BACKGROUNDTASKS
# include "mozilla/BackgroundTasks.h" # include "mozilla/BackgroundTasks.h"
#endif #endif
@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#ifdef MOZ_MEMORY #ifdef MOZ_MEMORY
# include "mozmemory.h" # include "mozmemory.h"
#endif #endif
@@ -4634,16 +4635,27 @@ nsresult Preferences::InitInitialObjects @@ -4767,16 +4768,27 @@ nsresult Preferences::InitInitialObjects
"unix.js" "unix.js"
# if defined(_AIX) # if defined(_AIX)
, ,
@ -59,7 +59,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
// Load jar:$app/omni.jar!/defaults/preferences/*.js // Load jar:$app/omni.jar!/defaults/preferences/*.js
// or jar:$gre/omni.jar!/defaults/preferences/*.js. // or jar:$gre/omni.jar!/defaults/preferences/*.js.
@@ -4708,17 +4720,17 @@ nsresult Preferences::InitInitialObjects @@ -4841,17 +4853,17 @@ nsresult Preferences::InitInitialObjects
} }
nsCOMPtr<nsIFile> path = do_QueryInterface(elem); nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
--- a/modules/libpref/moz.build --- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build +++ b/modules/libpref/moz.build
@@ -118,16 +118,20 @@ EXPORTS.mozilla += [ @@ -120,16 +120,20 @@ EXPORTS.mozilla += [
] ]
EXPORTS.mozilla += sorted(["!" + g for g in gen_h]) EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
@ -828,7 +828,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
] ]
elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
@@ -126,16 +128,17 @@ include("/ipc/chromium/chromium-config.m @@ -130,16 +132,17 @@ include("/ipc/chromium/chromium-config.m
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
@ -1263,7 +1263,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build --- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build +++ b/widget/gtk/moz.build
@@ -136,16 +136,17 @@ FINAL_LIBRARY = "xul" @@ -154,16 +154,17 @@ FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
"/layout/base", "/layout/base",
@ -1277,7 +1277,7 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
"/widget/headless", "/widget/headless",
] ]
if CONFIG["MOZ_X11"]: if CONFIG["MOZ_X11"] or CONFIG["MOZ_WAYLAND"]:
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
"/widget/x11", "/widget/x11",
] ]
@ -1825,7 +1825,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
# include "prmem.h" # include "prmem.h"
# include "plbase64.h" # include "plbase64.h"
@@ -2071,62 +2072,77 @@ nsLocalFile::SetPersistentDescriptor(con @@ -2071,20 +2072,29 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Reveal() { nsLocalFile::Reveal() {
@ -1834,47 +1834,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
} }
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- if (!giovfs) {
- return NS_ERROR_FAILURE;
- }
+ nsAutoCString url; + nsAutoCString url;
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
bool isDirectory; - if (!giovfs) {
if (NS_FAILED(IsDirectory(&isDirectory))) { + url = mPath;
return NS_ERROR_FAILURE;
}
+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (isDirectory) {
- return giovfs->ShowURIForInput(mPath);
+ url = mPath;
}
if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
return NS_OK;
}
nsCOMPtr<nsIFile> parentDir;
nsAutoCString dirPath;
if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
return NS_ERROR_FAILURE;
}
if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
return NS_ERROR_FAILURE;
}
- return giovfs->ShowURIForInput(dirPath);
+ url = dirPath;
#elif defined(MOZ_WIDGET_COCOA)
CFURLRef url;
if (NS_SUCCEEDED(GetCFURL(&url))) {
nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
::CFRelease(url);
return rv;
}
return NS_ERROR_FAILURE;
#else
return NS_ERROR_FAILURE;
#endif
+ if(nsKDEUtils::kdeSupport()) { + if(nsKDEUtils::kdeSupport()) {
+ nsTArray<nsCString> command; + nsTArray<nsCString> command;
+ command.AppendElement( "REVEAL"_ns ); + command.AppendElement( "REVEAL"_ns );
@ -1883,10 +1846,18 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+ } + }
+ +
+ if (!giovfs) + if (!giovfs)
+ return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
- }
+ +
+ return giovfs->ShowURIForInput(url); return giovfs->RevealFile(this);
} #elif defined(MOZ_WIDGET_COCOA)
CFURLRef url;
if (NS_SUCCEEDED(GetCFURL(&url))) {
nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
::CFRelease(url);
return rv;
}
@@ -2096,16 +2106,23 @@ nsLocalFile::Reveal() {
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Launch() { nsLocalFile::Launch() {
@ -1901,11 +1872,12 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+ command.AppendElement( mPath ); + command.AppendElement( mPath );
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } + }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (!giovfs) { if (!giovfs) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
return giovfs->ShowURIForInput(mPath); return giovfs->LaunchFile(mPath);
#elif defined(MOZ_WIDGET_ANDROID) #elif defined(MOZ_WIDGET_ANDROID)
// Not supported on GeckoView // Not supported on GeckoView

84
patches/mozilla-kde_after_unity.patch
View file

@ -1,7 +1,7 @@
From 3c5c8813e5c3f7149ebe7c30afa8698731b72164 Mon Sep 17 00:00:00 2001 From 522af8951f5faf17862bf962f573f516aa78799b Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com> From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Wed, 4 May 2022 11:11:58 +0200 Date: Fri, 10 Jun 2022 11:44:14 +0200
Subject: [PATCH] mozilla-kde.patch 99.0 applied Subject: [PATCH] kde
--- ---
modules/libpref/Preferences.cpp | 14 +- modules/libpref/Preferences.cpp | 14 +-
@ -27,8 +27,8 @@ Subject: [PATCH] mozilla-kde.patch 99.0 applied
widget/gtk/nsFilePicker.h | 6 + widget/gtk/nsFilePicker.h | 6 +
xpcom/components/ManifestParser.cpp | 11 +- xpcom/components/ManifestParser.cpp | 11 +-
xpcom/components/moz.build | 1 + xpcom/components/moz.build | 1 +
xpcom/io/nsLocalFileUnix.cpp | 28 +- xpcom/io/nsLocalFileUnix.cpp | 21 +-
24 files changed, 1013 insertions(+), 42 deletions(-) 24 files changed, 1010 insertions(+), 38 deletions(-)
create mode 100644 toolkit/xre/nsKDEUtils.cpp create mode 100644 toolkit/xre/nsKDEUtils.cpp
create mode 100644 toolkit/xre/nsKDEUtils.h create mode 100644 toolkit/xre/nsKDEUtils.h
create mode 100644 uriloader/exthandler/unix/nsCommonRegistry.cpp create mode 100644 uriloader/exthandler/unix/nsCommonRegistry.cpp
@ -37,10 +37,10 @@ Subject: [PATCH] mozilla-kde.patch 99.0 applied
create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index fa88d4b4ec18..85a33909ceb6 100644 index 65d2b6b1252a..ad651009dbf3 100644
--- a/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -91,6 +91,7 @@ @@ -93,6 +93,7 @@
#ifdef MOZ_BACKGROUNDTASKS #ifdef MOZ_BACKGROUNDTASKS
# include "mozilla/BackgroundTasks.h" # include "mozilla/BackgroundTasks.h"
#endif #endif
@ -48,7 +48,7 @@ index fa88d4b4ec18..85a33909ceb6 100644
#ifdef DEBUG #ifdef DEBUG
# include <map> # include <map>
@@ -4666,6 +4667,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { @@ -4772,6 +4773,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
#endif #endif
}; };
@ -66,7 +66,7 @@ index fa88d4b4ec18..85a33909ceb6 100644
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
ArrayLength(specialFiles)); ArrayLength(specialFiles));
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
@@ -4740,7 +4752,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { @@ -4846,7 +4858,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
} }
// Do we care if a file provided by this process fails to load? // Do we care if a file provided by this process fails to load?
@ -76,10 +76,10 @@ index fa88d4b4ec18..85a33909ceb6 100644
} }
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index f5028fa69168..80c55c5689fc 100644 index 1f021d409c51..171d034cc03a 100644
--- a/modules/libpref/moz.build --- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build +++ b/modules/libpref/moz.build
@@ -124,6 +124,10 @@ UNIFIED_SOURCES += [ @@ -125,6 +125,10 @@ UNIFIED_SOURCES += [
"SharedPrefMap.cpp", "SharedPrefMap.cpp",
] ]
@ -129,10 +129,10 @@ index d4172e2d73ad..8bd0577bc535 100644
with Files("**"): with Files("**"):
BUG_COMPONENT = ("Toolkit", "Downloads API") BUG_COMPONENT = ("Toolkit", "Downloads API")
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
index 64de8d098907..2321f3a8eb37 100644 index e3572722f774..812133d09d92 100644
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1259,26 +1259,56 @@ nsUnknownContentTypeDialog.prototype = { @@ -1257,26 +1257,56 @@ nsUnknownContentTypeDialog.prototype = {
this.chosenApp = params.handlerApp; this.chosenApp = params.handlerApp;
} }
} else if ("@mozilla.org/applicationchooser;1" in Cc) { } else if ("@mozilla.org/applicationchooser;1" in Cc) {
@ -274,7 +274,7 @@ index f8d088054506..091ccf3d9e76 100644
auto result = MakeRefPtr<nsUnixSystemProxySettings>(); auto result = MakeRefPtr<nsUnixSystemProxySettings>();
result->Init(); result->Init();
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index c19a11dd6e0e..6243723355fc 100644 index 84af551f180c..751627fd97ce 100644
--- a/toolkit/xre/moz.build --- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build
@@ -97,7 +97,9 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": @@ -97,7 +97,9 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
@ -1068,10 +1068,10 @@ index b9e7aed3cb5c..367ad9ee2421 100644
LOG( LOG(
("Got MIMEInfo from GNOME registry without extensions; setting them " ("Got MIMEInfo from GNOME registry without extensions; setting them "
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
index 87e96e6c693a..4daae0f17de0 100644 index bf64f7ebdc65..f94b4e017e5e 100644
--- a/widget/gtk/moz.build --- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build +++ b/widget/gtk/moz.build
@@ -165,6 +165,7 @@ LOCAL_INCLUDES += [ @@ -169,6 +169,7 @@ LOCAL_INCLUDES += [
"/layout/xul", "/layout/xul",
"/other-licenses/atk-1.0", "/other-licenses/atk-1.0",
"/third_party/cups/include", "/third_party/cups/include",
@ -1080,7 +1080,7 @@ index 87e96e6c693a..4daae0f17de0 100644
"/widget/headless", "/widget/headless",
] ]
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
index 00a5caa288ff..8e436f0fc02a 100644 index c73130496ae7..9e7b9aed56f1 100644
--- a/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
@ -1485,7 +1485,7 @@ index 6cf78aa9bec5..dfcf9c7697af 100644
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index b609a0b89027..974b92f2b48f 100644 index f3f98008ed74..e2edd26b7640 100644
--- a/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
@ -1496,56 +1496,29 @@ index b609a0b89027..974b92f2b48f 100644
#endif #endif
#ifdef MOZ_WIDGET_COCOA #ifdef MOZ_WIDGET_COCOA
@@ -2076,18 +2077,16 @@ nsLocalFile::Reveal() { @@ -2076,10 +2077,19 @@ nsLocalFile::Reveal() {
} }
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); + nsAutoCString url;
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- if (!giovfs) { - if (!giovfs) {
- return NS_ERROR_FAILURE; - return NS_ERROR_FAILURE;
- } + url = mPath;
+ nsAutoCString url;
bool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory))) {
return NS_ERROR_FAILURE;
}
+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (isDirectory) {
- return giovfs->ShowURIForInput(mPath);
+ url = mPath;
}
if (NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
return NS_OK;
@@ -2101,7 +2100,7 @@ nsLocalFile::Reveal() {
return NS_ERROR_FAILURE;
}
- return giovfs->ShowURIForInput(dirPath);
+ url = dirPath;
#elif defined(MOZ_WIDGET_COCOA)
CFURLRef url;
if (NS_SUCCEEDED(GetCFURL(&url))) {
@@ -2113,6 +2112,17 @@ nsLocalFile::Reveal() {
#else
return NS_ERROR_FAILURE;
#endif
+ if(nsKDEUtils::kdeSupport()) { + if(nsKDEUtils::kdeSupport()) {
+ nsTArray<nsCString> command; + nsTArray<nsCString> command;
+ command.AppendElement( "REVEAL"_ns ); + command.AppendElement( "REVEAL"_ns );
+ command.AppendElement( mPath ); + command.AppendElement( mPath );
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } }
+ +
+ if (!giovfs) + if (!giovfs)
+ return NS_ERROR_FAILURE; + return NS_ERROR_FAILURE;
+ +
+ return giovfs->ShowURIForInput(url); return giovfs->RevealFile(this);
} #elif defined(MOZ_WIDGET_COCOA)
CFURLRef url;
NS_IMETHODIMP @@ -2101,6 +2111,13 @@ nsLocalFile::Launch() {
@@ -2122,6 +2132,12 @@ nsLocalFile::Launch() {
} }
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
@ -1555,9 +1528,10 @@ index b609a0b89027..974b92f2b48f 100644
+ command.AppendElement( mPath ); + command.AppendElement( mPath );
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } + }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (!giovfs) { if (!giovfs) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
-- --
2.36.0 2.36.1