summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox.spec7
-rw-r--r--mozilla-entry-padding.patch17
2 files changed, 23 insertions, 1 deletions
diff --git a/firefox.spec b/firefox.spec
index f8aab75..7d1427a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 40.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
@@ -153,6 +153,7 @@ Patch420: mozilla-1160154.patch
Patch421: mozilla-1169233.patch
Patch422: mozilla-1169232.patch
Patch423: mozilla-1129873-apppicker.patch
+Patch424: mozilla-entry-padding.patch
# Fix Skia Neon stuff on AArch64
Patch500: aarch64-fix-skia.patch
@@ -306,6 +307,7 @@ cd %{tarballdir}
%patch421 -p1 -b .1169233
%patch422 -p1 -b .1169232
%patch423 -p1 -b .1129873-apppicker
+%patch424 -p2 -b .entry-padding
%endif
%patch500 -p1
@@ -805,6 +807,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Fri Aug 07 2015 Martin Stransky <stransky@redhat.com> - 40.0-2
+- Patches updated (GtkEntry padding patch, toolbar button patch)
+
* Fri Aug 07 2015 Martin Stransky <stransky@redhat.com> - 40.0-1
- Update to 40.0 Build 4
diff --git a/mozilla-entry-padding.patch b/mozilla-entry-padding.patch
new file mode 100644
index 0000000..2c1a361
--- /dev/null
+++ b/mozilla-entry-padding.patch
@@ -0,0 +1,17 @@
+diff -up firefox-40.0/mozilla-release/widget/gtk/gtk3drawing.c.old firefox-40.0/mozilla-release/widget/gtk/gtk3drawing.c
+--- firefox-40.0/mozilla-release/widget/gtk/gtk3drawing.c.old 2015-08-07 13:50:18.000000000 +0200
++++ firefox-40.0/mozilla-release/widget/gtk/gtk3drawing.c 2015-08-07 13:53:05.920824588 +0200
+@@ -2643,13 +2643,6 @@ moz_gtk_get_widget_border(GtkThemeWidget
+ ensure_entry_widget();
+ style = gtk_widget_get_style_context(gEntryWidget);
+ moz_gtk_add_style_border(style, left, top, right, bottom);
+-
+- /* Use the document padding in HTML
+- and GTK style padding in XUL. */
+- if (!inhtml) {
+- moz_gtk_add_style_padding(style, left, top, right, bottom);
+- }
+-
+ return MOZ_GTK_SUCCESS;
+ }
+ case MOZ_GTK_TREEVIEW:
bgstack15