Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at 2016-03-29 14:28:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/empathy (Old) and /work/SRC/openSUSE:Factory/.empathy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "empathy" Changes: -------- --- /work/SRC/openSUSE:Factory/empathy/empathy.changes 2015-10-25 19:10:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.empathy.new/empathy.changes 2016-03-29 14:28:59.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Feb 13 00:18:46 UTC 2016 - [email protected] + +- Add patches from upstream git to fix various issues: + + empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch + + empathy-Fix-a-critical-warning.patch + + empathy-Don-t-call-XInitThreads-in-Wayland.patch + + empathy-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.20.patch + + empathy-Add-a-missing-tag-to-the-AppData-file.patch. + +------------------------------------------------------------------- +Mon Jan 4 20:23:08 UTC 2016 - [email protected] + +- Add empathy-fix-icons-in-search-bar.patch: Fix the previous/next + icons, patch from upstream git. + +------------------------------------------------------------------- New: ---- empathy-Add-a-missing-tag-to-the-AppData-file.patch empathy-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.20.patch empathy-Don-t-call-XInitThreads-in-Wayland.patch empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch empathy-Fix-a-critical-warning.patch empathy-fix-icons-in-search-bar.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.bqrG4Y/_old 2016-03-29 14:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.bqrG4Y/_new 2016-03-29 14:29:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package empathy # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,18 @@ Url: http://live.gnome.org/Empathy Source: http://download.gnome.org/sources/empathy/3.12/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM empathy-fix-icons-in-search-bar.patch [email protected] -- Fix the previous/next icons. +Patch1: empathy-fix-icons-in-search-bar.patch +# PATCH-FIX-UPSTREAM empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch [email protected] -- Don't crash in window_get_workspace under Wayland +Patch2: empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch +# PATCH-FIX-UPSTREAM empathy-Fix-a-critical-warning.patch [email protected] -- Fix a critical warning +Patch3: empathy-Fix-a-critical-warning.patch +# PATCH-FIX-UPSTREAM empathy-Don-t-call-XInitThreads-in-Wayland.patch [email protected] -- Don't call XInitThreads in Wayland +Patch4: empathy-Don-t-call-XInitThreads-in-Wayland.patch +# PATCH-FIX-UPSTREAM empathy-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.20.patch [email protected] -- Avoid warning spam from GtkStyleContext with GTK+ 3.20 +Patch5: empathy-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.20.patch +# PATCH-FIX-UPSTREAM empathy-Add-a-missing-tag-to-the-AppData-file.patch [email protected] -- Add missing tags to the AppData file +Patch6: empathy-Add-a-missing-tag-to-the-AppData-file.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: translation-update-upstream @@ -118,6 +130,12 @@ %lang_package %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 translation-update-upstream %build ++++++ empathy-Add-a-missing-tag-to-the-AppData-file.patch ++++++ >From fb99c0b4a4093a3b5dc4a65005783105a299e115 Mon Sep 17 00:00:00 2001 From: Richard Hughes <[email protected]> Date: Mon, 25 Jan 2016 13:10:11 +0000 Subject: [PATCH 09/10] Add a missing tag to the AppData file --- data/empathy.appdata.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/empathy.appdata.xml.in b/data/empathy.appdata.xml.in index 0d655f4..f23a15b 100644 --- a/data/empathy.appdata.xml.in +++ b/data/empathy.appdata.xml.in @@ -15,4 +15,5 @@ <screenshot type="default">https://wiki.gnome.org/Empathy?action=AttachFile&do=get&target=empathy.png</screenshot> </screenshots> <updatecontact>[email protected]</updatecontact> + <project_group>GNOME</project_group> </application> -- 2.5.0 >From a7ad339a807a2852841e5167f463cc4917ae6f6f Mon Sep 17 00:00:00 2001 From: Richard Hughes <[email protected]> Date: Mon, 25 Jan 2016 15:37:33 +0000 Subject: [PATCH 10/10] Add a missing tag to the AppData file --- data/empathy.appdata.xml.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/empathy.appdata.xml.in b/data/empathy.appdata.xml.in index f23a15b..b6447f2 100644 --- a/data/empathy.appdata.xml.in +++ b/data/empathy.appdata.xml.in @@ -16,4 +16,5 @@ </screenshots> <updatecontact>[email protected]</updatecontact> <project_group>GNOME</project_group> + <translation type="gettext">empathy</translation> </application> -- 2.5.0 ++++++ empathy-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.20.patch ++++++ >From bc7c5e9025ece52d2bf7c1a5bc1bed8a0214d90a Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Sat, 16 Jan 2016 07:19:37 -0600 Subject: [PATCH 08/10] Avoid warning spam from GtkStyleContext with GTK+ 3.19 Not *necessarily* the best fix, but let's avoid any behavior change. (lt-empathy-chat:21101): Gtk-WARNING **: State 0 for GtkBox 0x1d8e120 doesn't match state 192 set via gtk_style_context_set_state () (lt-empathy-chat:21101): Gtk-WARNING **: State 0 for GtkBox 0x1d8e120 doesn't match state 192 set via gtk_style_context_set_state () (lt-empathy-chat:21101): Gtk-WARNING **: State 0 for GtkBox 0x1d8e120 doesn't match state 192 set via gtk_style_context_set_state () (lt-empathy-chat:21101): Gtk-WARNING **: State 0 for GtkBox 0x1d8e120 doesn't match state 192 set via gtk_style_context_set_state () (lt-empathy-chat:21101): Gtk-WARNING **: State 0 for GtkBox 0x1d8e120 doesn't match state 192 set via gtk_style_context_set_state () --- libempathy-gtk/empathy-cell-renderer-text.c | 8 +++++++- libempathy-gtk/empathy-individual-view.c | 3 +++ src/empathy-chat-window.c | 15 ++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index 5ce735f..ff663fd 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -330,9 +330,13 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell, attr_list = pango_attr_list_new (); + gtk_style_context_save (style); + + gtk_style_context_set_state (style, GTK_STATE_FLAG_NORMAL); gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); + font_size = pango_font_description_get_size (font_desc); pango_font_description_free (font_desc); attr_size = pango_attr_size_new (font_size / 1.2); @@ -343,7 +347,7 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell, if (!selected) { GdkRGBA color; - gtk_style_context_get_color (style, 0, &color); + gtk_style_context_get_color (style, GTK_STATE_FLAG_NORMAL, &color); attr_color = pango_attr_foreground_new (color.red * 0xffff, color.green * 0xffff, @@ -353,6 +357,8 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell, pango_attr_list_insert (attr_list, attr_color); } + gtk_style_context_restore (style); + if (priv->compact) { if (TPAW_STR_EMPTY (priv->status)) { str = g_strdup (priv->name); diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 9e64f4b..b8ef8d1 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -1102,8 +1102,11 @@ individual_view_cell_set_background (EmpathyIndividualView *view, style = gtk_widget_get_style_context (GTK_WIDGET (view)); + gtk_style_context_save (style); + gtk_style_context_set_state (style, GTK_STATE_FLAG_SELECTED); gtk_style_context_get_background_color (style, GTK_STATE_FLAG_SELECTED, &color); + gtk_style_context_restore (style); /* Here we take the current theme colour and add it to * the colour for white and average the two. This diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index b496356..ba23b74 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -380,21 +380,26 @@ chat_tab_style_updated_cb (GtkWidget *hbox, { GtkWidget *button; int char_width, h, w; - PangoContext *context; + GtkStyleContext *style_context; + PangoContext *pango_context; PangoFontDescription *font_desc; PangoFontMetrics *metrics; button = g_object_get_data (G_OBJECT (user_data), "chat-window-tab-close-button"); - context = gtk_widget_get_pango_context (hbox); + style_context = gtk_widget_get_style_context (hbox); + pango_context = gtk_widget_get_pango_context (hbox); - gtk_style_context_get (gtk_widget_get_style_context (hbox), + gtk_style_context_save (style_context); + gtk_style_context_set_state (style_context, GTK_STATE_FLAG_NORMAL); + gtk_style_context_get (style_context, GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL); + gtk_style_context_restore (style_context); - metrics = pango_context_get_metrics (context, font_desc, - pango_context_get_language (context)); + metrics = pango_context_get_metrics (pango_context, font_desc, + pango_context_get_language (pango_context)); char_width = pango_font_metrics_get_approximate_char_width (metrics); pango_font_metrics_unref (metrics); -- 2.5.0 ++++++ empathy-Don-t-call-XInitThreads-in-Wayland.patch ++++++ >From a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Sat, 16 Jan 2016 06:59:50 -0600 Subject: [PATCH 07/10] Don't call XInitThreads in Wayland This doesn't fix anything in particular, but seems like a good idea.... --- src/empathy-call.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/empathy-call.c b/src/empathy-call.c index 9919041..3bc1488 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -28,6 +28,7 @@ #include <tp-account-widgets/tpaw-utils.h> #ifdef CLUTTER_WINDOWING_X11 +#include <gdk/gdkx.h> #include <X11/Xlib.h> #endif @@ -215,9 +216,11 @@ main (int argc, g_setenv ("GST_DEBUG_DUMP_DOT_DIR", g_get_tmp_dir (), FALSE); #ifdef GDK_WINDOWING_X11 - /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice - * but to intiialise X11 threading ourself */ - XInitThreads (); + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) { + /* We can't call clutter_gst_init() before gtk_clutter_init(), so no choice + * but to intiialise X11 threading ourself */ + XInitThreads (); + } #endif optcontext = g_option_context_new (N_("- Empathy Audio/Video Client")); -- 2.5.0 ++++++ empathy-Don-t-crash-in-window_get_workspace-under-Wayland.patch ++++++ >From 942395f7b81e4a81922c8bcb1c11f9676d32f3f8 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Sat, 16 Jan 2016 00:20:15 -0600 Subject: [PATCH 05/10] Don't crash in window_get_workspace under Wayland --- libempathy-gtk/empathy-ui-utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index fb080ce..e662c69 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -1122,6 +1122,8 @@ out: g_free (cmd); } +#ifdef GDK_WINDOWING_X11 + /* Most of the workspace manipulation code has been copied from libwnck * Copyright (C) 2001 Havoc Pennington * Copyright (C) 2005-2007 Vincent Untz @@ -1213,18 +1215,24 @@ window_get_workspace (Screen *xscreen, return number; } +#endif + /* Ask X to move to the desktop on which @window currently is * and the present @window. */ void empathy_move_to_window_desktop (GtkWindow *window, guint32 timestamp) { +#ifdef GDK_WINDOWING_X11 GdkScreen *screen; Screen *xscreen; GdkWindow *gdk_window; int workspace; screen = gtk_window_get_screen (window); + if (!GDK_IS_X11_SCREEN (screen)) + goto out; + xscreen = gdk_x11_screen_get_xscreen (screen); gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); @@ -1237,6 +1245,7 @@ empathy_move_to_window_desktop (GtkWindow *window, out: gtk_window_present_with_time (window, timestamp); +#endif } void -- 2.5.0 ++++++ empathy-Fix-a-critical-warning.patch ++++++ >From c93fa8cdd89e95486129bdaea693b7e98694e70a Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Sat, 16 Jan 2016 06:38:30 -0600 Subject: [PATCH 06/10] Fix a critical warning GLib-CRITICAL **: Source ID 8795 was not found when attempting to remove it --- libempathy-gtk/empathy-chat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index fc35bec..028f5ab 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -3196,6 +3196,8 @@ save_paned_pos_timeout (gpointer data) EmpathyChat *self = data; gint hpaned_pos; + self->priv->save_paned_pos_id = 0; + hpaned_pos = gtk_paned_get_position (GTK_PANED (self->priv->hpaned)); g_settings_set_int (self->priv->gsettings_ui, -- 2.5.0 ++++++ empathy-fix-icons-in-search-bar.patch ++++++ >From df4ccc36b259a39e73dd77c4e87c168a5e3b1040 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro <[email protected]> Date: Thu, 24 Dec 2015 13:51:46 -0600 Subject: Probably fix icons in search bar The previous/next icons have been missing for a while, and I finally decided I cared to fix them. Also, use a better close icon while we're at it. This is untested because I cannot figure out how to actually run empathy-chat in jhbuild. 'jhbuild run empathy' seems to work for the roster, but start the system version of empathy-chat. Oh well. --- libempathy-gtk/empathy-search-bar.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libempathy-gtk/empathy-search-bar.ui b/libempathy-gtk/empathy-search-bar.ui index cfb8eed..31f6cec 100644 --- a/libempathy-gtk/empathy-search-bar.ui +++ b/libempathy-gtk/empathy-search-bar.ui @@ -39,7 +39,7 @@ <property name="label" translatable="yes">_Previous</property> <property name="visible">True</property> <property name="is_important">True</property> - <property name="icon_name">gtk-go-back-ltr</property> + <property name="icon_name">go-previous-symbolic</property> <property name="use_underline">True</property> </object> <packing> @@ -51,7 +51,7 @@ <property name="label" translatable="yes">_Next</property> <property name="visible">True</property> <property name="is_important">True</property> - <property name="icon_name">gtk-go-forward-ltr</property> + <property name="icon_name">go-next-symbolic</property> <property name="use_underline">True</property> </object> <packing> @@ -123,7 +123,7 @@ <object class="GtkToolButton" id="search_close"> <property name="visible">True</property> <property name="is_important">False</property> - <property name="stock_id">gtk-close</property> + <property name="icon_name">window-close-symbolic</property> </object> <packing> <property name="expand">False</property> -- cgit v0.11.2
