summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-08-09 11:57:57 +0200
committerMartin Stransky <stransky@redhat.com>2018-08-09 11:57:57 +0200
commit2735cab02704bf42f3d379350155fb6f2e15d70e (patch)
tree573fa11367827f0586398cbddde015e7027ae3a9
parentUpdate to 61.0.2 (diff)
downloadlibrewolf-fedora-ff-2735cab02704bf42f3d379350155fb6f2e15d70e.tar.gz
librewolf-fedora-ff-2735cab02704bf42f3d379350155fb6f2e15d70e.tar.bz2
librewolf-fedora-ff-2735cab02704bf42f3d379350155fb6f2e15d70e.zip
Build fix
-rw-r--r--firefox.spec2
-rw-r--r--rb255772.patch23
2 files changed, 25 insertions, 0 deletions
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
+
bgstack15