[Pkg-telepathy-commits] [empathy] 03/06: New upstream release

[Laurent Bigonville]

This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian
in repository empathy.

commit 57d94b8b8d21e5fc956a80763aaa2388f3ced54e
Author: Laurent Bigonville <bigon at debian.org>
Date:   Thu May 19 22:23:56 2016 +0200

    New upstream release
    
    * New upstream release
      - Drop Don-t-call-XInitThreads-in-Wayland.patch and
        Don-t-crash-in-window_get_workspace-under-Wayland.patch: merged upstream
---
 debian/changelog                                   |  8 +++
 .../Don-t-call-XInitThreads-in-Wayland.patch       | 40 ---------------
 ...ash-in-window_get_workspace-under-Wayland.patch | 58 ----------------------
 debian/patches/series                              |  2 -
 4 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e51f2f0..ef51efe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+empathy (3.12.12-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Drop Don-t-call-XInitThreads-in-Wayland.patch and
+      Don-t-crash-in-window_get_workspace-under-Wayland.patch: merged upstream
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 19 May 2016 22:23:26 +0200
+
 empathy (3.12.11-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/Don-t-call-XInitThreads-in-Wayland.patch b/debian/patches/Don-t-call-XInitThreads-in-Wayland.patch
deleted file mode 100644
index a5ad09e..0000000
--- a/debian/patches/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 <mcatanzaro at igalia.com>
-Date: Sat, 16 Jan 2016 06:59:50 -0600
-Subject: [PATCH] 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.8.0.rc3
-
diff --git a/debian/patches/Don-t-crash-in-window_get_workspace-under-Wayland.patch b/debian/patches/Don-t-crash-in-window_get_workspace-under-Wayland.patch
deleted file mode 100644
index c69c2d3..0000000
--- a/debian/patches/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 <mcatanzaro at igalia.com>
-Date: Sat, 16 Jan 2016 00:20:15 -0600
-Subject: [PATCH] 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.8.0.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index 9577171..2e16bd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-Don-t-crash-in-window_get_workspace-under-Wayland.patch
-Don-t-call-XInitThreads-in-Wayland.patch
 clutter-gst-3.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git