From 2735cab02704bf42f3d379350155fb6f2e15d70e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 9 Aug 2018 11:57:57 +0200 Subject: [PATCH] Build fix --- firefox.spec | 2 ++ rb255772.patch | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 rb255772.patch diff --git a/firefox.spec b/firefox.spec index 295522a..71b3638 100644 --- a/firefox.spec +++ b/firefox.spec @@ -187,6 +187,7 @@ Patch569: mozilla-1465371.patch Patch570: mozilla-1467125.patch Patch571: mozilla-1468670.patch Patch572: mozilla-1467128.patch +Patch573: rb255772.patch # Debian patches Patch500: mozilla-440908.patch @@ -401,6 +402,7 @@ This package contains results of tests executed during build. %patch570 -p1 -b .mozilla-1467125 %patch571 -p1 -b .mozilla-1468670 %patch572 -p1 -b .mozilla-1467128 +%patch573 -p1 -b .rb255772 %endif %{__rm} -f .mozconfig diff --git a/rb255772.patch b/rb255772.patch new file mode 100644 index 0000000..c67952b --- /dev/null +++ b/rb255772.patch @@ -0,0 +1,23 @@ +diff --git a/widget/xremoteclient/DBusRemoteClient.cpp b/widget/xremoteclient/DBusRemoteClient.cpp +--- a/widget/xremoteclient/DBusRemoteClient.cpp ++++ b/widget/xremoteclient/DBusRemoteClient.cpp +@@ -137,17 +137,17 @@ DBusRemoteClient::GetRemoteDestinationNa + profileName.get()); + if (aDestinationName.Length() > DBUS_MAXIMUM_NAME_LENGTH) + aDestinationName.Truncate(DBUS_MAXIMUM_NAME_LENGTH); + + static auto sDBusValidateBusName = + (bool (*)(const char *, DBusError *)) + dlsym(RTLD_DEFAULT, "dbus_validate_bus_name"); + if (!sDBusValidateBusName) { +- return false ++ return false; + } + + if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) { + // We don't have a valid busName yet - try to create a default one. + aDestinationName = nsPrintfCString("org.mozilla.%s.%s", aProgram, + "default"); + if (!sDBusValidateBusName(aDestinationName.get(), nullptr)) { + // We failed completelly to get a valid bus name - just quit +