summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-05-05 11:30:03 +0200
committerMartin Stransky <stransky@redhat.com>2016-05-05 11:30:03 +0200
commit2b2ab8143abe4657e027b39e5988ec75f464a045 (patch)
tree39fcc0c538a2eb2de5ffac47fa5dc40b91c4c625
parentMerge branch 'master' into f24 (diff)
parentDisable dark theme until we support it correctly (mozbz#1216658) (diff)
downloadlibrewolf-fedora-ff-2b2ab8143abe4657e027b39e5988ec75f464a045.tar.gz
librewolf-fedora-ff-2b2ab8143abe4657e027b39e5988ec75f464a045.tar.bz2
librewolf-fedora-ff-2b2ab8143abe4657e027b39e5988ec75f464a045.zip
Merge branch 'master' into f24
-rw-r--r--firefox.spec7
-rw-r--r--mozilla-1216658.patch30
2 files changed, 36 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index 6fc4a1a..966bf45 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -92,7 +92,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 46.0.1
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -136,6 +136,7 @@ Patch305: mozilla-1245076.patch
Patch306: mozilla-1245076-1.patch
Patch400: mozilla-1255590.patch
Patch402: mozilla-1196777.patch
+Patch403: mozilla-1216658.patch
# Debian patches
Patch500: mozilla-440908.patch
@@ -280,6 +281,7 @@ cd %{tarballdir}
%patch306 -p1 -b .1245076-1
%patch400 -p1 -b .1255590
%patch402 -p1 -b .1196777
+%patch403 -p1 -b .1216658
# Debian extension patch
%patch500 -p1 -b .440908
@@ -799,6 +801,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu May 5 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-2
+- Disable dark theme until we support it correctly (mozbz#1216658)
+
* Tue May 3 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-1
- Updated to 46.0.1
diff --git a/mozilla-1216658.patch b/mozilla-1216658.patch
new file mode 100644
index 0000000..c2cdd27
--- /dev/null
+++ b/mozilla-1216658.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Nicolas Silva <nsilva@mozilla.com>
+# Parent 0711218a018d912036f7d3be2ae2649e213cfb85
+Bug 1216658 - Ignore Gt3 dark themes and use light theme's color scheme for native widgets. r=karlt
+
+diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
+--- a/widget/gtk/nsLookAndFeel.cpp
++++ b/widget/gtk/nsLookAndFeel.cpp
+@@ -966,16 +966,21 @@ nsLookAndFeel::Init()
+ sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);
+ }
+
+ g_object_unref(menu);
+ #else
+ GdkRGBA color;
+ GtkStyleContext *style;
+
++ // Disable dark theme because it interracts poorly with wdget styling in
++ // web content.
++ g_object_set(gtk_settings_get_default (),
++ "gtk-application-prefer-dark-theme", FALSE, NULL);
++
+ // Gtk manages a screen's CSS in the settings object so we
+ // ask Gtk to create it explicitly. Otherwise we may end up
+ // with wrong color theme, see Bug 972382
+ (void)gtk_settings_get_for_screen(gdk_screen_get_default());
+
+ GtkWidgetPath *path = gtk_widget_path_new();
+ gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
+
bgstack15