diff --git a/.gitignore b/.gitignore index 254a3cd..3b4ac4a 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ empathy-3.3.5.tar.xz /empathy-3.12.9.tar.xz /empathy-3.12.10.tar.xz /empathy-3.12.11.tar.xz +/empathy-3.12.12.tar.xz diff --git a/0003-Probably-fix-icons-in-search-bar.patch b/0003-Probably-fix-icons-in-search-bar.patch deleted file mode 100644 index 3dc740c..0000000 --- a/0003-Probably-fix-icons-in-search-bar.patch +++ /dev/null @@ -1,50 +0,0 @@ -From df4ccc36b259a39e73dd77c4e87c168a5e3b1040 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Thu, 24 Dec 2015 13:51:46 -0600 -Subject: [PATCH 03/10] 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 @@ - _Previous - True - True -- gtk-go-back-ltr -+ go-previous-symbolic - True - - -@@ -51,7 +51,7 @@ - _Next - True - True -- gtk-go-forward-ltr -+ go-next-symbolic - True - - -@@ -123,7 +123,7 @@ - - True - False -- gtk-close -+ window-close-symbolic - - - False --- -2.5.0 - diff --git a/0005-Don-t-crash-in-window_get_workspace-under-Wayland.patch b/0005-Don-t-crash-in-window_get_workspace-under-Wayland.patch deleted file mode 100644 index f33fe00..0000000 --- a/0005-Don-t-crash-in-window_get_workspace-under-Wayland.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 942395f7b81e4a81922c8bcb1c11f9676d32f3f8 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/0006-Fix-a-critical-warning.patch b/0006-Fix-a-critical-warning.patch deleted file mode 100644 index 6cea51c..0000000 --- a/0006-Fix-a-critical-warning.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c93fa8cdd89e95486129bdaea693b7e98694e70a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/0007-Don-t-call-XInitThreads-in-Wayland.patch b/0007-Don-t-call-XInitThreads-in-Wayland.patch deleted file mode 100644 index ac34c73..0000000 --- a/0007-Don-t-call-XInitThreads-in-Wayland.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a9ede294c57bc5738be3c33cba4ef88b9a7d4a0e Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - - #ifdef CLUTTER_WINDOWING_X11 -+#include - #include - #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 - diff --git a/0008-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.1.patch b/0008-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.1.patch deleted file mode 100644 index d158166..0000000 --- a/0008-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.1.patch +++ /dev/null @@ -1,118 +0,0 @@ -From bc7c5e9025ece52d2bf7c1a5bc1bed8a0214d90a Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/0009-Add-a-missing-tag-to-the-AppData-file.patch b/0009-Add-a-missing-tag-to-the-AppData-file.patch deleted file mode 100644 index 646f621..0000000 --- a/0009-Add-a-missing-tag-to-the-AppData-file.patch +++ /dev/null @@ -1,22 +0,0 @@ -From fb99c0b4a4093a3b5dc4a65005783105a299e115 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -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 @@ - https://wiki.gnome.org/Empathy?action=AttachFile&do=get&target=empathy.png - - telepathy@lists.freedesktop.org -+ GNOME - --- -2.5.0 - diff --git a/0010-Add-a-missing-tag-to-the-AppData-file.patch b/0010-Add-a-missing-tag-to-the-AppData-file.patch deleted file mode 100644 index 85d7b48..0000000 --- a/0010-Add-a-missing-tag-to-the-AppData-file.patch +++ /dev/null @@ -1,22 +0,0 @@ -From a7ad339a807a2852841e5167f463cc4917ae6f6f Mon Sep 17 00:00:00 2001 -From: Richard Hughes -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 @@ - - telepathy@lists.freedesktop.org - GNOME -+ empathy - --- -2.5.0 - diff --git a/empathy.spec b/empathy.spec index 81e02fd..33cb7ab 100644 --- a/empathy.spec +++ b/empathy.spec @@ -16,8 +16,8 @@ %global gcr_version 2.91.4 Name: empathy -Version: 3.12.11 -Release: 3%{?dist} +Version: 3.12.12 +Release: 1%{?dist} Summary: Instant Messaging Client for GNOME License: GPLv2+ @@ -26,19 +26,6 @@ URL: http://live.gnome.org/Empathy Source0: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz Source1: %{name}-README.ConnectionManagers -## post EMPATHY_3_12_11 tag commits -## skipping largish translation updates or anything that requires reautoconf (for now) -#Patch1: 0001-remove-released-flag.patch -#Patch2: 0002-Added-Icelandic-translation.patch -Patch3: 0003-Probably-fix-icons-in-search-bar.patch -#Patch4: 0004-Updated-Lithuanian-translation.patch -Patch5: 0005-Don-t-crash-in-window_get_workspace-under-Wayland.patch -Patch6: 0006-Fix-a-critical-warning.patch -Patch7: 0007-Don-t-call-XInitThreads-in-Wayland.patch -Patch8: 0008-Avoid-warning-spam-from-GtkStyleContext-with-GTK-3.1.patch -Patch9: 0009-Add-a-missing-tag-to-the-AppData-file.patch -Patch10: 0010-Add-a-missing-tag-to-the-AppData-file.patch - BuildRequires: enchant-devel >= %{enchant_version} BuildRequires: iso-codes-devel BuildRequires: desktop-file-utils @@ -213,6 +200,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css %changelog +* Fri May 13 2016 Kalev Lember - 3.12.12-1 +- Update to 3.12.12 + * Wed Feb 10 2016 Rex Dieter - 3.12.11-3 - pull in upstream fixes (wayland crasher, in particular) - %%build: --disable-schemas-compile --disable-silent-rules diff --git a/sources b/sources index 5d62b64..6721f58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08636d1f04b94282f384ca5ed8482eab empathy-3.12.11.tar.xz +58dd3404de864ca9599966f047a26f3c empathy-3.12.12.tar.xz