Hello community, here is the log from the commit of package gtk3-engine-murrine for openSUSE:Factory checked in at Sat Nov 20 12:35:51 CET 2010. -------- --- GNOME/gtk3-engine-murrine/gtk3-engine-murrine.changes 2010-10-15 11:50:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk3-engine-murrine/gtk3-engine-murrine.changes 2010-11-08 20:21:25.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 8 14:13:16 EST 2010 - vuntz@opensuse.org + +- Add gtk3-engine-murrine-additional-fixes.patch to fix use of + undefined symbols and various warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtk3-engine-murrine-additional-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3-engine-murrine.spec ++++++ --- /var/tmp/diff_new_pack.Ko3uLA/_old 2010-11-20 12:35:41.000000000 +0100 +++ /var/tmp/diff_new_pack.Ko3uLA/_new 2010-11-20 12:35:41.000000000 +0100 @@ -22,7 +22,7 @@ %define _name murrine Summary: Murrine GTK Theme Engine Version: 0.98.1.1_git -Release: 2 +Release: 3 %define _version 0.98.1.1 License: LGPLv2.1 | LGPLv3 Group: System/GUI/GNOME @@ -31,6 +31,8 @@ Source2: baselibs.conf # PATCH-FIX-UPSTREAM gtk3-engine-murrine-git-branch.patch vuntz@opensuse.org -- Patch to use the gtk+3 branch Patch0: gtk3-engine-murrine-git-branch.patch +# PATCH-FIX-UPSTREAM gtk3-engine-murrine-additional-fixes.patch bgo#634346 bgo#634348 vuntz@opensuse.org -- Fixes to work with latest gtk+ 3 and fix warnings +Patch1: gtk3-engine-murrine-additional-fixes.patch BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: pkg-config @@ -44,6 +46,7 @@ %prep %setup -q -n %{_name}-%{_version} %patch0 -p1 +%patch1 -p1 %build autoreconf -fi @@ -62,6 +65,7 @@ %doc AUTHORS COPYING COPYING.2.1 ChangeLog NEWS README TODO %{_libdir}/gtk-3.0/*/engines/libmurrine.so %dir %{_datadir}/gtk-engines +%dir %{_datadir}/gtk-engines/3.0 %{_datadir}/gtk-engines/3.0/murrine.xml %changelog ++++++ gtk3-engine-murrine-additional-fixes.patch ++++++
From 4e2c8b18569bc0982a898496412c6527796ce2a5 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:05:01 -0500 Subject: [PATCH 1/8] Update for GTK+ 3 changes
GTK_WIDGET_DRAWABLE doesn't exist anymore, and GtkComboBoxEntry has been removed. https://bugzilla.gnome.org/show_bug.cgi?id=634346 --- src/animation.c | 2 +- src/support.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/animation.c b/src/animation.c index feb8a10..29af661 100644 --- a/src/animation.c +++ b/src/animation.c @@ -161,7 +161,7 @@ update_animation_info (gpointer key, gpointer value, gpointer user_data) g_assert_not_reached (); /* remove the widget from the hash table if it is not drawable */ - if (!GTK_WIDGET_DRAWABLE (widget)) + if (!gtk_widget_is_drawable (widget)) return TRUE; if (GTK_IS_PROGRESS_BAR (widget)) diff --git a/src/support.c b/src/support.c index 95850fe..e8f6498 100644 --- a/src/support.c +++ b/src/support.c @@ -128,7 +128,7 @@ murrine_find_combo_box_widget (GtkWidget *widget) { GtkWidget *result = NULL; - if (widget && !GTK_IS_COMBO_BOX_ENTRY (widget)) + if (widget) { if (GTK_IS_COMBO_BOX (widget)) result = widget; -- 1.7.3.1
From 8d209cb6f2ca62e2e7ef53cfbad6c5cecbef7738 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:06:43 -0500 Subject: [PATCH 2/8] Remove unneeded argument to g_scanner_warn()
This causes a warning. https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_rc_style.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/murrine_rc_style.c b/src/murrine_rc_style.c index 96786d4..36bed89 100644 --- a/src/murrine_rc_style.c +++ b/src/murrine_rc_style.c @@ -803,19 +803,19 @@ murrine_rc_style_parse (GtkRcStyle *rc_style, token = murrine_gtk2_rc_parse_dummy (settings, scanner, "gradients"); break; case TOKEN_HILIGHT_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"hilight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead.", "hilight_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"hilight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead."); double hilight_ratio; token = theme_parse_shade (settings, scanner, &hilight_ratio); murrine_style->highlight_shade = hilight_ratio/0.909090; murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE; break; case TOKEN_HIGHLIGHT_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"highlight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead.", "highlight_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"highlight_ratio\" will be deprecated in future releases. Please use \"highlight_shade\" instead."); token = theme_parse_shade (settings, scanner, &murrine_style->highlight_shade); murrine_style->flags |= MRN_FLAG_HIGHLIGHT_SHADE; break; case TOKEN_LIGHTBORDER_RATIO: - g_scanner_warn (scanner, "Murrine configuration option \"lightborder_ratio\" will be deprecated in future releases. Please use \"lightborder_shade\" instead.", "lightborder_ratio"); + g_scanner_warn (scanner, "Murrine configuration option \"lightborder_ratio\" will be deprecated in future releases. Please use \"lightborder_shade\" instead."); token = theme_parse_shade (settings, scanner, &murrine_style->lightborder_shade); murrine_style->flags |= MRN_FLAG_LIGHTBORDER_SHADE; break; -- 1.7.3.1
From f963b0c384243907219f9b473863b8640a4723c5 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:10:54 -0500 Subject: [PATCH 3/8] Remove unused variables
https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/animation.c | 1 - src/murrine_draw.c | 2 -- src/murrine_draw_rgba.c | 2 -- src/murrine_style.c | 4 ---- 4 files changed, 0 insertions(+), 9 deletions(-) diff --git a/src/animation.c b/src/animation.c index 29af661..d0d5f3f 100644 --- a/src/animation.c +++ b/src/animation.c @@ -155,7 +155,6 @@ update_animation_info (gpointer key, gpointer value, gpointer user_data) { AnimationInfo *animation_info = value; GtkWidget *widget = key; - gdouble elapsed; if ((widget == NULL) || (animation_info == NULL)) g_assert_not_reached (); diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 01e1beb..605b0b2 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -1346,8 +1346,6 @@ murrine_draw_tab (cairo_t *cr, const TabParameters *tab, int x, int y, int width, int height) { - const MurrineRGB *stripe_fill = &colors->spot[1]; - const MurrineRGB *stripe_border = &colors->spot[2]; const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; cairo_pattern_t *pat; diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index 539e965..eaf8fe0 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1128,8 +1128,6 @@ murrine_rgba_draw_tab (cairo_t *cr, const TabParameters *tab, int x, int y, int width, int height) { - const MurrineRGB *stripe_fill = &colors->spot[1]; - const MurrineRGB *stripe_border = &colors->spot[2]; const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; cairo_pattern_t *pat; diff --git a/src/murrine_style.c b/src/murrine_style.c index 99ace6e..8e3bfff 100644 --- a/src/murrine_style.c +++ b/src/murrine_style.c @@ -1337,7 +1337,6 @@ murrine_style_draw_box (DRAW_ARGS) if (murrine_style->roundness > 1) { ScrollBarStepperParameters stepper; - GdkRectangle this_rectangle = { x, y, width, height }; if (g_str_equal(detail + 10, "_start")) stepper.stepper = MRN_STEPPER_START; @@ -1483,7 +1482,6 @@ murrine_style_draw_slider (DRAW_ARGS, GtkOrientation orientation) { WidgetParameters params; ScrollBarParameters scrollbar; - boolean within_bevel = FALSE; scrollbar.has_color = FALSE; scrollbar.horizontal = (orientation == GTK_ORIENTATION_HORIZONTAL); @@ -1752,8 +1750,6 @@ murrine_style_draw_resize_grip (GtkStyle *style, ResizeGripParameters grip; grip.edge = (MurrineWindowEdge)edge; - int lx, ly; - if (edge != GDK_WINDOW_EDGE_SOUTH_EAST) return; /* sorry... need to work on this :P */ -- 1.7.3.1
From 911a32047ddd0eddb7dec5b51b748f5e1291f81a Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:13:04 -0500 Subject: [PATCH 4/8] Add function declarations to support.h to fix warnings
https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/support.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/support.h b/src/support.h index e0c7d17..d9dea9d 100644 --- a/src/support.h +++ b/src/support.h @@ -119,6 +119,8 @@ #define MRN_WIDGET_HAS_DEFAULT(object) ((object) && MRN_IS_WIDGET(object) && GTK_WIDGET_HAS_DEFAULT(object)) G_GNUC_INTERNAL GtkTextDirection murrine_get_direction (GtkWidget *widget); +G_GNUC_INTERNAL gboolean murrine_widget_is_ltr (GtkWidget *widget); +G_GNUC_INTERNAL gboolean murrine_object_is_a (const GObject * object, const gchar * type_name); G_GNUC_INTERNAL GtkWidget *murrine_special_get_ancestor (GtkWidget *widget, GType widget_type); G_GNUC_INTERNAL GdkColor* murrine_get_parent_bgcolor (GtkWidget *widget); G_GNUC_INTERNAL GtkWidget* murrine_get_parent_window (GtkWidget *widget); -- 1.7.3.1
From 822299634f8df37039b6661d57e6a766b201f641 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:38:07 -0500 Subject: [PATCH 5/8] Initialize some variables to remove warnings
https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 6 +++--- src/murrine_draw_rgba.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 605b0b2..184aa69 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -1261,8 +1261,8 @@ murrine_draw_frame (cairo_t *cr, int x, int y, int width, int height) { MurrineRGB *border = frame->border; - MurrineRectangle bevel_clip; - MurrineRectangle frame_clip; + MurrineRectangle bevel_clip = { 0, 0, 0, 0 }; + MurrineRectangle frame_clip = { 0, 0, 0, 0 }; const MurrineRGB *dark = &colors->shade[3]; MurrineRGB highlight, shadow_color; @@ -1348,7 +1348,7 @@ murrine_draw_tab (cairo_t *cr, { const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; - cairo_pattern_t *pat; + cairo_pattern_t *pat = NULL; /* Set clip */ cairo_rectangle (cr, x, y, width, height); diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index eaf8fe0..5743b2c 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1043,8 +1043,8 @@ murrine_rgba_draw_frame (cairo_t *cr, int x, int y, int width, int height) { MurrineRGB *border = frame->border; - MurrineRectangle bevel_clip; - MurrineRectangle frame_clip; + MurrineRectangle bevel_clip = { 0, 0, 0, 0 }; + MurrineRectangle frame_clip = { 0, 0, 0, 0 }; const MurrineRGB *dark = &colors->shade[5]; MurrineRGB highlight, shadow_color; @@ -1130,7 +1130,7 @@ murrine_rgba_draw_tab (cairo_t *cr, { const MurrineRGB *fill = &colors->bg[widget->state_type]; const MurrineRGB *border = &colors->shade[!widget->active ? 5 : 4]; - cairo_pattern_t *pat; + cairo_pattern_t *pat = NULL; /* Set clip */ cairo_rectangle (cr, x, y, width, height); -- 1.7.3.1
From 662a5a1f89cecc1b2aaf284d693d28ab73113f73 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:40:23 -0500 Subject: [PATCH 6/8] Remove unused static functions
https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 10 ---------- src/murrine_style.c | 15 --------------- 2 files changed, 0 insertions(+), 25 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 184aa69..5c211b4 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -3373,16 +3373,6 @@ murrine_draw_focus_classic (cairo_t *cr, } static void -murrine_draw_tab_focus (cairo_t *cr, - const MurrineColors *colors, - const WidgetParameters *widget, - const FocusParameters *focus, - int x, int y, int width, int height) -{ - -} - -static void murrine_draw_focus_border (cairo_t *cr, const MurrineColors *colors, const WidgetParameters *widget, diff --git a/src/murrine_style.c b/src/murrine_style.c index 8e3bfff..edcd6be 100644 --- a/src/murrine_style.c +++ b/src/murrine_style.c @@ -2376,21 +2376,6 @@ murrine_style_realize (GtkStyle *style) } static void -gdk_cairo_set_source_color_alpha (cairo_t *cr, - GdkColor *color, - float alpha) -{ - g_return_if_fail (cr != NULL); - g_return_if_fail (color != NULL); - - cairo_set_source_rgba (cr, - color->red/65535., - color->green/65535., - color->blue/65535., - alpha); -} - -static void murrine_style_copy (GtkStyle *style, GtkStyle *src) { MurrineStyle *mrn_style = MURRINE_STYLE (style); -- 1.7.3.1
From 036cfe4c599b53c438128089f26f5ca54d4350e1 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:42:26 -0500 Subject: [PATCH 7/8] Use MRN_SHADOW_* instead of GTK_SHADOW_*
This is needed to avoid warnings when comparing of MurrineShadowType. https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/murrine_draw.c | 8 ++++---- src/murrine_draw_rgba.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/murrine_draw.c b/src/murrine_draw.c index 5c211b4..318511b 100644 --- a/src/murrine_draw.c +++ b/src/murrine_draw.c @@ -2775,13 +2775,13 @@ murrine_draw_radiobutton (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = width+height; double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) @@ -2919,13 +2919,13 @@ murrine_draw_checkbox (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = CLAMP (widget->roundness, 0, 2); double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) diff --git a/src/murrine_draw_rgba.c b/src/murrine_draw_rgba.c index 5743b2c..05cb5ea 100644 --- a/src/murrine_draw_rgba.c +++ b/src/murrine_draw_rgba.c @@ -1821,13 +1821,13 @@ murrine_rgba_draw_radiobutton (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = width+height; double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) @@ -1967,13 +1967,13 @@ murrine_rgba_draw_checkbox (cairo_t *cr, const MurrineRGB *bg = &colors->base[0]; gboolean inconsistent = FALSE; gboolean draw_box = !checkbox->in_menu; - gboolean draw_bullet = (checkbox->shadow_type == GTK_SHADOW_IN); + gboolean draw_bullet = (checkbox->shadow_type == MRN_SHADOW_IN); int roundness = CLAMP (widget->roundness, 0, 2); double highlight_shade_new = widget->highlight_shade; double lightborder_shade_new = widget->lightborder_shade; MurrineGradients mrn_gradient_new = widget->mrn_gradient; - inconsistent = (checkbox->shadow_type == GTK_SHADOW_ETCHED_IN); + inconsistent = (checkbox->shadow_type == MRN_SHADOW_ETCHED_IN); draw_bullet |= inconsistent; if (widget->state_type == GTK_STATE_INSENSITIVE) -- 1.7.3.1
From 12fc4543a3362f045eaf875474cd442024d35631 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vuntz@gnome.org> Date: Mon, 8 Nov 2010 13:45:17 -0500 Subject: [PATCH 8/8] Help compiler find out that a variable is always set
https://bugzilla.gnome.org/show_bug.cgi?id=634348 --- src/cairo-support.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cairo-support.c b/src/cairo-support.c index 2a3592c..c09572d 100644 --- a/src/cairo-support.c +++ b/src/cairo-support.c @@ -85,7 +85,7 @@ murrine_rgb_to_hls (gdouble *r, h = (green-blue)/delta; else if (green == max) h = 2+(blue-red)/delta; - else if (blue == max) + else /* ie: if (blue == max) */ h = 4+(red-green)/delta; h *= 60; -- 1.7.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org