summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2015-01-09 13:40:42 +0100
committerMartin Stransky <stransky@redhat.com>2015-01-09 13:40:42 +0100
commit30000856ee79f97c5d558a5f6e587b37ec5a8572 (patch)
tree46cd4becf462bdc26ebe500c584eaa32ce5d5709
parent Update to 35.0 Build 1 (diff)
downloadlibrewolf-fedora-ff-30000856ee79f97c5d558a5f6e587b37ec5a8572.tar.gz
librewolf-fedora-ff-30000856ee79f97c5d558a5f6e587b37ec5a8572.tar.bz2
librewolf-fedora-ff-30000856ee79f97c5d558a5f6e587b37ec5a8572.zip
Update to 35.0 Build 3, Gtk3 - added fix for button/entry box sizes
-rw-r--r--.gitignore1
-rw-r--r--firefox.spec10
-rw-r--r--mozilla-1073117-entry-button-size.patch65
-rw-r--r--sources4
4 files changed, 76 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 2aa4181..992c06c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-34.0-20141201.tar.xz
/firefox-35.0.source.tar.bz2
/firefox-langpacks-35.0-20150106.tar.xz
+/firefox-langpacks-35.0-20150109.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 0da0f6d..4ecea3a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,13 +107,13 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 35.0
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20150106.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20150109.tar.xz
%endif
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
@@ -152,6 +152,7 @@ Patch405: mozilla-1073117-check.patch
Patch406: mozilla-1073117-color.patch
Patch407: mozilla-1097592.patch
Patch408: mozilla-1110211.patch
+Patch409: mozilla-1073117-entry-button-size.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -306,6 +307,7 @@ cd %{tarballdir}
%patch406 -p1 -b .1073117-color
%patch407 -p1 -b .1097592
%patch408 -p2 -b .1110211
+%patch409 -p1 -b .1073117-entry-button-size
%endif
%if %{official_branding}
@@ -769,6 +771,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Fri Jan96 2015 Martin Stransky <stransky@redhat.com> - 35.0-2
+- Update to 35.0 Build 3
+- Gtk3 - added fix for button/entry box sizes
+
* Tue Jan 6 2015 Martin Stransky <stransky@redhat.com> - 35.0-1
- Update to 35.0 Build 1
diff --git a/mozilla-1073117-entry-button-size.patch b/mozilla-1073117-entry-button-size.patch
new file mode 100644
index 0000000..24c0ac2
--- /dev/null
+++ b/mozilla-1073117-entry-button-size.patch
@@ -0,0 +1,65 @@
+# HG changeset patch
+# Parent 70de2960aa877d7755ee6f66bf2d4c4c46bfed2c
+# User Martin Stransky <stransky@redhat.com>
+Bug 1073117 - Theme issues with GTK 3.14 - fix gtk button and entry size, r=?karlt
+Theme borders has been removed in Gtk 3.14 so we can't use them to calculate button size.
+Should computed as border + padding. Also update nsNativeThemeGTK::GetWidgetPadding() for that.
+
+diff --git a/widget/gtk/gtk3drawing.c b/widget/gtk/gtk3drawing.c
+--- a/widget/gtk/gtk3drawing.c
++++ b/widget/gtk/gtk3drawing.c
+@@ -2686,25 +2686,23 @@ moz_gtk_get_widget_border(GtkThemeWidget
+ {
+ GtkBorder inner_border;
+ gboolean interior_focus;
+ gint focus_width, focus_pad;
+
+ ensure_button_widget();
+ *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(gButtonWidget));
+
++ style = gtk_widget_get_style_context(gButtonWidget);
++ moz_gtk_add_style_border(style, left, top, right, bottom);
++
+ /* Don't add this padding in HTML, otherwise the buttons will
+ become too big and stuff the layout. */
+ if (!inhtml) {
+- moz_gtk_widget_get_focus(gButtonWidget, &interior_focus, &focus_width, &focus_pad);
+- moz_gtk_button_get_inner_border(gButtonWidget, &inner_border);
+- *left += focus_width + focus_pad + inner_border.left;
+- *right += focus_width + focus_pad + inner_border.right;
+- *top += focus_width + focus_pad + inner_border.top;
+- *bottom += focus_width + focus_pad + inner_border.bottom;
++ moz_gtk_add_style_padding(style, left, top, right, bottom);
+ }
+
+ moz_gtk_add_style_border(gtk_widget_get_style_context(gButtonWidget),
+ left, top, right, bottom);
+ return MOZ_GTK_SUCCESS;
+ }
+ case MOZ_GTK_ENTRY:
+ {
+diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
+--- a/widget/gtk/nsNativeThemeGTK.cpp
++++ b/widget/gtk/nsNativeThemeGTK.cpp
+@@ -992,16 +992,21 @@ nsNativeThemeGTK::GetWidgetPadding(nsDev
+ switch (aWidgetType) {
+ case NS_THEME_BUTTON_FOCUS:
+ case NS_THEME_TOOLBAR_BUTTON:
+ case NS_THEME_TOOLBAR_DUAL_BUTTON:
+ case NS_THEME_TAB_SCROLLARROW_BACK:
+ case NS_THEME_TAB_SCROLLARROW_FORWARD:
+ case NS_THEME_DROPDOWN_BUTTON:
+ case NS_THEME_TOOLBAR_BUTTON_DROPDOWN:
++ case NS_THEME_FOCUS_OUTLINE:
++ case NS_THEME_NUMBER_INPUT:
++ case NS_THEME_TEXTFIELD:
++ case NS_THEME_TEXTFIELD_MULTILINE:
++ case NS_THEME_BUTTON:
+ case NS_THEME_BUTTON_ARROW_UP:
+ case NS_THEME_BUTTON_ARROW_DOWN:
+ case NS_THEME_BUTTON_ARROW_NEXT:
+ case NS_THEME_BUTTON_ARROW_PREVIOUS:
+ case NS_THEME_RANGE_THUMB:
+ // Radios and checkboxes return a fixed size in GetMinimumWidgetSize
+ // and have a meaningful baseline, so they can't have
+ // author-specified padding.
diff --git a/sources b/sources
index 5c0bef3..1d143a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c325ebaae05357b722cd865538021f86 firefox-35.0.source.tar.bz2
-8cfa0c0b279d188a53215559a0187e41 firefox-langpacks-35.0-20150106.tar.xz
+d8ec0cad257e02d379828785e8790e17 firefox-35.0.source.tar.bz2
+49b6a6e86aafffaa3f141e0e9aed7eae firefox-langpacks-35.0-20150109.tar.xz
bgstack15