Hello community, here is the log from the commit of package libyui-gtk for openSUSE:Factory checked in at 2013-04-26 13:32:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old) and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2013-02-12 16:40:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes 2013-04-26 13:32:41.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 24 09:14:01 CEST 2013 - [email protected] + +- GTK compilation fix +- 2.42.4 + +------------------------------------------------------------------- Old: ---- libyui-gtk-2.42.3.tar.bz2 New: ---- libyui-gtk-2.42.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-gtk-doc.spec ++++++ --- /var/tmp/diff_new_pack.6HdkO8/_old 2013-04-26 13:32:42.000000000 +0200 +++ /var/tmp/diff_new_pack.6HdkO8/_new 2013-04-26 13:32:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-gtk (Version 2.42.3) +# spec file for package libyui-gtk (Version 2.42.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-gtk-doc -Version: 2.42.3 +Version: 2.42.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{version}.tar.bz2 ++++++ libyui-gtk.spec ++++++ --- /var/tmp/diff_new_pack.6HdkO8/_old 2013-04-26 13:32:43.000000000 +0200 +++ /var/tmp/diff_new_pack.6HdkO8/_new 2013-04-26 13:32:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-gtk (Version 2.42.3) +# spec file for package libyui-gtk (Version 2.42.4) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild Name: libyui-gtk -Version: 2.42.3 +Version: 2.42.4 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-gtk-%{version}.tar.bz2 ++++++ libyui-gtk-2.42.3.tar.bz2 -> libyui-gtk-2.42.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.3/ChangeLog new/libyui-gtk-2.42.4/ChangeLog --- old/libyui-gtk-2.42.3/ChangeLog 2013-02-11 16:57:46.000000000 +0100 +++ new/libyui-gtk-2.42.4/ChangeLog 2013-04-24 15:07:31.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 24 09:14:01 CEST 2013 - [email protected] + +- GTK compilation fix +- 2.42.4 + +------------------------------------------------------------------- Mon Feb 11 16:53:11 CET 2013 - [email protected] - Fixed window size (bnc #722053) - 2.42.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.3/VERSION.cmake new/libyui-gtk-2.42.4/VERSION.cmake --- old/libyui-gtk-2.42.3/VERSION.cmake 2013-02-11 16:57:46.000000000 +0100 +++ new/libyui-gtk-2.42.4/VERSION.cmake 2013-04-24 15:07:31.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "3" ) +SET( VERSION_PATCH "4" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.3/src/YGUtils.cc new/libyui-gtk-2.42.4/src/YGUtils.cc --- old/libyui-gtk-2.42.3/src/YGUtils.cc 2013-02-11 16:57:46.000000000 +0100 +++ new/libyui-gtk-2.42.4/src/YGUtils.cc 2013-04-24 15:07:31.000000000 +0200 @@ -462,8 +462,9 @@ { GtkStyleContext *style_ctx = gtk_widget_get_style_context(widget); PangoContext *context = gtk_widget_get_pango_context (widget); - PangoFontMetrics *metrics = pango_context_get_metrics (context, - gtk_style_context_get_font(style_ctx, GTK_STATE_FLAG_NORMAL), NULL); + PangoFontDescription *font_desc; + gtk_style_context_get (style_ctx, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); + PangoFontMetrics *metrics = pango_context_get_metrics (context, font_desc, NULL); int width = pango_font_metrics_get_approximate_char_width (metrics); pango_font_metrics_unref (metrics); @@ -475,8 +476,9 @@ { GtkStyleContext *style_ctx = gtk_widget_get_style_context(widget); PangoContext *context = gtk_widget_get_pango_context (widget); - PangoFontMetrics *metrics = pango_context_get_metrics (context, - gtk_style_context_get_font(style_ctx, GTK_STATE_FLAG_NORMAL), NULL); + PangoFontDescription *font_desc; + gtk_style_context_get (style_ctx, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); + PangoFontMetrics *metrics = pango_context_get_metrics (context, font_desc, NULL); int height = pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics); @@ -489,7 +491,8 @@ double scale) { GtkStyleContext *style_ctx = gtk_widget_get_style_context(widget); - const PangoFontDescription *font_desc = gtk_style_context_get_font(style_ctx, GTK_STATE_FLAG_NORMAL); + PangoFontDescription *font_desc; + gtk_style_context_get (style_ctx, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); int size = pango_font_description_get_size (font_desc); PangoFontDescription* font = pango_font_description_new(); @@ -497,7 +500,6 @@ pango_font_description_set_size (font, (int)(size * scale)); pango_font_description_set_style (font, style); gtk_widget_override_font (widget, font); - pango_font_description_free (font); } void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.3/src/ygtklinklabel.c new/libyui-gtk-2.42.4/src/ygtklinklabel.c --- old/libyui-gtk-2.42.3/src/ygtklinklabel.c 2013-02-11 16:57:46.000000000 +0100 +++ new/libyui-gtk-2.42.4/src/ygtklinklabel.c 2013-04-24 15:07:31.000000000 +0200 @@ -110,6 +110,7 @@ ygtk_link_label_ensure_layout (label); requisition->width = requisition->height = 0; GtkStyleContext *style_ctx; + PangoFontDescription *font_desc; style_ctx = gtk_widget_get_style_context(widget); // if (label->text && *label->text) { @@ -117,7 +118,8 @@ PangoFontMetrics *metrics; gint ascent, descent; context = pango_layout_get_context (label->layout); - metrics = pango_context_get_metrics (context, gtk_style_context_get_font(style_ctx, GTK_STATE_FLAG_NORMAL), + gtk_style_context_get (style_ctx, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); + metrics = pango_context_get_metrics (context, font_desc, pango_context_get_language (context)); ascent = pango_font_metrics_get_ascent (metrics); descent = pango_font_metrics_get_descent (metrics); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.42.3/src/ygtktextview.c new/libyui-gtk-2.42.4/src/ygtktextview.c --- old/libyui-gtk-2.42.3/src/ygtktextview.c 2013-02-11 16:57:46.000000000 +0100 +++ new/libyui-gtk-2.42.4/src/ygtktextview.c 2013-04-24 15:07:31.000000000 +0200 @@ -39,7 +39,11 @@ gtk_text_buffer_select_range (buffer, &start, &end); } +#if GTK_CHECK_VERSION(3, 8, 0) +static void ygtk_text_view_populate_popup (GtkTextView *view, GtkWidget *menu) +#else static void ygtk_text_view_populate_popup (GtkTextView *view, GtkMenu *menu) +#endif { if (gtk_text_view_get_editable (view)) return; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
