From aa36cf4c9ff81e4b8b17f3d846d46cda1094c7e8 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Thu, 31 Oct 2024 09:20:11 +0100 Subject: [PATCH] fix failed patches for 132.0-1 --- patches/dbus_name.patch | 24 ++++++++++------- .../ui-patches/allow_cookies_for_site.patch | 27 ++++++++++++------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/patches/dbus_name.patch b/patches/dbus_name.patch index c956a6b..72e5c2d 100644 --- a/patches/dbus_name.patch +++ b/patches/dbus_name.patch @@ -1,6 +1,8 @@ +diff --git a/toolkit/components/remote/nsDBusRemoteClient.cpp b/toolkit/components/remote/nsDBusRemoteClient.cpp +index aad9d7054af8..a926d8b6abdc 100644 --- a/toolkit/components/remote/nsDBusRemoteClient.cpp +++ b/toolkit/components/remote/nsDBusRemoteClient.cpp -@@ -73,7 +73,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram, +@@ -76,7 +76,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram, mozilla::XREAppData::SanitizeNameForDBus(profileName); aDestinationName = @@ -9,7 +11,7 @@ if (aDestinationName.Length() > DBUS_MAXIMUM_NAME_LENGTH) aDestinationName.Truncate(DBUS_MAXIMUM_NAME_LENGTH); -@@ -87,7 +87,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram, +@@ -90,7 +90,7 @@ bool nsDBusRemoteClient::GetRemoteDestinationName(const char* aProgram, if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) { // We don't have a valid busName yet - try to create a default one. aDestinationName = @@ -18,7 +20,7 @@ if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) { // We failed completelly to get a valid bus name - just quit // to prevent crash at dbus_bus_request_name(). -@@ -115,7 +115,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram, +@@ -117,7 +117,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProfile, } nsAutoCString pathName; @@ -27,7 +29,7 @@ static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym( RTLD_DEFAULT, "dbus_validate_path"); -@@ -126,7 +126,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProgram, +@@ -128,7 +128,7 @@ nsresult nsDBusRemoteClient::DoSendDBusCommandLine(const char* aProfile, } nsAutoCString remoteInterfaceName; @@ -36,9 +38,11 @@ LOG(" DBus destination: %s\n", destinationName.get()); LOG(" DBus path: %s\n", pathName.get()); +diff --git a/toolkit/components/remote/nsDBusRemoteServer.cpp b/toolkit/components/remote/nsDBusRemoteServer.cpp +index 4afb8381d0bc..bd927334b817 100644 --- a/toolkit/components/remote/nsDBusRemoteServer.cpp +++ b/toolkit/components/remote/nsDBusRemoteServer.cpp -@@ -28,7 +28,7 @@ static const char* introspect_template = +@@ -29,7 +29,7 @@ static const char* introspect_template = "1.0//EN\"\n" "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n" "\n" @@ -47,16 +51,16 @@ " \n" " \n" " \n" -@@ -38,7 +38,7 @@ static const char* introspect_template = +@@ -39,7 +39,7 @@ static const char* introspect_template = bool nsDBusRemoteServer::HandleOpenURL(const gchar* aInterfaceName, const gchar* aMethodName, - const gchar* aParam) { + Span aParam) { - nsPrintfCString ourInterfaceName("org.mozilla.%s", mAppName.get()); + nsPrintfCString ourInterfaceName("io.gitlab.%s", mAppName.get()); if ((strcmp("OpenURL", aMethodName) != 0) || (strcmp(ourInterfaceName.get(), aInterfaceName) != 0)) { -@@ -129,7 +129,7 @@ static const GDBusInterfaceVTable gInterfaceVTable = { +@@ -132,7 +132,7 @@ static const GDBusInterfaceVTable gInterfaceVTable = { HandleMethodCall, HandleGetProperty, HandleSetProperty}; void nsDBusRemoteServer::OnBusAcquired(GDBusConnection* aConnection) { @@ -65,7 +69,7 @@ static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym( RTLD_DEFAULT, "dbus_validate_path"); if (!sDBusValidatePathName || -@@ -202,8 +202,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName, +@@ -206,8 +206,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName, mozilla::XREAppData::SanitizeNameForDBus(profileName); @@ -75,7 +79,7 @@ if (busName.Length() > DBUS_MAXIMUM_NAME_LENGTH) { busName.Truncate(DBUS_MAXIMUM_NAME_LENGTH); } -@@ -217,7 +216,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName, +@@ -221,7 +220,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName, // We don't have a valid busName yet - try to create a default one. if (!sDBusValidateBusName(busName.get(), nullptr)) { diff --git a/patches/ui-patches/allow_cookies_for_site.patch b/patches/ui-patches/allow_cookies_for_site.patch index c983b70..02bfc24 100644 --- a/patches/ui-patches/allow_cookies_for_site.patch +++ b/patches/ui-patches/allow_cookies_for_site.patch @@ -1,8 +1,18 @@ diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js -index 4efbba2..5445b03 100644 +index d0ba6ac670f4..c051a5f4ccc8 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js -@@ -414,6 +414,33 @@ var gIdentityHandler = { +@@ -204,6 +204,9 @@ var gIdentityHandler = { + "identity-popup-clear-sitedata-button": event => { + this.clearSiteData(event); + }, ++ "identity-allow-sitedata-button": () => { ++ this.toggleSiteData(); ++ }, + "identity-popup-remove-cert-exception": () => { + this.removeCertException(); + }, +@@ -457,6 +460,33 @@ var gIdentityHandler = { event.stopPropagation(); }, @@ -36,7 +46,7 @@ index 4efbba2..5445b03 100644 /** * Handler for mouseclicks on the "More Information" button in the * "identity-popup" panel. -@@ -1151,6 +1178,8 @@ var gIdentityHandler = { +@@ -1217,6 +1247,8 @@ var gIdentityHandler = { this._identityPopupContentOwner.textContent = owner; this._identityPopupContentSupp.textContent = supplemental; this._identityPopupContentVerif.textContent = verifier; @@ -46,16 +56,15 @@ index 4efbba2..5445b03 100644 setURI(uri) { diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml -index 8bc64fa..4a4a1af 100644 +index 768768c7d448..08602d9460c6 100644 --- a/browser/components/controlcenter/content/identityPanel.inc.xhtml +++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml -@@ -96,6 +96,12 @@ +@@ -98,6 +98,11 @@ + + class="subviewbutton"/> + ++ class="subviewbutton"> + + +