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 unity-menubar.patch and mozilla-kde_after_unity.patch for 100.0

Browse source
This commit is contained in:
ohfp 2022-05-04 11:13:41 +02:00
parent 2d69e783c6
commit c63b95219b
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
patches/mozilla-kde_after_unity.patch
View file

@ -1,7 +1,7 @@
From 4a2ac00d3054fb51979482ead83f292d9b9c5f3b Mon Sep 17 00:00:00 2001 From 3c5c8813e5c3f7149ebe7c30afa8698731b72164 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com> From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 8 Apr 2022 21:57:51 +0200 Date: Wed, 4 May 2022 11:11:58 +0200
Subject: [PATCH] kde Subject: [PATCH] mozilla-kde.patch 99.0 applied
--- ---
modules/libpref/Preferences.cpp | 14 +- modules/libpref/Preferences.cpp | 14 +-
@ -37,7 +37,7 @@ Subject: [PATCH] kde
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 40d6f89e56..79bfe40fb9 100644 index fa88d4b4ec18..85a33909ceb6 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 @@ @@ -91,6 +91,7 @@
@ -48,7 +48,7 @@ index 40d6f89e56..79bfe40fb9 100644
#ifdef DEBUG #ifdef DEBUG
# include <map> # include <map>
@@ -4671,6 +4672,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { @@ -4666,6 +4667,17 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
#endif #endif
}; };
@ -66,7 +66,7 @@ index 40d6f89e56..79bfe40fb9 100644
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
ArrayLength(specialFiles)); ArrayLength(specialFiles));
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
@@ -4745,7 +4757,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { @@ -4740,7 +4752,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,7 +76,7 @@ index 40d6f89e56..79bfe40fb9 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 f5028fa691..80c55c5689 100644 index f5028fa69168..80c55c5689fc 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 += [ @@ -124,6 +124,10 @@ UNIFIED_SOURCES += [
@ -91,7 +91,7 @@ index f5028fa691..80c55c5689 100644
GeneratedFile( GeneratedFile(
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
index 7d6d7e0c7f..724c527b4c 100644 index 7d6d7e0c7fde..724c527b4ca8 100644
--- a/python/mozbuild/mozpack/chrome/flags.py --- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py +++ b/python/mozbuild/mozpack/chrome/flags.py
@@ -234,6 +234,7 @@ class Flags(OrderedDict): @@ -234,6 +234,7 @@ class Flags(OrderedDict):
@ -103,7 +103,7 @@ index 7d6d7e0c7f..724c527b4c 100644
RE = re.compile(r"([!<>=]+)") RE = re.compile(r"([!<>=]+)")
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
index a733685f95..f64b17fb7b 100644 index a733685f95a3..f64b17fb7b17 100644
--- a/python/mozbuild/mozpack/chrome/manifest.py --- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/python/mozbuild/mozpack/chrome/manifest.py +++ b/python/mozbuild/mozpack/chrome/manifest.py
@@ -44,6 +44,7 @@ class ManifestEntry(object): @@ -44,6 +44,7 @@ class ManifestEntry(object):
@ -115,7 +115,7 @@ index a733685f95..f64b17fb7b 100644
def __init__(self, base, *flags): def __init__(self, base, *flags):
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
index d4172e2d73..8bd0577bc5 100644 index d4172e2d73ad..8bd0577bc535 100644
--- a/toolkit/components/downloads/moz.build --- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build
@@ -51,5 +51,9 @@ if CONFIG["MOZ_PLACES"]: @@ -51,5 +51,9 @@ if CONFIG["MOZ_PLACES"]:
@ -129,7 +129,7 @@ index d4172e2d73..8bd0577bc5 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 64de8d0989..2321f3a8eb 100644 index 64de8d098907..2321f3a8eb37 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 = { @@ -1259,26 +1259,56 @@ nsUnknownContentTypeDialog.prototype = {
@ -210,7 +210,7 @@ index 64de8d0989..2321f3a8eb 100644
var nsIFilePicker = Ci.nsIFilePicker; var nsIFilePicker = Ci.nsIFilePicker;
var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
index f8d0880545..091ccf3d9e 100644 index f8d088054506..091ccf3d9e76 100644
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
@ -274,7 +274,7 @@ index f8d0880545..091ccf3d9e 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 c19a11dd6e..6243723355 100644 index c19a11dd6e0e..6243723355fc 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":
@ -289,7 +289,7 @@ index c19a11dd6e..6243723355 100644
CXXFLAGS += CONFIG["MOZ_X11_SM_CFLAGS"] CXXFLAGS += CONFIG["MOZ_X11_SM_CFLAGS"]
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644 new file mode 100644
index 0000000000..7a6edf0770 index 000000000000..7a6edf07703a
--- /dev/null --- /dev/null
+++ b/toolkit/xre/nsKDEUtils.cpp +++ b/toolkit/xre/nsKDEUtils.cpp
@@ -0,0 +1,321 @@ @@ -0,0 +1,321 @@
@ -616,7 +616,7 @@ index 0000000000..7a6edf0770
+ } + }
diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h diff --git a/toolkit/xre/nsKDEUtils.h b/toolkit/xre/nsKDEUtils.h
new file mode 100644 new file mode 100644
index 0000000000..c9c1284e29 index 000000000000..c9c1284e294a
--- /dev/null --- /dev/null
+++ b/toolkit/xre/nsKDEUtils.h +++ b/toolkit/xre/nsKDEUtils.h
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
@ -669,7 +669,7 @@ index 0000000000..c9c1284e29
+ +
+#endif // nsKDEUtils +#endif // nsKDEUtils
diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
index 0796c7428b..4f21c058f8 100644 index 0796c7428b18..4f21c058f8e8 100644
--- a/uriloader/exthandler/HandlerServiceParent.cpp --- a/uriloader/exthandler/HandlerServiceParent.cpp
+++ b/uriloader/exthandler/HandlerServiceParent.cpp +++ b/uriloader/exthandler/HandlerServiceParent.cpp
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
@ -700,7 +700,7 @@ index 0796c7428b..4f21c058f8 100644
*aHandlerExists = false; *aHandlerExists = false;
} }
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
index 92647a9b34..fc5068cd20 100644 index 92647a9b3478..fc5068cd2069 100644
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build
@@ -83,7 +83,9 @@ else: @@ -83,7 +83,9 @@ else:
@ -723,7 +723,7 @@ index 92647a9b34..fc5068cd20 100644
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644 new file mode 100644
index 0000000000..630ab6147d index 000000000000..630ab6147db3
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
@@ -0,0 +1,53 @@ @@ -0,0 +1,53 @@
@ -782,7 +782,7 @@ index 0000000000..630ab6147d
+} +}
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
new file mode 100644 new file mode 100644
index 0000000000..85b3d9cee2 index 000000000000..85b3d9cee25e
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsCommonRegistry.h +++ b/uriloader/exthandler/unix/nsCommonRegistry.h
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
@ -816,7 +816,7 @@ index 0000000000..85b3d9cee2
+#endif +#endif
diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
new file mode 100644 new file mode 100644
index 0000000000..f78e64c7e9 index 000000000000..f78e64c7e9a3
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.cpp +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
@ -911,7 +911,7 @@ index 0000000000..f78e64c7e9
+} +}
diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
new file mode 100644 new file mode 100644
index 0000000000..5b07eebc6d index 000000000000..5b07eebc6d62
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.h +++ b/uriloader/exthandler/unix/nsKDERegistry.h
@@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
@ -950,7 +950,7 @@ index 0000000000..5b07eebc6d
+ +
+#endif //nsKDERegistry_h__ +#endif //nsKDERegistry_h__
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
index 7cbefcce3e..84083348c8 100644 index 7cbefcce3e94..84083348c8f1 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -5,16 +5,19 @@ @@ -5,16 +5,19 @@
@ -1019,7 +1019,7 @@ index 7cbefcce3e..84083348c8 100644
if (!giovfs) { if (!giovfs) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
index b9e7aed3cb..367ad9ee24 100644 index b9e7aed3cb5c..367ad9ee2421 100644
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -1068,7 +1068,7 @@ index b9e7aed3cb..367ad9ee24 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 87e96e6c69..4daae0f17d 100644 index 87e96e6c693a..4daae0f17de0 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 += [ @@ -165,6 +165,7 @@ LOCAL_INCLUDES += [
@ -1080,7 +1080,7 @@ index 87e96e6c69..4daae0f17d 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 00a5caa288..8e436f0fc0 100644 index 00a5caa288ff..8e436f0fc02a 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 @@
@ -1377,7 +1377,7 @@ index 00a5caa288..8e436f0fc0 100644
void* nsFilePicker::GtkFileChooserNew(const gchar* title, GtkWindow* parent, void* nsFilePicker::GtkFileChooserNew(const gchar* title, GtkWindow* parent,
GtkFileChooserAction action, GtkFileChooserAction action,
diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
index 9b3110aa00..be9d559c7b 100644 index 9b3110aa0048..be9d559c7bf4 100644
--- a/widget/gtk/nsFilePicker.h --- a/widget/gtk/nsFilePicker.h
+++ b/widget/gtk/nsFilePicker.h +++ b/widget/gtk/nsFilePicker.h
@@ -72,6 +72,12 @@ class nsFilePicker : public nsBaseFilePicker { @@ -72,6 +72,12 @@ class nsFilePicker : public nsBaseFilePicker {
@ -1394,7 +1394,7 @@ index 9b3110aa00..be9d559c7b 100644
GtkFileChooserAction action, GtkFileChooserAction action,
const gchar* accept_label); const gchar* accept_label);
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index f3d0055f2c..d13543ab52 100644 index f3d0055f2cc6..d13543ab5221 100644
--- a/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
@ -1473,7 +1473,7 @@ index f3d0055f2c..d13543ab52 100644
stTablet == eBad || stTablet == eBad ||
#endif #endif
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
index 6cf78aa9be..dfcf9c7697 100644 index 6cf78aa9bec5..dfcf9c7697af 100644
--- a/xpcom/components/moz.build --- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build +++ b/xpcom/components/moz.build
@@ -71,6 +71,7 @@ LOCAL_INCLUDES += [ @@ -71,6 +71,7 @@ LOCAL_INCLUDES += [
@ -1485,7 +1485,7 @@ index 6cf78aa9be..dfcf9c7697 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 b609a0b890..974b92f2b4 100644 index b609a0b89027..974b92f2b48f 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 @@
@ -1559,5 +1559,5 @@ index b609a0b890..974b92f2b4 100644
if (!giovfs) { if (!giovfs) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
-- --
2.35.1 2.36.0

4
patches/unity-menubar.patch
View file

@ -3026,6 +3026,7 @@
+#include "mozilla/Preferences.h" +#include "mozilla/Preferences.h"
+#include "mozilla/PresShell.h" +#include "mozilla/PresShell.h"
+#include "mozilla/PresShellInlines.h" +#include "mozilla/PresShellInlines.h"
+#include "mozilla/GRefPtr.h"
+#include "nsAttrValue.h" +#include "nsAttrValue.h"
+#include "nsComputedDOMStyle.h" +#include "nsComputedDOMStyle.h"
+#include "nsContentUtils.h" +#include "nsContentUtils.h"
@ -3166,12 +3167,11 @@
+ return; + return;
+ } + }
+ +
+ GdkPixbuf *pixbuf = nsImageToPixbuf::ImageToPixbuf(img); + RefPtr<GdkPixbuf> pixbuf = nsImageToPixbuf::ImageToPixbuf(img);
+ if (pixbuf) { + if (pixbuf) {
+ dbusmenu_menuitem_property_set_image(mOwner->GetNativeData(), + dbusmenu_menuitem_property_set_image(mOwner->GetNativeData(),
+ DBUSMENU_MENUITEM_PROP_ICON_DATA, + DBUSMENU_MENUITEM_PROP_ICON_DATA,
+ pixbuf); + pixbuf);
+ g_object_unref(pixbuf);
+ } + }
+ +
+ return; + return;