Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 13:43:04 -05:00
Code Issues Activity

update unity and kde patches for 107.0

Browse source
This commit is contained in:
ohfp 2022-11-16 10:56:48 +01:00
parent deddf4134d
commit 3c61a7f27e
3 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
patches/mozilla-kde.patch
View file

@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent b8fad36c438a0d20ffe73630e35c17addb4ee57d
# Parent 36f9c3a81777563ef87663a210b1cd38fdd734d9
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@ -13,7 +13,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -88,16 +88,17 @@
@@ -89,16 +89,17 @@
#include "PLDHashTable.h"
#include "plstr.h"
#include "prlink.h"
@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#ifdef MOZ_MEMORY
# include "mozmemory.h"
#endif
@@ -4823,16 +4824,27 @@ nsresult Preferences::InitInitialObjects
@@ -4849,16 +4850,27 @@ nsresult Preferences::InitInitialObjects
"unix.js"
# 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
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
@@ -4897,17 +4909,17 @@ nsresult Preferences::InitInitialObjects
@@ -4923,17 +4935,17 @@ nsresult Preferences::InitInitialObjects
}
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
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -121,16 +121,20 @@ EXPORTS.mozilla += [
@@ -123,16 +123,20 @@ EXPORTS.mozilla += [
]
EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
@ -165,7 +165,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1265,36 +1265,66 @@ nsUnknownContentTypeDialog.prototype = {
@@ -1239,36 +1239,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
@ -1283,8 +1283,8 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
#include "nsGtkUtils.h"
#include "nsIFileURL.h"
#include "nsIGIOService.h"
@@ -22,16 +23,18 @@
#include "nsMemory.h"
@@ -21,16 +22,18 @@
#include "nsArrayEnumerator.h"
#include "nsEnumeratorUtils.h"
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
@ -1302,7 +1302,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
# include "Units.h"
extern mozilla::LazyLogModule gWidgetLog;
# define LOG(args) MOZ_LOG(gWidgetLog, mozilla::LogLevel::Debug, args)
@@ -236,17 +239,19 @@ nsFilePicker::AppendFilters(int32_t aFil
@@ -235,17 +238,19 @@ nsFilePicker::AppendFilters(int32_t aFil
mAllowURLs = !!(aFilterMask & filterAllowURLs);
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@ -1323,7 +1323,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
@@ -346,16 +351,39 @@ nsresult nsFilePicker::Show(int16_t* aRe
@@ -345,16 +350,39 @@ nsresult nsFilePicker::Show(int16_t* aRe
return NS_OK;
}
@ -1363,7 +1363,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar* accept_button;
@@ -575,16 +603,244 @@ void nsFilePicker::Done(void* file_choos
@@ -574,16 +602,244 @@ void nsFilePicker::Done(void* file_choos
mCallback->Done(result);
mCallback = nullptr;
} else {
@ -1807,7 +1807,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
# include "prmem.h"
# include "plbase64.h"
@@ -2083,20 +2084,29 @@ nsLocalFile::SetPersistentDescriptor(con
@@ -2088,20 +2089,29 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP
nsLocalFile::Reveal() {
@ -1839,7 +1839,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
::CFRelease(url);
return rv;
}
@@ -2108,16 +2118,23 @@ nsLocalFile::Reveal() {
@@ -2113,16 +2123,23 @@ nsLocalFile::Reveal() {
NS_IMETHODIMP
nsLocalFile::Launch() {

40
patches/mozilla-kde_after_unity.patch
View file

@ -1,6 +1,6 @@
From 6dee561c5afeb3371295d64a957a6d919bc37c11 Mon Sep 17 00:00:00 2001
From 870d6c8f9b8086c5953300cfa7234dac3db1fcb7 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Wed, 21 Sep 2022 11:26:12 +0200
Date: Wed, 16 Nov 2022 10:54:47 +0100
Subject: [PATCH] kde
---
@ -37,10 +37,10 @@ Subject: [PATCH] kde
create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 5c4b4af67b80..8fefc56b1180 100644
index 338a54cc7c6f..178a6cdcdcc2 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -93,6 +93,7 @@
@@ -94,6 +94,7 @@
#ifdef MOZ_BACKGROUNDTASKS
# include "mozilla/BackgroundTasks.h"
#endif
@ -48,7 +48,7 @@ index 5c4b4af67b80..8fefc56b1180 100644
#ifdef DEBUG
# include <map>
@@ -4828,6 +4829,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
@@ -4854,6 +4855,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
#endif
};
@ -66,7 +66,7 @@ index 5c4b4af67b80..8fefc56b1180 100644
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
ArrayLength(specialFiles));
if (NS_FAILED(rv)) {
@@ -4902,7 +4914,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
@@ -4928,7 +4940,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
}
// Do we care if a file provided by this process fails to load?
@ -76,10 +76,10 @@ index 5c4b4af67b80..8fefc56b1180 100644
}
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
index f6e8556d4c8f..c9002ea541c9 100644
index 8ed2ca5db2d1..4f9923f28a4a 100644
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -126,6 +126,10 @@ UNIFIED_SOURCES += [
@@ -128,6 +128,10 @@ UNIFIED_SOURCES += [
"SharedPrefMap.cpp",
]
@ -129,10 +129,10 @@ index d4172e2d73ad..8bd0577bc535 100644
with Files("**"):
BUG_COMPONENT = ("Toolkit", "Downloads API")
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
index 9042007f3d57..19b133638658 100644
index 1b8a7ead51b0..fb0191b50abe 100644
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1270,26 +1270,56 @@ nsUnknownContentTypeDialog.prototype = {
@@ -1244,26 +1244,56 @@ nsUnknownContentTypeDialog.prototype = {
this.chosenApp = params.handlerApp;
}
} else if ("@mozilla.org/applicationchooser;1" in Cc) {
@ -1072,7 +1072,7 @@ index d60d1995b278..693a5a251400 100644
"/widget/headless",
]
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
index c73130496ae7..9e7b9aed56f1 100644
index 5c8a9451fc89..65cc5d2e0141 100644
--- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp
@@ -5,6 +5,7 @@
@ -1083,7 +1083,7 @@ index c73130496ae7..9e7b9aed56f1 100644
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -27,6 +28,8 @@
@@ -26,6 +27,8 @@
#include "WidgetUtilsGtk.h"
#include "nsFilePicker.h"
@ -1092,7 +1092,7 @@ index c73130496ae7..9e7b9aed56f1 100644
#undef LOG
#ifdef MOZ_LOGGING
@@ -241,7 +244,9 @@ NS_IMETHODIMP
@@ -240,7 +243,9 @@ NS_IMETHODIMP
nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) {
if (aFilter.EqualsLiteral("..apps")) {
// No platform specific thing we can do here, really....
@ -1103,7 +1103,7 @@ index c73130496ae7..9e7b9aed56f1 100644
}
nsAutoCString filter, name;
@@ -351,6 +356,29 @@ nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) {
@@ -350,6 +355,29 @@ nsFilePicker::Open(nsIFilePickerShownCallback* aCallback) {
// Can't show two dialogs concurrently with the same filepicker
if (mRunning) return NS_ERROR_NOT_AVAILABLE;
@ -1133,7 +1133,7 @@ index c73130496ae7..9e7b9aed56f1 100644
NS_ConvertUTF16toUTF8 title(mTitle);
GtkWindow* parent_widget =
@@ -580,6 +608,234 @@ void nsFilePicker::Done(void* file_chooser, gint response) {
@@ -579,6 +607,234 @@ void nsFilePicker::Done(void* file_chooser, gint response) {
NS_RELEASE_THIS();
}
@ -1465,7 +1465,7 @@ index 6f127896e334..b465ff529ce2 100644
stTablet == eBad ||
#endif
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
index 6cf78aa9bec5..dfcf9c7697af 100644
index 779b75dbc495..7accda3776c6 100644
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -71,6 +71,7 @@ LOCAL_INCLUDES += [
@ -1477,7 +1477,7 @@ index 6cf78aa9bec5..dfcf9c7697af 100644
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index 918e2b7955c0..54d6b230cf67 100644
index 321f3a1ff9e7..4483248e1dab 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -51,6 +51,7 @@
@ -1488,7 +1488,7 @@ index 918e2b7955c0..54d6b230cf67 100644
#endif
#ifdef MOZ_WIDGET_COCOA
@@ -2088,10 +2089,19 @@ nsLocalFile::Reveal() {
@@ -2093,10 +2094,19 @@ nsLocalFile::Reveal() {
}
#ifdef MOZ_WIDGET_GTK
@ -1510,7 +1510,7 @@ index 918e2b7955c0..54d6b230cf67 100644
return giovfs->RevealFile(this);
#elif defined(MOZ_WIDGET_COCOA)
CFURLRef url;
@@ -2113,6 +2123,13 @@ nsLocalFile::Launch() {
@@ -2118,6 +2128,13 @@ nsLocalFile::Launch() {
}
#ifdef MOZ_WIDGET_GTK
@ -1525,5 +1525,5 @@ index 918e2b7955c0..54d6b230cf67 100644
if (!giovfs) {
return NS_ERROR_FAILURE;
--
2.37.3
2.38.1

2
patches/unity-menubar.patch
View file

@ -4112,7 +4112,7 @@
+}
+
+void
+nsNativeMenuDocListener::NodeWillBeDestroyed(const nsINode *aNode)
+nsNativeMenuDocListener::NodeWillBeDestroyed(nsINode *aNode)
+{
+ mDocument = nullptr;
+}