rpms/thunderbird
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Backported Wayland patches from Firefox 63, fixed crashes on display changes

Browse Source
This commit is contained in:
Martin Stransky 2018-11-21 19:35:56 +01:00
parent f9e5809e11
commit e4e91bea57
3 changed files with 224 additions and 5102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
firefox-wayland-crash-mozbz1507475.patch Normal file
View File

@ -0,0 +1,94 @@
diff -up firefox-63.0.3/widget/gtk/mozcontainer.cpp.mozbz1507475 firefox-63.0.3/widget/gtk/mozcontainer.cpp
--- firefox-63.0.3/widget/gtk/mozcontainer.cpp.mozbz1507475 2018-11-15 01:20:56.000000000 +0100
+++ firefox-63.0.3/widget/gtk/mozcontainer.cpp 2018-11-21 15:41:41.858692640 +0100
@@ -169,6 +169,8 @@ moz_container_class_init (MozContainerCl
}
#if defined(MOZ_WAYLAND)
+static struct wl_subcompositor *subcompositor;
+
static void
registry_handle_global (void *data,
struct wl_registry *registry,
@@ -176,9 +178,8 @@ registry_handle_global (void *data,
const char *interface,
uint32_t version)
{
- MozContainer *container = MOZ_CONTAINER(data);
if(strcmp(interface, "wl_subcompositor") == 0) {
- container->subcompositor =
+ subcompositor =
static_cast<wl_subcompositor*>(wl_registry_bind(registry,
name,
&wl_subcompositor_interface,
@@ -197,6 +198,24 @@ static const struct wl_registry_listener
registry_handle_global,
registry_handle_global_remove
};
+
+struct wl_subcompositor* subcompositor_get(void)
+{
+ if (!subcompositor) {
+ GdkDisplay *gdk_display = gdk_display_get_default();
+ // Available as of GTK 3.8+
+ static auto sGdkWaylandDisplayGetWlDisplay =
+ (wl_display *(*)(GdkDisplay *))
+ dlsym(RTLD_DEFAULT, "gdk_wayland_display_get_wl_display");
+
+ wl_display* display = sGdkWaylandDisplayGetWlDisplay(gdk_display);
+ wl_registry* registry = wl_display_get_registry(display);
+ wl_registry_add_listener(registry, &registry_listener, nullptr);
+ wl_display_dispatch(display);
+ wl_display_roundtrip(display);
+ }
+ return subcompositor;
+}
#endif
void
@@ -208,25 +227,10 @@ moz_container_init (MozContainer *contai
#if defined(MOZ_WAYLAND)
{
- container->subcompositor = nullptr;
container->surface = nullptr;
container->subsurface = nullptr;
container->eglwindow = nullptr;
container->parent_surface_committed = false;
-
- GdkDisplay *gdk_display = gtk_widget_get_display(GTK_WIDGET(container));
- if (GDK_IS_WAYLAND_DISPLAY (gdk_display)) {
- // Available as of GTK 3.8+
- static auto sGdkWaylandDisplayGetWlDisplay =
- (wl_display *(*)(GdkDisplay *))
- dlsym(RTLD_DEFAULT, "gdk_wayland_display_get_wl_display");
-
- wl_display* display = sGdkWaylandDisplayGetWlDisplay(gdk_display);
- wl_registry* registry = wl_display_get_registry(display);
- wl_registry_add_listener(registry, &registry_listener, container);
- wl_display_dispatch(display);
- wl_display_roundtrip(display);
- }
}
#endif
}
@@ -298,7 +302,7 @@ moz_container_map_surface(MozContainer *
}
container->subsurface =
- wl_subcompositor_get_subsurface (container->subcompositor,
+ wl_subcompositor_get_subsurface (subcompositor_get(),
container->surface,
gtk_surface);
gint x, y;
diff -up firefox-63.0.3/widget/gtk/mozcontainer.h.mozbz1507475 firefox-63.0.3/widget/gtk/mozcontainer.h
--- firefox-63.0.3/widget/gtk/mozcontainer.h.mozbz1507475 2018-11-15 01:20:56.000000000 +0100
+++ firefox-63.0.3/widget/gtk/mozcontainer.h 2018-11-21 14:16:54.412397805 +0100
@@ -69,7 +69,6 @@ struct _MozContainer
GList *children;
#ifdef MOZ_WAYLAND
- struct wl_subcompositor *subcompositor;
struct wl_surface *surface;
struct wl_subsurface *subsurface;
struct wl_egl_window *eglwindow;

5219
firefox-wayland.patch
View File

File diff suppressed because it is too large Load Diff

13
thunderbird.spec
View File

@ -84,7 +84,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 60.3.0
Release: 4%{?dist}
Release: 5%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -128,6 +128,7 @@ Patch309: mozilla-1460871-ldap-query.patch
Patch310: disable-dbus-remote.patch
Patch311: firefox-wayland.patch
Patch312: thunderbird-dbus-remote.patch
Patch313: firefox-wayland-crash-mozbz1507475.patch
# Upstream patches
@ -189,8 +190,6 @@ BuildRequires: dbus-glib-devel
Obsoletes: thunderbird-lightning
Provides: thunderbird-lightning
Obsoletes: thunderbird-lightning-gdata <= 1:3.3.0.14
#Conflicts: thunderbird-lightning-gdata <= 1:3.3.0.14
#Obsoletes: thunderbird-52.9.1
BuildRequires: rust
BuildRequires: cargo
BuildRequires: clang-devel
@ -271,9 +270,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
#cd ..
# TODO - needs fixes
#%patch311 -p1 -b .wayland
%patch311 -p1 -b .wayland
#%patch312 -p1 -b .thunderbird-dbus-remote
%patch313 -p1 -b .mozbz1507475
%if %{official_branding}
# Required by Mozilla Corporation
@ -693,6 +692,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Wed Nov 21 2018 Martin Stransky <stransky@redhat.com> - 60.3.0-5
- Backported Wayland related code from Firefox 63
- Added fix for mozbz#1507475 - crash when display changes
* Tue Nov 20 2018 Martin Stransky <stransky@redhat.com> - 60.3.0-4
- Build with Wayland support
- Enabled DBus remote for Wayland