Build fix

This commit is contained in:
Martin Stransky 2018-08-09 11:57:57 +02:00
parent b43c4e03c8
commit 2735cab027
2 changed files with 25 additions and 0 deletions

View File

@ -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

23
rb255772.patch Normal file
View File

@ -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