Added fixes for mozbz#1494037 and mozbz#1500366
This commit is contained in:
parent
c9bea706b9
commit
158294b385
@ -137,6 +137,8 @@ Patch38: build-cacheFlush-missing.patch
|
|||||||
Patch40: build-aarch64-skia.patch
|
Patch40: build-aarch64-skia.patch
|
||||||
Patch41: build-disable-elfhack.patch
|
Patch41: build-disable-elfhack.patch
|
||||||
Patch42: prio-nss-build.patch
|
Patch42: prio-nss-build.patch
|
||||||
|
Patch43: mozilla-1500366.patch
|
||||||
|
Patch44: mozilla-1494037.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
Patch215: firefox-enable-addons.patch
|
Patch215: firefox-enable-addons.patch
|
||||||
@ -339,6 +341,8 @@ This package contains results of tests executed during build.
|
|||||||
%endif
|
%endif
|
||||||
%patch3 -p1 -b .arm
|
%patch3 -p1 -b .arm
|
||||||
%patch42 -p1 -b .nss-build
|
%patch42 -p1 -b .nss-build
|
||||||
|
%patch43 -p1 -b .1500366
|
||||||
|
%patch44 -p1 -b .1494037
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
%patch215 -p1 -b .addons
|
%patch215 -p1 -b .addons
|
||||||
|
21
mozilla-1494037.patch
Normal file
21
mozilla-1494037.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User A. Wilcox <AWilcox@Wilcox-Tech.com>
|
||||||
|
# Date 1539547360 0
|
||||||
|
# Sun Oct 14 20:02:40 2018 +0000
|
||||||
|
# Node ID e2e56a6a68b281301932f4fbf30cea6f7499ec41
|
||||||
|
# Parent ddb031ea38070f454bdc89429c501ec1ff9c54d4
|
||||||
|
Bug 1494037 - Fix Cairo build bustage on PowerPC platforms.
|
||||||
|
|
||||||
|
diff -r ddb031ea3807 -r e2e56a6a68b2 gfx/cairo/libpixman/src/pixman-vmx.c
|
||||||
|
--- a/gfx/cairo/libpixman/src/pixman-vmx.c Sun Oct 14 20:00:46 2018 +0000
|
||||||
|
+++ b/gfx/cairo/libpixman/src/pixman-vmx.c Sun Oct 14 20:02:40 2018 +0000
|
||||||
|
@@ -25,7 +25,9 @@
|
||||||
|
* Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
+#endif
|
||||||
|
#include "pixman-private.h"
|
||||||
|
#include "pixman-combine32.h"
|
||||||
|
#include <altivec.h>
|
91
mozilla-1500366.patch
Normal file
91
mozilla-1500366.patch
Normal file
@ -0,0 +1,91 @@
|
|||||||
|
changeset: 441749:bb66c2fdcbe2
|
||||||
|
tag: tip
|
||||||
|
user: Martin Stransky <stransky@redhat.com>
|
||||||
|
date: Fri Oct 19 12:01:02 2018 +0200
|
||||||
|
summary: Bug 1500366 - register all DBus connection to be handled by gmain loop, r=jhorak
|
||||||
|
|
||||||
|
diff --git a/netwerk/wifi/nsWifiScannerDBus.cpp b/netwerk/wifi/nsWifiScannerDBus.cpp
|
||||||
|
--- a/netwerk/wifi/nsWifiScannerDBus.cpp
|
||||||
|
+++ b/netwerk/wifi/nsWifiScannerDBus.cpp
|
||||||
|
@@ -12,16 +12,17 @@ nsWifiScannerDBus::nsWifiScannerDBus(nsC
|
||||||
|
: mAccessPoints(aAccessPoints)
|
||||||
|
{
|
||||||
|
MOZ_ASSERT(mAccessPoints);
|
||||||
|
|
||||||
|
mConnection =
|
||||||
|
already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SYSTEM, nullptr));
|
||||||
|
|
||||||
|
if (mConnection) {
|
||||||
|
+ dbus_connection_setup_with_g_main(mConnection, nullptr);
|
||||||
|
dbus_connection_set_exit_on_disconnect(mConnection, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
MOZ_COUNT_CTOR(nsWifiScannerDBus);
|
||||||
|
}
|
||||||
|
|
||||||
|
nsWifiScannerDBus::~nsWifiScannerDBus()
|
||||||
|
{
|
||||||
|
diff --git a/netwerk/wifi/nsWifiScannerDBus.h b/netwerk/wifi/nsWifiScannerDBus.h
|
||||||
|
--- a/netwerk/wifi/nsWifiScannerDBus.h
|
||||||
|
+++ b/netwerk/wifi/nsWifiScannerDBus.h
|
||||||
|
@@ -4,16 +4,17 @@
|
||||||
|
|
||||||
|
#ifndef NSWIFIAPSCANNERDBUS_H_
|
||||||
|
#define NSWIFIAPSCANNERDBUS_H_
|
||||||
|
|
||||||
|
#include "nsCOMArray.h"
|
||||||
|
|
||||||
|
#define DBUS_API_SUBJECT_TO_CHANGE
|
||||||
|
#include <dbus/dbus.h>
|
||||||
|
+#include <dbus/dbus-glib-lowlevel.h>
|
||||||
|
|
||||||
|
class nsWifiAccessPoint;
|
||||||
|
|
||||||
|
namespace mozilla {
|
||||||
|
|
||||||
|
class nsWifiScannerDBus final
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
diff --git a/toolkit/components/remote/nsDBusRemoteService.cpp b/toolkit/components/remote/nsDBusRemoteService.cpp
|
||||||
|
--- a/toolkit/components/remote/nsDBusRemoteService.cpp
|
||||||
|
+++ b/toolkit/components/remote/nsDBusRemoteService.cpp
|
||||||
|
@@ -169,16 +169,17 @@ nsDBusRemoteService::Startup(const char*
|
||||||
|
return NS_ERROR_INVALID_ARG;
|
||||||
|
|
||||||
|
mConnection = already_AddRefed<DBusConnection>(
|
||||||
|
dbus_bus_get(DBUS_BUS_SESSION, nullptr));
|
||||||
|
if (!mConnection) {
|
||||||
|
return NS_ERROR_FAILURE;
|
||||||
|
}
|
||||||
|
dbus_connection_set_exit_on_disconnect(mConnection, false);
|
||||||
|
+ dbus_connection_setup_with_g_main(mConnection, nullptr);
|
||||||
|
|
||||||
|
mAppName = aAppName;
|
||||||
|
ToLowerCase(mAppName);
|
||||||
|
|
||||||
|
// D-Bus names can contain only [a-z][A-Z][0-9]_
|
||||||
|
// characters so adjust the profile string properly.
|
||||||
|
nsAutoCString profileName;
|
||||||
|
nsresult rv = mozilla::Base64Encode(nsAutoCString(aProfileName), profileName);
|
||||||
|
diff --git a/widget/xremoteclient/DBusRemoteClient.cpp b/widget/xremoteclient/DBusRemoteClient.cpp
|
||||||
|
--- a/widget/xremoteclient/DBusRemoteClient.cpp
|
||||||
|
+++ b/widget/xremoteclient/DBusRemoteClient.cpp
|
||||||
|
@@ -38,16 +38,17 @@ DBusRemoteClient::Init()
|
||||||
|
return NS_OK;
|
||||||
|
|
||||||
|
mConnection = already_AddRefed<DBusConnection>(
|
||||||
|
dbus_bus_get(DBUS_BUS_SESSION, nullptr));
|
||||||
|
if (!mConnection)
|
||||||
|
return NS_ERROR_FAILURE;
|
||||||
|
|
||||||
|
dbus_connection_set_exit_on_disconnect(mConnection, false);
|
||||||
|
+ dbus_connection_setup_with_g_main(mConnection, nullptr);
|
||||||
|
|
||||||
|
return NS_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
DBusRemoteClient::Shutdown (void)
|
||||||
|
{
|
||||||
|
MOZ_LOG(sRemoteLm, LogLevel::Debug, ("DBusRemoteClient::Shutdown"));
|
||||||
|
|
Loading…
Reference in New Issue
Block a user