Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fbb18380666d220336e2d5bc429e9094cb76128b
commit fbb18380666d220336e2d5bc429e9094cb76128b Author: crazy <[email protected]> Date: Fri Apr 15 15:26:22 2016 +0200 firefox-45.0.2-1-x86_64 * version bump * minor fixes to gtk3.20* patch * copy&paste should work again diff --git a/source/xapps-extra/firefox/FrugalBuild b/source/xapps-extra/firefox/FrugalBuild index 2a7ca1e..5812169 100644 --- a/source/xapps-extra/firefox/FrugalBuild +++ b/source/xapps-extra/firefox/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: crazy <[email protected]> pkgname=firefox -pkgver=45.0.1 +pkgver=45.0.2 pathver=${pkgver} # version used in path names -pkgrel=3 +pkgrel=1 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; depends=('libevent' 'hunspell' 'libidl' 'desktop-file-utils' 'nss>=3.19.2' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.9.2' \ @@ -22,13 +22,13 @@ source=(http://ftp.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pa prefs.js \ mozconfig \ ff-no-version.patch gtk3.20.patch) -sha1sums=('14081166adc1a18e1150ac264d810d6539818d67' \ +sha1sums=('a4ca00cba9e351534b9c15b091deb10ed011fd30' \ 'a797c04d67d343d068c108b804883a7815f3197b' \ 'ff757068926b86e0c5ed82a0683fa645623c01d6' \ 'e6789ad3634f43a8986ef35fe1876d4cde6a2e15' \ '91b6897135d076c7a1bec516604437bdfac05dbd' \ '104394fe469f67786c929ff7cc7b01d6989a2968' \ - '038d28e1dad95710cc7545e6e32d7d4a4589d0b3') + 'e45f6ebc26489e8e4cf0f07949bf04a676ac554a') options+=('scriptlet') diff --git a/source/xapps-extra/firefox/gtk3.20.patch b/source/xapps-extra/firefox/gtk3.20.patch index 781604a..3db4189 100644 --- a/source/xapps-extra/firefox/gtk3.20.patch +++ b/source/xapps-extra/firefox/gtk3.20.patch @@ -1,14 +1,6 @@ - widget/gtk/gtk3drawing.c | 653 +++++++++++++++++++++++++++------------- - widget/gtk/gtkdrawing.h | 17 ++ - widget/gtk/mozgtk/mozgtk.c | 13 + - widget/gtk/nsLookAndFeel.cpp | 99 +++--- - widget/gtk/nsNativeThemeGTK.cpp | 18 +- - 5 files changed, 545 insertions(+), 255 deletions(-) - -diff --git c/widget/gtk/gtk3drawing.c i/widget/gtk/gtk3drawing.c -index a716b8d..d7ee658 100644 ---- c/widget/gtk/gtk3drawing.c -+++ i/widget/gtk/gtk3drawing.c +diff -up firefox-45.0.1/widget/gtk/gtk3drawing.c.gtk3-20 firefox-45.0.1/widget/gtk/gtk3drawing.c +--- firefox-45.0.1/widget/gtk/gtk3drawing.c.gtk3-20 2016-03-15 23:37:46.000000000 +0100 ++++ firefox-45.0.1/widget/gtk/gtk3drawing.c 2016-04-05 14:40:27.846088625 +0200 @@ -17,32 +17,78 @@ #include <math.h> @@ -135,7 +127,7 @@ index a716b8d..d7ee658 100644 static GtkStateFlags GetStateFlagsFromGtkWidgetState(GtkWidgetState* state) { -@@ -97,6 +174,41 @@ GetStateFlagsFromGtkWidgetState(GtkWidgetState* state) +@@ -97,6 +174,41 @@ GetStateFlagsFromGtkWidgetState(GtkWidge return stateFlags; } @@ -177,7 +169,7 @@ index a716b8d..d7ee658 100644 /* Because we have such an unconventional way of drawing widgets, signal to the GTK theme engine that they are drawing for Mozilla instead of a conventional GTK app so they can do any specific things they may want to do. */ -@@ -141,9 +253,16 @@ setup_widget_prototype(GtkWidget* widget) +@@ -141,9 +253,16 @@ setup_widget_prototype(GtkWidget* widget static gint ensure_button_widget() { @@ -185,7 +177,7 @@ index a716b8d..d7ee658 100644 - gButtonWidget = gtk_button_new_with_label("M"); - setup_widget_prototype(gButtonWidget); + if (!gButton.widget) { -+ GtkCssNode path[] = { ++ GtkCssNode path[] = { + { GTK_TYPE_BUTTON, "button", NULL, NULL } + }; + @@ -270,18 +262,18 @@ index a716b8d..d7ee658 100644 + setup_widget_prototype(gVertScrollbar.widget); + + gVertScrollbar.scroll.style = moz_gtk_style_create(path+1, NULL); -+ gVertScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, ++ gVertScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, + gVertScrollbar.scroll.style); -+ gVertScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, ++ gVertScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, + gVertScrollbar.scroll.styleTrough); + + gHorizScrollbar.widget = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, NULL); + setup_widget_prototype(gHorizScrollbar.widget); + + gHorizScrollbar.scroll.style = moz_gtk_style_create(path, NULL); -+ gHorizScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, ++ gHorizScrollbar.scroll.styleTrough = moz_gtk_style_create(path+2, + gHorizScrollbar.scroll.style); -+ gHorizScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, ++ gHorizScrollbar.scroll.styleSlider = moz_gtk_style_create(path+3, + gHorizScrollbar.scroll.styleTrough); } return MOZ_GTK_SUCCESS; @@ -324,7 +316,7 @@ index a716b8d..d7ee658 100644 - gEntryWidget = gtk_entry_new(); - setup_widget_prototype(gEntryWidget); + if (!gEntry.widget) { -+ GtkCssNode path[] = { ++ GtkCssNode path[] = { + { GTK_TYPE_ENTRY, "entry", NULL, NULL }, + { G_TYPE_NONE, "selection", NULL, NULL } + }; @@ -334,12 +326,12 @@ index a716b8d..d7ee658 100644 + gtk_widget_show(gEntry.widget); + + gEntry.entry.style = moz_gtk_style_create(&path[0], NULL); -+ gEntry.entry.styleSelection = moz_gtk_style_create(&path[1], ++ gEntry.entry.styleSelection = moz_gtk_style_create(&path[1], + gEntry.entry.style); } return MOZ_GTK_SUCCESS; } -@@ -387,9 +571,9 @@ moz_gtk_get_combo_box_entry_inner_widgets(GtkWidget *widget, +@@ -387,9 +571,9 @@ moz_gtk_get_combo_box_entry_inner_widget g_object_add_weak_pointer(G_OBJECT(widget), (gpointer) &gComboBoxEntryButtonWidget); } else if (GTK_IS_ENTRY(widget)) { @@ -409,7 +401,7 @@ index a716b8d..d7ee658 100644 ensure_menu_popup_widget(); gCheckMenuItemWidget = gtk_check_menu_item_new_with_label("M"); gtk_menu_shell_append(GTK_MENU_SHELL(gMenuPopupWidget), -@@ -757,7 +958,7 @@ moz_gtk_checkbox_get_metrics(gint* indicator_size, gint* indicator_spacing) +@@ -757,7 +958,7 @@ moz_gtk_checkbox_get_metrics(gint* indic { ensure_checkbox_widget(); @@ -418,7 +410,7 @@ index a716b8d..d7ee658 100644 "indicator_size", indicator_size, "indicator_spacing", indicator_spacing, NULL); -@@ -770,7 +971,7 @@ moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing) +@@ -770,7 +971,7 @@ moz_gtk_radio_get_metrics(gint* indicato { ensure_radiobutton_widget(); @@ -427,7 +419,7 @@ index a716b8d..d7ee658 100644 "indicator_size", indicator_size, "indicator_spacing", indicator_spacing, NULL); -@@ -783,13 +984,12 @@ moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) +@@ -783,13 +984,12 @@ moz_gtk_get_focus_outline_size(gint* foc { GtkBorder border; GtkBorder padding; @@ -444,7 +436,7 @@ index a716b8d..d7ee658 100644 *focus_h_width = border.left + padding.left; *focus_v_width = border.top + padding.top; return MOZ_GTK_SUCCESS; -@@ -826,7 +1026,7 @@ moz_gtk_button_get_default_overflow(gint* border_top, gint* border_left, +@@ -826,7 +1026,7 @@ moz_gtk_button_get_default_overflow(gint GtkBorder* default_outside_border; ensure_button_widget(); @@ -453,7 +445,7 @@ index a716b8d..d7ee658 100644 "default-outside-border", &default_outside_border, NULL); -@@ -849,7 +1049,7 @@ moz_gtk_button_get_default_border(gint* border_top, gint* border_left, +@@ -849,7 +1049,7 @@ moz_gtk_button_get_default_border(gint* GtkBorder* default_border; ensure_button_widget(); @@ -462,7 +454,7 @@ index a716b8d..d7ee658 100644 "default-border", &default_border, NULL); -@@ -940,7 +1140,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, +@@ -940,7 +1140,7 @@ moz_gtk_button_paint(cairo_t *cr, GdkRec if (state->focused) { GtkBorder border; @@ -471,7 +463,7 @@ index a716b8d..d7ee658 100644 x += border.left; y += border.top; width -= (border.left + border.right); -@@ -961,15 +1161,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, +@@ -961,15 +1161,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec gint indicator_size, indicator_spacing; gint x, y, width, height; gint focus_x, focus_y, focus_width, focus_height; @@ -490,7 +482,7 @@ index a716b8d..d7ee658 100644 } // XXX we should assert rect->height >= indicator_size too -@@ -988,11 +1187,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, +@@ -988,11 +1187,9 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec focus_width = width + 2 * indicator_spacing; focus_height = height + 2 * indicator_spacing; @@ -505,7 +497,7 @@ index a716b8d..d7ee658 100644 if (selected) state_flags |= checkbox_check_state; -@@ -1000,13 +1197,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1000,13 +1197,15 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec if (inconsistent) state_flags |= GTK_STATE_FLAG_INCONSISTENT; @@ -525,7 +517,7 @@ index a716b8d..d7ee658 100644 focus_width, focus_height); } } -@@ -1015,15 +1214,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1015,15 +1214,14 @@ moz_gtk_toggle_paint(cairo_t *cr, GdkRec * 'indeterminate' type on checkboxes. In GTK, the shadow type * must also be changed for the state to be drawn. */ @@ -545,7 +537,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -1040,8 +1238,8 @@ calculate_button_inner_rect(GtkWidget* button, GdkRectangle* rect, +@@ -1040,8 +1238,8 @@ calculate_button_inner_rect(GtkWidget* b style = gtk_widget_get_style_context(button); /* This mirrors gtkbutton's child positioning */ @@ -556,7 +548,7 @@ index a716b8d..d7ee658 100644 inner_rect->x = rect->x + border.left + padding.left; inner_rect->y = rect->y + padding.top + border.top; -@@ -1107,9 +1305,9 @@ moz_gtk_scrollbar_button_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1107,9 +1305,9 @@ moz_gtk_scrollbar_button_paint(cairo_t * ensure_scrollbar_widget(); if (flags & MOZ_GTK_STEPPER_VERTICAL) @@ -568,7 +560,7 @@ index a716b8d..d7ee658 100644 gtk_widget_set_direction(scrollbar, direction); -@@ -1175,26 +1373,23 @@ moz_gtk_scrollbar_trough_paint(GtkThemeWidgetType widget, +@@ -1175,26 +1373,23 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW GtkTextDirection direction) { GtkStyleContext* style; @@ -585,7 +577,7 @@ index a716b8d..d7ee658 100644 + if (widget == MOZ_GTK_SCROLLBAR_TRACK_HORIZONTAL) { + gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); + style = gHorizScrollbar.scroll.styleTrough; -+ } ++ } + else { + gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); + style = gVertScrollbar.scroll.styleTrough; @@ -603,7 +595,7 @@ index a716b8d..d7ee658 100644 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); -@@ -1202,7 +1397,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeWidgetType widget, +@@ -1202,7 +1397,6 @@ moz_gtk_scrollbar_trough_paint(GtkThemeW gtk_render_focus(style, cr, rect->x, rect->y, rect->width, rect->height); } @@ -611,7 +603,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -1214,25 +1408,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget, +@@ -1214,25 +1408,21 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi { GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); GtkStyleContext* style; @@ -625,6 +617,11 @@ index a716b8d..d7ee658 100644 - scrollbar = GTK_SCROLLBAR(gHorizScrollbarWidget); - else - scrollbar = GTK_SCROLLBAR(gVertScrollbarWidget); +- +- gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); +- +- style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); +- gtk_style_context_save(style); + if (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) { + style = gHorizScrollbar.scroll.styleSlider; + gtk_widget_set_direction(GTK_WIDGET(gHorizScrollbar.widget), direction); @@ -634,18 +631,13 @@ index a716b8d..d7ee658 100644 + gtk_widget_set_direction(GTK_WIDGET(gVertScrollbar.widget), direction); + } -- gtk_widget_set_direction(GTK_WIDGET(scrollbar), direction); -- -- style = gtk_widget_get_style_context(GTK_WIDGET(scrollbar)); -- gtk_style_context_save(style); -- - gtk_style_context_add_class(style, GTK_STYLE_CLASS_SLIDER); gtk_style_context_set_state(style, state_flags); - gtk_style_context_get_margin (style, state_flags, &margin); gtk_render_slider(style, cr, -@@ -1243,8 +1433,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget, +@@ -1243,8 +1433,6 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWi (widget == MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL) ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL); @@ -654,7 +646,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -1255,8 +1443,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1255,8 +1443,8 @@ moz_gtk_spin_paint(cairo_t *cr, GdkRecta GtkStyleContext* style; ensure_spin_widget(); @@ -665,7 +657,7 @@ index a716b8d..d7ee658 100644 gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_SPINBUTTON); gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); -@@ -1275,11 +1463,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1275,11 +1463,10 @@ moz_gtk_spin_updown_paint(cairo_t *cr, G GtkStyleContext* style; ensure_spin_widget(); @@ -679,7 +671,7 @@ index a716b8d..d7ee658 100644 gtk_render_background(style, cr, rect->x, rect->y, rect->width, rect->height); gtk_render_frame(style, cr, rect->x, rect->y, rect->width, rect->height); -@@ -1445,15 +1632,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1445,15 +1632,13 @@ moz_gtk_vpaned_paint(cairo_t *cr, GdkRec static gint moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect, GtkWidgetState* state, @@ -698,7 +690,7 @@ index a716b8d..d7ee658 100644 if (draw_focus_outline_only) { // Inflate the given 'rect' with the focus outline size. -@@ -1473,10 +1658,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1473,10 +1658,9 @@ moz_gtk_entry_paint(cairo_t *cr, GdkRect * textarea window uses gtk_paint_flat_box when exposed */ /* This gets us a lovely greyish disabledish look */ @@ -710,7 +702,7 @@ index a716b8d..d7ee658 100644 /* Now paint the shadow and focus border. * We do like in gtk_entry_draw_frame, we first draw the shadow, a tad -@@ -1526,7 +1710,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1526,7 +1710,7 @@ moz_gtk_treeview_paint(cairo_t *cr, GdkR style = gtk_widget_get_style_context(gScrolledWindowWidget); gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_FRAME); @@ -719,7 +711,7 @@ index a716b8d..d7ee658 100644 xthickness = border.left; ythickness = border.top; -@@ -1697,7 +1881,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1697,7 +1881,7 @@ moz_gtk_combo_box_paint(cairo_t *cr, Gdk if (direction == GTK_TEXT_DIR_LTR) { GtkBorder padding; GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); @@ -728,7 +720,7 @@ index a716b8d..d7ee658 100644 arrow_rect.x -= padding.left; } else -@@ -1799,29 +1983,27 @@ moz_gtk_container_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1799,29 +1983,27 @@ moz_gtk_container_paint(cairo_t *cr, Gdk gboolean isradio, GtkTextDirection direction) { GtkStateFlags state_flags = GetStateFlagsFromGtkWidgetState(state); @@ -766,7 +758,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -1831,32 +2013,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1831,32 +2013,26 @@ moz_gtk_toggle_label_paint(cairo_t *cr, GtkWidgetState* state, gboolean isradio, GtkTextDirection direction) { @@ -784,22 +776,22 @@ index a716b8d..d7ee658 100644 } else { ensure_checkbox_widget(); - widget = gCheckboxWidget; -+ widget = &gCheckbox; - } +- } - style = gtk_widget_get_style_context(widget); - gtk_style_context_save(style); - if (isradio) { - gtk_style_context_add_class(style, GTK_STYLE_CLASS_RADIO); - } else { - gtk_style_context_add_class(style, GTK_STYLE_CLASS_CHECK); -- } ++ widget = &gCheckbox; + } - gtk_widget_set_direction(widget, direction); + gtk_style_context_save(widget->check.styleLabel); + gtk_widget_set_direction(widget->widget, direction); - gtk_style_context_set_state(style, GetStateFlagsFromGtkWidgetState(state)); - gtk_render_focus(style, cr, -+ gtk_style_context_set_state(widget->check.styleLabel, ++ gtk_style_context_set_state(widget->check.styleLabel, + GetStateFlagsFromGtkWidgetState(state)); + gtk_render_focus(widget->check.styleLabel, cr, rect->x, rect->y, rect->width, rect->height); @@ -808,7 +800,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -1917,7 +2093,7 @@ moz_gtk_toolbar_separator_paint(cairo_t *cr, GdkRectangle* rect, +@@ -1917,7 +2093,7 @@ moz_gtk_toolbar_separator_paint(cairo_t rect->height * (end_fraction - start_fraction)); } else { GtkBorder padding; @@ -841,7 +833,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -2025,15 +2196,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2025,15 +2196,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr GtkTextDirection direction, GtkThemeWidgetType widget) { @@ -858,7 +850,7 @@ index a716b8d..d7ee658 100644 if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE || widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) { -@@ -2072,12 +2236,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2072,12 +2236,14 @@ moz_gtk_progress_chunk_paint(cairo_t *cr // gtk_render_activity was used to render progress chunks on GTK versions // before 3.13.7, see bug 1173907. if (!gtk_check_version(3, 13, 7)) { @@ -886,7 +878,7 @@ index a716b8d..d7ee658 100644 if (border.top < 2) return 2; /* some themes don't set ythickness correctly */ -@@ -2290,7 +2456,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2290,7 +2456,7 @@ moz_gtk_tab_paint(cairo_t *cr, GdkRectan gtk_style_context_save(style); moz_gtk_tab_prepare_style_context(style, flags); @@ -895,7 +887,7 @@ index a716b8d..d7ee658 100644 focusRect.x += padding.left; focusRect.width -= (padding.left + padding.right); -@@ -2406,7 +2572,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2406,7 +2572,7 @@ moz_gtk_tab_scroll_arrow_paint(cairo_t * } static gint @@ -904,7 +896,7 @@ index a716b8d..d7ee658 100644 GtkTextDirection direction) { GtkStyleContext* style; -@@ -2467,7 +2633,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2467,7 +2633,7 @@ moz_gtk_menu_separator_paint(cairo_t *cr border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); style = gtk_widget_get_style_context(gMenuSeparatorWidget); @@ -913,7 +905,7 @@ index a716b8d..d7ee658 100644 x = rect->x + border_width; y = rect->y + border_width; -@@ -2521,7 +2687,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2521,7 +2687,8 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk item_widget = gMenuItemWidget; } style = gtk_widget_get_style_context(item_widget); @@ -923,7 +915,7 @@ index a716b8d..d7ee658 100644 if (flags & MOZ_TOPLEVEL_MENU_ITEM) { gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUBAR); -@@ -2540,7 +2707,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2540,7 +2707,7 @@ moz_gtk_menu_item_paint(cairo_t *cr, Gdk gtk_render_background(style, cr, x, y, w, h); gtk_render_frame(style, cr, x, y, w, h); @@ -932,7 +924,7 @@ index a716b8d..d7ee658 100644 } return MOZ_GTK_SUCCESS; -@@ -2556,7 +2723,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2556,7 +2723,10 @@ moz_gtk_menu_arrow_paint(cairo_t *cr, Gd ensure_menu_item_widget(); gtk_widget_set_direction(gMenuItemWidget, direction); @@ -944,7 +936,7 @@ index a716b8d..d7ee658 100644 style = gtk_widget_get_style_context(gMenuItemWidget); gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_MENUITEM); -@@ -2606,7 +2776,7 @@ moz_gtk_check_menu_item_paint(cairo_t *cr, GdkRectangle* rect, +@@ -2606,7 +2776,7 @@ moz_gtk_check_menu_item_paint(cairo_t *c } gtk_style_context_set_state(style, state_flags); @@ -953,7 +945,7 @@ index a716b8d..d7ee658 100644 offset = gtk_container_get_border_width(GTK_CONTAINER(gCheckMenuItemWidget)) + padding.left + 2; -@@ -2658,7 +2828,7 @@ moz_gtk_add_style_border(GtkStyleContext* style, +@@ -2658,7 +2828,7 @@ moz_gtk_add_style_border(GtkStyleContext { GtkBorder border; @@ -962,7 +954,7 @@ index a716b8d..d7ee658 100644 *left += border.left; *right += border.right; -@@ -2667,12 +2837,22 @@ moz_gtk_add_style_border(GtkStyleContext* style, +@@ -2667,12 +2837,22 @@ moz_gtk_add_style_border(GtkStyleContext } static void @@ -986,7 +978,7 @@ index a716b8d..d7ee658 100644 *left += padding.left; *right += padding.right; -@@ -2680,6 +2860,16 @@ moz_gtk_add_style_padding(GtkStyleContext* style, +@@ -2680,6 +2860,16 @@ moz_gtk_add_style_padding(GtkStyleContex *bottom += padding.bottom; } @@ -1003,7 +995,7 @@ index a716b8d..d7ee658 100644 gint moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, gint* right, gint* bottom, GtkTextDirection direction, -@@ -2694,36 +2884,27 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, +@@ -2694,36 +2884,27 @@ moz_gtk_get_widget_border(GtkThemeWidget case MOZ_GTK_TOOLBAR_BUTTON: { ensure_button_widget(); @@ -1047,7 +1039,7 @@ index a716b8d..d7ee658 100644 return MOZ_GTK_SUCCESS; } -@@ -2759,7 +2940,7 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, +@@ -2759,7 +2940,7 @@ moz_gtk_get_widget_border(GtkThemeWidget break; case MOZ_GTK_DROPDOWN_ENTRY: ensure_combo_box_entry_widgets(); @@ -1056,7 +1048,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_DROPDOWN_ARROW: ensure_combo_box_entry_widgets(); -@@ -2795,7 +2976,7 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, +@@ -2795,7 +2976,7 @@ moz_gtk_get_widget_border(GtkThemeWidget if (!wide_separators) { style = gtk_widget_get_style_context(gComboBoxSeparatorWidget); @@ -1065,7 +1057,7 @@ index a716b8d..d7ee658 100644 separator_width = border.left; } } -@@ -2814,14 +2995,17 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, +@@ -2814,14 +2995,17 @@ moz_gtk_get_widget_border(GtkThemeWidget w = gTabWidget; break; case MOZ_GTK_PROGRESSBAR: @@ -1087,7 +1079,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_SCALE_HORIZONTAL: ensure_scale_widget(); -@@ -2840,12 +3024,13 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top, +@@ -2840,12 +3024,13 @@ moz_gtk_get_widget_border(GtkThemeWidget { if (widget == MOZ_GTK_CHECKBUTTON_CONTAINER) { ensure_checkbox_widget(); @@ -1104,7 +1096,7 @@ index a716b8d..d7ee658 100644 *left = *top = *right = *bottom = gtk_container_get_border_width(GTK_CONTAINER(w)); moz_gtk_add_style_border(style, -@@ -2978,6 +3163,32 @@ moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height) +@@ -2978,6 +3163,32 @@ moz_gtk_get_combo_box_entry_button_size( } gint @@ -1137,7 +1129,7 @@ index a716b8d..d7ee658 100644 moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height) { gint arrow_size; -@@ -3022,7 +3233,7 @@ moz_gtk_get_toolbar_separator_width(gint* size) +@@ -3022,7 +3233,7 @@ moz_gtk_get_toolbar_separator_width(gint "separator-width", &separator_width, NULL); /* Just in case... */ @@ -1146,7 +1138,7 @@ index a716b8d..d7ee658 100644 *size = MAX(*size, (wide_separators ? separator_width : border.left)); return MOZ_GTK_SUCCESS; } -@@ -3064,7 +3275,7 @@ moz_gtk_get_menu_separator_height(gint *size) +@@ -3064,7 +3275,7 @@ moz_gtk_get_menu_separator_height(gint * border_width = gtk_container_get_border_width(GTK_CONTAINER(gMenuSeparatorWidget)); style = gtk_widget_get_style_context(gMenuSeparatorWidget); @@ -1155,7 +1147,7 @@ index a716b8d..d7ee658 100644 gtk_style_context_save(style); gtk_style_context_add_class(style, GTK_STYLE_CLASS_SEPARATOR); -@@ -3122,15 +3333,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScrollbarMetrics *metrics) +@@ -3122,15 +3333,21 @@ moz_gtk_get_scrollbar_metrics(MozGtkScro { ensure_scrollbar_widget(); @@ -1170,11 +1162,11 @@ index a716b8d..d7ee658 100644 - metrics->min_slider_size = - gtk_range_get_min_slider_size(GTK_RANGE(gHorizScrollbarWidget)); + if (!gtk_check_version(3,19,7)) { -+ gtk_style_context_get(gVertScrollbar.scroll.styleSlider, -+ gtk_style_context_get_state(gVertScrollbar.scroll.styleSlider), ++ gtk_style_context_get(gVertScrollbar.scroll.styleSlider, ++ gtk_style_context_get_state(gVertScrollbar.scroll.styleSlider), + "min-height", &metrics->min_slider_size, NULL); + } else { -+ metrics->min_slider_size = ++ metrics->min_slider_size = + gtk_range_get_min_slider_size(GTK_RANGE(gVertScrollbar.widget)); + } @@ -1189,7 +1181,7 @@ index a716b8d..d7ee658 100644 g_object_get(settings, "gtk-button-images", &result, NULL); return result; -@@ -3183,7 +3400,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr, +@@ -3183,7 +3400,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType } ensure_button_widget(); return moz_gtk_button_paint(cr, rect, state, @@ -1198,7 +1190,7 @@ index a716b8d..d7ee658 100644 direction); break; case MOZ_GTK_CHECKBUTTON: -@@ -3233,7 +3450,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr, +@@ -3233,7 +3450,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_SPINBUTTON_ENTRY: ensure_spin_widget(); return moz_gtk_entry_paint(cr, rect, state, @@ -1207,7 +1199,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_GRIPPER: return moz_gtk_gripper_paint(cr, rect, state, -@@ -3260,7 +3477,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr, +@@ -3260,7 +3477,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_ENTRY: ensure_entry_widget(); return moz_gtk_entry_paint(cr, rect, state, @@ -1216,7 +1208,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_DROPDOWN: return moz_gtk_combo_box_paint(cr, rect, state, direction); -@@ -3272,7 +3489,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr, +@@ -3272,7 +3489,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType case MOZ_GTK_DROPDOWN_ENTRY: ensure_combo_box_entry_widgets(); return moz_gtk_entry_paint(cr, rect, state, @@ -1225,7 +1217,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_CHECKBUTTON_CONTAINER: case MOZ_GTK_RADIOBUTTON_CONTAINER: -@@ -3324,7 +3541,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, cairo_t *cr, +@@ -3324,7 +3541,7 @@ moz_gtk_widget_paint(GtkThemeWidgetType (GtkArrowType) flags, direction); break; case MOZ_GTK_MENUBAR: @@ -1234,7 +1226,7 @@ index a716b8d..d7ee658 100644 break; case MOZ_GTK_MENUPOPUP: return moz_gtk_menu_popup_paint(cr, rect, direction); -@@ -3375,7 +3592,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget(void) +@@ -3375,7 +3592,7 @@ GtkWidget* moz_gtk_get_scrollbar_widget( { MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); ensure_scrollbar_widget(); @@ -1243,7 +1235,7 @@ index a716b8d..d7ee658 100644 } gboolean moz_gtk_has_scrollbar_buttons(void) -@@ -3383,7 +3600,7 @@ gboolean moz_gtk_has_scrollbar_buttons(void) +@@ -3383,7 +3600,7 @@ gboolean moz_gtk_has_scrollbar_buttons(v gboolean backward, forward, secondary_backward, secondary_forward; MOZ_ASSERT(is_initialized, "Forgot to call moz_gtk_init()"); ensure_scrollbar_widget(); @@ -1294,10 +1286,9 @@ index a716b8d..d7ee658 100644 gTabWidget = NULL; gTooltipWidget = NULL; gMenuBarWidget = NULL; -diff --git c/widget/gtk/gtkdrawing.h i/widget/gtk/gtkdrawing.h -index 9e5c38d..7aa7af0 100644 ---- c/widget/gtk/gtkdrawing.h -+++ i/widget/gtk/gtkdrawing.h +diff -up firefox-45.0.1/widget/gtk/gtkdrawing.h.gtk3-20 firefox-45.0.1/widget/gtk/gtkdrawing.h +--- firefox-45.0.1/widget/gtk/gtkdrawing.h.gtk3-20 2016-03-15 23:37:46.000000000 +0100 ++++ firefox-45.0.1/widget/gtk/gtkdrawing.h 2016-04-05 14:40:27.847088629 +0200 @@ -67,6 +67,13 @@ typedef enum { MOZ_GTK_TAB_SELECTED = 1 << 10 } GtkTabFlags; @@ -1312,7 +1303,7 @@ index 9e5c38d..7aa7af0 100644 /** flags for menuitems **/ typedef enum { /* menuitem is part of the menubar */ -@@ -394,6 +401,10 @@ gint moz_gtk_get_tab_scroll_arrow_size(gint* width, gint* height); +@@ -394,6 +401,10 @@ gint moz_gtk_get_tab_scroll_arrow_size(g */ gint moz_gtk_get_arrow_size(gint* width, gint* height); @@ -1323,7 +1314,7 @@ index 9e5c38d..7aa7af0 100644 /** * Get the desired size of a toolbar separator * size: [OUT] the desired width -@@ -464,6 +475,12 @@ gboolean moz_gtk_images_in_buttons(void); +@@ -464,6 +475,12 @@ gboolean moz_gtk_images_in_buttons(void) */ gboolean moz_gtk_has_scrollbar_buttons(void); @@ -1336,11 +1327,10 @@ index 9e5c38d..7aa7af0 100644 #ifdef __cplusplus } #endif /* __cplusplus */ -diff --git c/widget/gtk/mozgtk/mozgtk.c i/widget/gtk/mozgtk/mozgtk.c -index 0bb4dfd..2a9ff1a 100644 ---- c/widget/gtk/mozgtk/mozgtk.c -+++ i/widget/gtk/mozgtk/mozgtk.c -@@ -502,6 +502,11 @@ STUB(gtk_window_set_type_hint) +diff -up firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c +--- firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c.gtk3-20 2016-04-05 14:40:27.799088451 +0200 ++++ firefox-45.0.1/widget/gtk/mozgtk/mozgtk.c 2016-04-05 15:16:17.401430826 +0200 +@@ -503,6 +503,11 @@ STUB(gtk_window_set_type_hint) STUB(gtk_window_set_wmclass) STUB(gtk_window_unfullscreen) STUB(gtk_window_unmaximize) @@ -1352,7 +1342,7 @@ index 0bb4dfd..2a9ff1a 100644 #endif #ifdef GTK3_SYMBOLS -@@ -549,6 +554,7 @@ STUB(gtk_style_context_get_border_color) +@@ -550,6 +555,7 @@ STUB(gtk_style_context_get_border_color) STUB(gtk_style_context_get_color) STUB(gtk_style_context_get_margin) STUB(gtk_style_context_get_padding) @@ -1360,7 +1350,7 @@ index 0bb4dfd..2a9ff1a 100644 STUB(gtk_style_context_has_class) STUB(gtk_style_context_new) STUB(gtk_style_context_remove_class) -@@ -576,6 +582,13 @@ STUB(gtk_color_chooser_get_type) +@@ -577,6 +583,13 @@ STUB(gtk_color_chooser_get_type) STUB(gtk_color_chooser_set_rgba) STUB(gtk_color_chooser_get_rgba) STUB(gtk_color_chooser_set_use_alpha) @@ -1374,16 +1364,15 @@ index 0bb4dfd..2a9ff1a 100644 #endif #ifdef GTK2_SYMBOLS -diff --git c/widget/gtk/nsLookAndFeel.cpp i/widget/gtk/nsLookAndFeel.cpp -index 52edfb2..fc0c585a 100644 ---- c/widget/gtk/nsLookAndFeel.cpp -+++ i/widget/gtk/nsLookAndFeel.cpp -@@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) +diff -up firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20 firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp +--- firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp.gtk3-20 2016-03-15 23:37:46.000000000 +0100 ++++ firefox-45.0.1/widget/gtk/nsLookAndFeel.cpp 2016-04-05 14:40:27.848088632 +0200 +@@ -232,14 +232,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI case eColorID_activeborder: // active window border gtk_style_context_get_border_color(mBackgroundStyle, - GTK_STATE_FLAG_NORMAL, &gdk_color); -+ gtk_style_context_get_state(mBackgroundStyle), ++ gtk_style_context_get_state(mBackgroundStyle), + &gdk_color); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; @@ -1393,13 +1382,13 @@ index 52edfb2..fc0c585a 100644 + gtk_style_context_set_state(mBackgroundStyle, GTK_STATE_FLAG_INSENSITIVE); gtk_style_context_get_border_color(mBackgroundStyle, - GTK_STATE_FLAG_INSENSITIVE, -+ gtk_style_context_get_state(mBackgroundStyle), ++ gtk_style_context_get_state(mBackgroundStyle), &gdk_color); + gtk_style_context_restore(mBackgroundStyle); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; case eColorID_graytext: // disabled text in windows, menus, etc. -@@ -248,9 +252,12 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) +@@ -248,9 +252,12 @@ nsLookAndFeel::NativeGetColor(ColorID aI break; case eColorID_inactivecaption: // inactive window caption @@ -1407,13 +1396,13 @@ index 52edfb2..fc0c585a 100644 + gtk_style_context_set_state(mBackgroundStyle, GTK_STATE_FLAG_INSENSITIVE); gtk_style_context_get_background_color(mBackgroundStyle, - GTK_STATE_FLAG_INSENSITIVE, -+ gtk_style_context_get_state(mBackgroundStyle), ++ gtk_style_context_get_state(mBackgroundStyle), &gdk_color); + gtk_style_context_restore(mBackgroundStyle); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); break; #endif -@@ -376,13 +383,17 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor) +@@ -376,13 +383,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI case eColorID__moz_buttondefault: // default button border color gtk_style_context_get_border_color(mButtonStyle, @@ -1427,7 +1416,7 @@ index 52edfb2..fc0c585a 100644 + gtk_style_context_set_state(mButtonStyle, GTK_STATE_FLAG_PRELIGHT); gtk_style_context_get_background_color(mButtonStyle, - GTK_STATE_FLAG_PRELIGHT, -+ gtk_style_context_get_state(mButtonStyle), ++ gtk_style_context_get_state(mButtonStyle), &gdk_color); + gtk_style_context_restore(mButtonStyle); aColor = GDK_RGBA_TO_NS_RGBA(gdk_color); @@ -1600,11 +1589,10 @@ index 52edfb2..fc0c585a 100644 #endif // Some themes have a unified menu bar, and support window dragging on it gboolean supports_menubar_drag = FALSE; -diff --git c/widget/gtk/nsNativeThemeGTK.cpp i/widget/gtk/nsNativeThemeGTK.cpp -index fd5a67d..5bc8fa1 100644 ---- c/widget/gtk/nsNativeThemeGTK.cpp -+++ i/widget/gtk/nsNativeThemeGTK.cpp -@@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext, +diff -up firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp +--- firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp.gtk3-20 2016-03-15 23:37:46.000000000 +0100 ++++ firefox-45.0.1/widget/gtk/nsNativeThemeGTK.cpp 2016-04-05 14:40:27.848088632 +0200 +@@ -1548,9 +1548,6 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n case NS_THEME_RADIO_CONTAINER: case NS_THEME_CHECKBOX_LABEL: case NS_THEME_RADIO_LABEL: @@ -1614,10 +1602,11 @@ index fd5a67d..5bc8fa1 100644 case NS_THEME_TREEVIEW_HEADER_CELL: { // Just include our border, and let the box code augment the size. -@@ -1561,6 +1558,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(nsPresContext* aPresContext, +@@ -1560,6 +1557,21 @@ nsNativeThemeGTK::GetMinimumWidgetSize(n + aResult->width = border.left + border.right; aResult->height = border.top + border.bottom; } - break; ++ break; + case NS_THEME_BUTTON: + case NS_THEME_DROPDOWN: + case NS_THEME_TOOLBAR_BUTTON: @@ -1631,8 +1620,7 @@ index fd5a67d..5bc8fa1 100644 + case NS_THEME_TEXTFIELD_MULTILINE: + { + moz_gtk_get_entry_height(&aResult->height); -+ } -+ break; ++ } + break; case NS_THEME_TOOLBAR_SEPARATOR: { - gint separator_width; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
