Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at 2015-03-30 19:13:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metacity (Old) and /work/SRC/openSUSE:Factory/.metacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "metacity" Changes: -------- --- /work/SRC/openSUSE:Factory/metacity/metacity.changes 2015-01-30 06:12:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.metacity.new/metacity.changes 2015-03-30 19:13:57.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jan 29 11:39:06 UTC 2015 - [email protected] + +- Update to version 3.15.2: + + Fix deprecated warnings. + +------------------------------------------------------------------- Old: ---- metacity-3.14.3.tar.xz New: ---- metacity-3.15.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.vIFlGy/_old 2015-03-30 19:13:58.000000000 +0200 +++ /var/tmp/diff_new_pack.vIFlGy/_new 2015-03-30 19:13:58.000000000 +0200 @@ -17,12 +17,12 @@ Name: metacity -Version: 3.14.3 +Version: 3.15.2 Release: 0 Summary: A Window Manager for the GNOME Desktop License: GPL-2.0+ Group: System/GUI/GNOME -Source: http://download.gnome.org/sources/metacity/3.14/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/metacity/3.15/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE metacity-bnc385553-buggy-intel-xinerama.diff bnc#385553 [email protected] - Sanitize overlapping (cloned) monitors from Xinerama Patch11: metacity-bnc385553-buggy-intel-xinerama.diff Url: http://www.gnome.org @@ -41,7 +41,7 @@ BuildRequires: zenity BuildRequires: pkgconfig(gio-2.0) >= 2.25.10 BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.3.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.15.2 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(xcomposite) >= 0.2 BuildRequires: pkgconfig(xcursor) ++++++ metacity-3.14.3.tar.xz -> metacity-3.15.2.tar.xz ++++++ ++++ 2820 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/NEWS new/metacity-3.15.2/NEWS --- old/metacity-3.14.3/NEWS 2014-11-24 13:09:14.000000000 +0100 +++ new/metacity-3.15.2/NEWS 2014-11-24 19:19:29.000000000 +0100 @@ -1,3 +1,7 @@ +Version 3.15.2 +============== +- Fix deprecated warnings. (Alberts Muktupāvels) + Version 3.14.3 ============== - Use correct icon name [image-missing] for missing icon. (Alberts Muktupāvels) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/configure.ac new/metacity-3.15.2/configure.ac --- old/metacity-3.14.3/configure.ac 2014-11-24 13:04:15.000000000 +0100 +++ new/metacity-3.15.2/configure.ac 2014-11-24 19:18:36.000000000 +0100 @@ -1,8 +1,8 @@ AC_PREREQ(2.50) m4_define([metacity_major_version], [3]) -m4_define([metacity_minor_version], [14]) -m4_define([metacity_micro_version], [3]) +m4_define([metacity_minor_version], [15]) +m4_define([metacity_micro_version], [2]) m4_define([metacity_version], [metacity_major_version.metacity_minor_version.metacity_micro_version]) @@ -109,7 +109,7 @@ changequote([,])dnl GTK_API_VERSION=3.0 -GTK_MIN_VERSION=3.12.0 +GTK_MIN_VERSION=3.15.2 GIO_MIN_VERSION=2.25.10 CANBERRA_GTK=libcanberra-gtk3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/tools/metacity-window-demo.c new/metacity-3.15.2/src/tools/metacity-window-demo.c --- old/metacity-3.14.3/src/tools/metacity-window-demo.c 2014-10-08 22:48:48.000000000 +0200 +++ new/metacity-3.15.2/src/tools/metacity-window-demo.c 2014-11-24 16:35:28.000000000 +0100 @@ -665,6 +665,26 @@ } static void +override_background_color (GtkWidget *widget, + GdkRGBA *rgba) +{ + gchar *css; + GtkCssProvider *provider; + + provider = gtk_css_provider_new (); + + css = g_strdup_printf ("* { background-color: %s; }", + gdk_rgba_to_string (rgba)); + gtk_css_provider_load_from_data (provider, css, -1, NULL); + g_free (css); + + gtk_style_context_add_provider (gtk_widget_get_style_context (widget), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (provider); +} + +static void desktop_cb (GSimpleAction *action, GVariant *parameter, gpointer callback_data) @@ -685,7 +705,7 @@ desktop_color.blue = 0.65; desktop_color.alpha = 1.0; - gtk_widget_override_background_color (window, 0, &desktop_color); + override_background_color (window, &desktop_color); label = focus_label (window); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/ui/draw-workspace.c new/metacity-3.15.2/src/ui/draw-workspace.c --- old/metacity-3.14.3/src/ui/draw-workspace.c 2014-10-05 13:17:17.000000000 +0200 +++ new/metacity-3.15.2/src/ui/draw-workspace.c 2014-11-24 15:29:08.000000000 +0100 @@ -87,7 +87,7 @@ if (is_active) meta_gtk_style_get_light_color (style, state, &color); else - gtk_style_context_get_background_color (style, state, &color); + gtk_style_context_get (style, state, "background-color", &color, NULL); gdk_cairo_set_source_rgba (cr, &color); cairo_rectangle (cr, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/ui/menu.c new/metacity-3.15.2/src/ui/menu.c --- old/metacity-3.14.3/src/ui/menu.c 2014-10-08 21:51:58.000000000 +0200 +++ new/metacity-3.15.2/src/ui/menu.c 2014-11-24 14:01:10.000000000 +0100 @@ -295,7 +295,7 @@ meta_core_get_menu_accelerator (menuitem->op, workspace_id, &key, &mods); accel_label = meta_accel_label_new_with_mnemonic (i18n_label); - gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5); + gtk_label_set_xalign (GTK_LABEL (accel_label), 0.0); gtk_container_add (GTK_CONTAINER (mi), accel_label); gtk_widget_show (accel_label); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/ui/metaaccellabel.c new/metacity-3.15.2/src/ui/metaaccellabel.c --- old/metacity-3.14.3/src/ui/metaaccellabel.c 2014-10-05 13:17:17.000000000 +0200 +++ new/metacity-3.15.2/src/ui/metaaccellabel.c 2014-11-24 14:10:12.000000000 +0100 @@ -239,7 +239,6 @@ cairo_t *cr) { MetaAccelLabel *accel_label = META_ACCEL_LABEL (widget); - GtkMisc *misc = GTK_MISC (accel_label); GtkTextDirection direction; int ac_width; GtkAllocation allocation; @@ -258,10 +257,11 @@ PangoLayout *accel_layout; GtkLabel *label = GTK_LABEL (widget); gint x, y, xpad, ypad; - gfloat xalign, yalign; + gint margin_start, margin_end, margin_top, margin_bottom; + gfloat yalign; label_layout = gtk_label_get_layout (GTK_LABEL (accel_label)); - gtk_misc_get_alignment (misc, &xalign, &yalign); + yalign = gtk_label_get_yalign (GTK_LABEL (accel_label)); cairo_save (cr); @@ -288,7 +288,13 @@ cairo_restore (cr); - gtk_misc_get_padding (misc, &xpad, &ypad); + margin_start = gtk_widget_get_margin_start (widget); + margin_end = gtk_widget_get_margin_end (widget); + margin_top = gtk_widget_get_margin_top (widget); + margin_bottom = gtk_widget_get_margin_bottom (widget); + + xpad = margin_start + margin_end; + ypad = margin_top + margin_bottom; if (direction == GTK_TEXT_DIR_RTL) x = xpad; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/ui/theme-viewer.c new/metacity-3.15.2/src/ui/theme-viewer.c --- old/metacity-3.14.3/src/ui/theme-viewer.c 2014-10-08 20:21:06.000000000 +0200 +++ new/metacity-3.15.2/src/ui/theme-viewer.c 2014-11-24 18:51:11.000000000 +0100 @@ -357,6 +357,26 @@ return frame; } +static void +override_background_color (GtkWidget *widget, + GdkRGBA *rgba) +{ + gchar *css; + GtkCssProvider *provider; + + provider = gtk_css_provider_new (); + + css = g_strdup_printf ("* { background-color: %s; }", + gdk_rgba_to_string (rgba)); + gtk_css_provider_load_from_data (provider, css, -1, NULL); + g_free (css); + + gtk_style_context_add_provider (gtk_widget_get_style_context (widget), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (provider); +} + static GtkWidget* border_only_contents (void) { @@ -371,7 +391,7 @@ color.green = 0; color.blue = 0.6; color.alpha = 1.0; - gtk_widget_override_background_color (event_box, 0, &color); + override_background_color (event_box, &color); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 3); @@ -480,6 +500,25 @@ return flags; } +static void +override_font (GtkWidget *widget, + const gchar *font) +{ + gchar *css; + GtkCssProvider *provider; + + provider = gtk_css_provider_new (); + + css = g_strdup_printf ("* { font: %s; }", font); + gtk_css_provider_load_from_data (provider, css, -1, NULL); + g_free (css); + + gtk_style_context_add_provider (gtk_widget_get_style_context (widget), + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + g_object_unref (provider); +} + static GtkWidget* preview_collection (int font_size, const PangoFontDescription *base_desc) @@ -517,18 +556,18 @@ desktop_color.blue = 0.65; desktop_color.alpha = 1.0; - gtk_widget_override_background_color (eventbox, 0, &desktop_color); + override_background_color (eventbox, &desktop_color); i = 0; while (i < META_FRAME_TYPE_LAST) { const char *title = NULL; GtkWidget *contents; - GtkWidget *align; - double xalign, yalign; + GtkAlign xalign, yalign; GtkWidget *eventbox2; GtkWidget *preview; PangoFontDescription *font_desc; + gchar *font_string; double scale; eventbox2 = gtk_event_box_new (); @@ -551,19 +590,19 @@ if (i == META_FRAME_TYPE_MENU) { - xalign = 0.0; - yalign = 0.0; + xalign = GTK_ALIGN_START; + yalign = GTK_ALIGN_START; } else { - xalign = 0.5; - yalign = 0.5; + xalign = GTK_ALIGN_FILL; + yalign = GTK_ALIGN_FILL; } - align = gtk_alignment_new (0.0, 0.0, xalign, yalign); - gtk_container_add (GTK_CONTAINER (align), eventbox2); + gtk_widget_set_halign (eventbox2, xalign); + gtk_widget_set_valign (eventbox2, yalign); - gtk_box_pack_start (GTK_BOX (box), align, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), eventbox2, TRUE, TRUE, 0); switch (font_size) { @@ -585,7 +624,9 @@ pango_font_description_set_size (font_desc, MAX (pango_font_description_get_size (base_desc) * scale, 1)); - gtk_widget_override_font (preview, font_desc); + font_string = pango_font_description_to_string (font_desc); + override_font (preview, font_string); + g_free (font_string); pango_font_description_free (font_desc); } @@ -741,13 +782,11 @@ desktop_color.blue = 0.65; desktop_color.alpha = 1.0; - gtk_widget_override_background_color (eventbox, 0, &desktop_color); + override_background_color (eventbox, &desktop_color); i = 0; while (i < BUTTON_LAYOUT_COMBINATIONS) { - GtkWidget *align; - double xalign, yalign; GtkWidget *eventbox2; GtkWidget *preview; char *title; @@ -767,13 +806,9 @@ meta_preview_set_button_layout (META_PREVIEW (preview), &different_layouts[i]); - xalign = 0.5; - yalign = 0.5; - - align = gtk_alignment_new (0.0, 0.0, xalign, yalign); - gtk_container_add (GTK_CONTAINER (align), eventbox2); + gtk_widget_set_halign (eventbox2, GTK_ALIGN_FILL); - gtk_box_pack_start (GTK_BOX (box), align, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), eventbox2, TRUE, TRUE, 0); previews[META_FRAME_TYPE_LAST*FONT_SIZE_LAST + i] = preview; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/metacity-3.14.3/src/ui/theme.c new/metacity-3.15.2/src/ui/theme.c --- old/metacity-3.14.3/src/ui/theme.c 2014-10-08 20:14:57.000000000 +0200 +++ new/metacity-3.15.2/src/ui/theme.c 2014-11-24 15:30:41.000000000 +0100 @@ -1515,7 +1515,7 @@ GtkStateFlags state, GdkRGBA *color) { - gtk_style_context_get_background_color (style, state, color); + gtk_style_context_get (style, state, "background-color", color, NULL); gtk_style_shade (color, color, LIGHTNESS_MULT); } @@ -1524,7 +1524,7 @@ GtkStateFlags state, GdkRGBA *color) { - gtk_style_context_get_background_color (style, state, color); + gtk_style_context_get (style, state, "background-color", color, NULL); gtk_style_shade (color, color, DARKNESS_MULT); } @@ -1540,7 +1540,7 @@ { case META_GTK_COLOR_BG: case META_GTK_COLOR_BASE: - gtk_style_context_get_background_color (context, state, color); + gtk_style_context_get (context, state, "background-color", color, NULL); break; case META_GTK_COLOR_FG: case META_GTK_COLOR_TEXT:
