From 2d962c0c8b7f251a585a218836c59d8fd9fe855d Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Mon, 20 Nov 2023 18:54:15 +0100
Subject: [PATCH] update upstream to 120.0, fix two patches

---
 patches/dbus_name.patch                       | 59 +++++--------------
 patches/ui-patches/hide-default-browser.patch |  9 ++-
 version                                       |  2 +-
 3 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/patches/dbus_name.patch b/patches/dbus_name.patch
index d697c2a..0841279 100644
--- a/patches/dbus_name.patch
+++ b/patches/dbus_name.patch
@@ -39,58 +39,31 @@ index 68c67c3482eb..914bae09a227 100644
    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 34167177d972..6b5c3e036b21 100644
+index a77f349..45e16d9 100644
 --- a/toolkit/components/remote/nsDBusRemoteServer.cpp
 +++ b/toolkit/components/remote/nsDBusRemoteServer.cpp
-@@ -30,7 +30,7 @@ static const char* introspect_template =
-     "     <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
-     "   </method>\n"
-     " </interface>\n"
+@@ -28,7 +28,7 @@ static const char* introspect_template =
+     "1.0//EN\"\n"
+     "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
+     "<node>\n"
 -    " <interface name=\"org.mozilla.%s\">\n"
 +    " <interface name=\"io.gitlab.%s\">\n"
      "   <method name=\"OpenURL\">\n"
      "     <arg name=\"url\" direction=\"in\" type=\"ay\"/>\n"
      "   </method>\n"
-@@ -63,7 +63,7 @@ DBusHandlerResult nsDBusRemoteServer::OpenURL(DBusMessage* msg) {
-                              &commandLine, &length, DBUS_TYPE_INVALID) ||
-       length == 0) {
-     nsAutoCString errorMsg;
--    errorMsg = nsPrintfCString("org.mozilla.%s.Error", mAppName.get());
-+    errorMsg = nsPrintfCString("io.gitlab.%s.Error", mAppName.get());
-     reply = dbus_message_new_error(msg, errorMsg.get(), "Wrong argument");
-   } else {
-     guint32 timestamp = gtk_get_current_event_time();
-@@ -93,7 +93,7 @@ DBusHandlerResult nsDBusRemoteServer::HandleDBusMessage(
-   }
+@@ -38,7 +38,7 @@ static const char* introspect_template =
+ bool nsDBusRemoteServer::HandleOpenURL(const gchar* aInterfaceName,
+                                        const gchar* aMethodName,
+                                        const nsACString& aParam) {
+-  nsPrintfCString ourInterfaceName("org.mozilla.%s", mAppName.get());
++  nsPrintfCString ourInterfaceName("io.gitlab.%s", mAppName.get());
  
-   nsAutoCString ourInterfaceName;
--  ourInterfaceName = nsPrintfCString("org.mozilla.%s", mAppName.get());
-+  ourInterfaceName = nsPrintfCString("io.gitlab.%s", mAppName.get());
- 
-   if ((strcmp("OpenURL", method) == 0) &&
-       (strcmp(ourInterfaceName.get(), iface) == 0)) {
-@@ -154,7 +154,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
- 
-   mozilla::XREAppData::SanitizeNameForDBus(profileName);
- 
--  nsPrintfCString busName("org.mozilla.%s.%s", mAppName.get(),
-+  nsPrintfCString busName("io.gitlab.%s.%s", mAppName.get(),
-                           profileName.get());
-   if (busName.Length() > DBUS_MAXIMUM_NAME_LENGTH)
-     busName.Truncate(DBUS_MAXIMUM_NAME_LENGTH);
-@@ -167,7 +167,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)) {
--    busName = nsPrintfCString("org.mozilla.%s.%s", mAppName.get(), "default");
-+    busName = nsPrintfCString("io.gitlab.%s.%s", mAppName.get(), "default");
-     if (!sDBusValidateBusName(busName.get(), nullptr)) {
-       // We failed completelly to get a valid bus name - just quit
-       // to prevent crash at dbus_bus_request_name().
-@@ -186,7 +186,7 @@ nsresult nsDBusRemoteServer::Startup(const char* aAppName,
-     return NS_ERROR_FAILURE;
-   }
+   if ((strcmp("OpenURL", aMethodName) != 0) ||
+       (strcmp(ourInterfaceName.get(), aInterfaceName) != 0)) {
+@@ -129,7 +129,7 @@ static const GDBusInterfaceVTable gInterfaceVTable = {
+     HandleMethodCall, HandleGetProperty, HandleSetProperty};
  
+ void nsDBusRemoteServer::OnBusAcquired(GDBusConnection* aConnection) {
 -  mPathName = nsPrintfCString("/org/mozilla/%s/Remote", mAppName.get());
 +  mPathName = nsPrintfCString("/io/gitlab/%s/Remote", mAppName.get());
    static auto sDBusValidatePathName = (bool (*)(const char*, DBusError*))dlsym(
diff --git a/patches/ui-patches/hide-default-browser.patch b/patches/ui-patches/hide-default-browser.patch
index 6ed9355..206c956 100644
--- a/patches/ui-patches/hide-default-browser.patch
+++ b/patches/ui-patches/hide-default-browser.patch
@@ -1,10 +1,17 @@
+diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
+index 8485423..b007b96 100644
 --- a/browser/components/preferences/main.inc.xhtml
 +++ b/browser/components/preferences/main.inc.xhtml
-@@ -29,10 +29,11 @@
+@@ -29,6 +29,8 @@
    <vbox id="startupPageBox">
      <checkbox id="browserRestoreSession"
                data-l10n-id="startup-restore-windows-and-tabs"/>
 +    <html:a is="moz-support-link" support-page="session-restore" data-l10n-id="session-restore-learn-more" />
++
+ #ifdef XP_WIN
+     <hbox id="windowsLaunchOnLoginBox" align="center" hidden="true">
+       <checkbox id="windowsLaunchOnLogin"
+@@ -46,7 +48,7 @@
    </vbox>
  
  #ifdef HAVE_SHELL_SERVICE
diff --git a/version b/version
index 3191824..90e9ab6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-119.0.1
+120.0