rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f23

Browse Source
This commit is contained in:
Martin Stransky 2016-07-28 14:05:01 +02:00
commit 368669e46c
3 changed files with 1967 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3351
firefox-gtk3-20.patch
View File

File diff suppressed because it is too large Load Diff

5
firefox.spec
View File

@ -265,10 +265,8 @@ cd %{tarballdir}
%patch223 -p1 -b .appchooser-crash %patch223 -p1 -b .appchooser-crash
%endif %endif
%patch224 -p1 -b .1170092 %patch224 -p1 -b .1170092
%if 0%{?fedora} > 23
%patch304 -p1 -b .1253216 %patch304 -p1 -b .1253216
#%patch222 -p1 -b .gtk3-20 %patch222 -p1 -b .gtk3-20
%endif
%patch402 -p1 -b .1196777 %patch402 -p1 -b .1196777
%patch404 -p1 -b .1270046 %patch404 -p1 -b .1270046
%patch405 -p1 -b .1245783 %patch405 -p1 -b .1245783
@ -776,6 +774,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog %changelog
* Thu Jul 28 2016 Martin Stransky <stransky@redhat.com> - 48.0-4 * Thu Jul 28 2016 Martin Stransky <stransky@redhat.com> - 48.0-4
- Enable dark themes by pref in about:config (Bug 1272332) - Enable dark themes by pref in about:config (Bug 1272332)
- Backported gtk3.20 upstream fixes
* Wed Jul 27 2016 Martin Stransky <stransky@redhat.com> - 48.0-3 * Wed Jul 27 2016 Martin Stransky <stransky@redhat.com> - 48.0-3
- Updated to 48.0 (B2) - Updated to 48.0 (B2)

45
mozilla-1272332.patch
View File

@ -1,17 +1,7 @@
# HG changeset patch diff -up firefox-48.0/modules/libpref/init/all.js.orig firefox-48.0/modules/libpref/init/all.js
# User Nicolas Silva <nsilva@mozilla.com> --- firefox-48.0/modules/libpref/init/all.js.orig 2016-07-25 22:22:05.000000000 +0200
# Parent 14c5bf11d37b9e92d27f7089d9392de2ac339bb3 +++ firefox-48.0/modules/libpref/init/all.js 2016-07-28 13:14:39.065888837 +0200
Bug 1272332 - Allow gtk the global dark theme behind a pref. r=karlt @@ -4497,6 +4497,7 @@ pref("gfx.apitrace.enabled",false);
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -4560,16 +4560,17 @@ pref("gfx.content.use-native-pushlayer",
#ifdef ANDROID
pref("gfx.apitrace.enabled",false);
#endif
#ifdef MOZ_X11
pref("gfx.content.use-native-pushlayer", true); pref("gfx.content.use-native-pushlayer", true);
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
pref("gfx.xrender.enabled",false); pref("gfx.xrender.enabled",false);
@ -19,20 +9,18 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
#endif #endif
#endif #endif
#ifdef XP_WIN diff -up firefox-48.0/widget/gtk/nsLookAndFeel.cpp.orig firefox-48.0/widget/gtk/nsLookAndFeel.cpp
pref("gfx.content.use-native-pushlayer", true); --- firefox-48.0/widget/gtk/nsLookAndFeel.cpp.orig 2016-06-01 06:11:44.000000000 +0200
+++ firefox-48.0/widget/gtk/nsLookAndFeel.cpp 2016-07-28 13:58:35.645067880 +0200
@@ -28,6 +28,7 @@
#include <dlfcn.h>
// Whether to disable the automatic detection and use of direct2d. #include "mozilla/gfx/2D.h"
pref("gfx.direct2d.disabled", false); +#include "mozilla/Preferences.h"
diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -1093,26 +1093,32 @@ nsLookAndFeel::Init()
GdkRGBA color;
GtkStyleContext *style;
// Gtk manages a screen's CSS in the settings object so we #if MOZ_WIDGET_GTK != 2
// ask Gtk to create it explicitly. Otherwise we may end up #include <cairo-gobject.h>
@@ -1097,16 +1098,22 @@ nsLookAndFeel::Init()
// with wrong color theme, see Bug 972382 // with wrong color theme, see Bug 972382
GtkSettings *settings = gtk_settings_get_for_screen(gdk_screen_get_default()); GtkSettings *settings = gtk_settings_get_for_screen(gdk_screen_get_default());
@ -64,8 +52,3 @@ diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
} }
GtkWidgetPath *path = gtk_widget_path_new(); GtkWidgetPath *path = gtk_widget_path_new();
gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
mBackgroundStyle = create_context(path);
gtk_style_context_add_class(mBackgroundStyle, GTK_STYLE_CLASS_BACKGROUND);