[Pkg-telepathy-commits] [empathy] 04/11: Drop all the patches, they have been merged upstream
Laurent Bigonville
bigon at moszumanska.debian.org
Thu Aug 31 15:28:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
bigon pushed a commit to branch debian
in repository empathy.
commit 8869d4fc8e29e421938a7a728d0853cc2bedf16e
Author: Laurent Bigonville <bigon at bigon.be>
Date: Thu Aug 31 14:47:10 2017 +0200
Drop all the patches, they have been merged upstream
---
debian/changelog | 3 +-
debian/patches/clutter-gst-3.0.patch | 98 -----------------------------
debian/patches/fix-missing-date-icons.patch | 23 -------
debian/patches/series | 2 -
4 files changed, 2 insertions(+), 124 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 101a829..0f84da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ empathy (3.25.90-1) UNRELEASED; urgency=medium
* New upstream release
- Adjust the build-dependencies, this version now uses webkit2 (Closes:
#866637)
+ - Drop all the patches, they have been merged upstream
* debian/control: Drop leftover Build-Depends on
libnm-util-dev/libnm-glib-dev (Closes: #862670)
- -- Laurent Bigonville <bigon at debian.org> Thu, 31 Aug 2017 14:45:18 +0200
+ -- Laurent Bigonville <bigon at debian.org> Thu, 31 Aug 2017 14:46:54 +0200
empathy (3.12.12-4) unstable; urgency=medium
diff --git a/debian/patches/clutter-gst-3.0.patch b/debian/patches/clutter-gst-3.0.patch
deleted file mode 100644
index 5f12df9..0000000
--- a/debian/patches/clutter-gst-3.0.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 3269cc87e9a18d57552c1cc2556e9138b02adf15 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
-Date: Mon, 30 Nov 2015 15:19:39 +0000
-Subject: [PATCH] call: port to clutter-gst 3.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751185
----
- configure.ac | 2 +-
- src/empathy-call-window.c | 30 +++++++++++++++---------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 992a17b..1fef3af 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -247,7 +247,7 @@ PKG_CHECK_MODULES(EMPATHY_CALL,
- telepathy-farstream >= $TP_FS_REQUIRED
- clutter-1.0 >= $CLUTTER_REQUIRED
- clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
-- clutter-gst-2.0
-+ clutter-gst-3.0
- gstreamer-1.0
- gstreamer-audio-1.0
- gstreamer-video-1.0
-diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
-index a54346c..dbef578 100644
---- a/src/empathy-call-window.c
-+++ b/src/empathy-call-window.c
-@@ -22,6 +22,7 @@
- #include "empathy-call-window.h"
-
- #include <glib/gi18n.h>
-+#include <clutter-gst/clutter-gst.h>
- #include <telepathy-farstream/telepathy-farstream.h>
- #include <farstream/fs-element-added-notifier.h>
- #include <farstream/fs-utils.h>
-@@ -391,19 +392,17 @@ create_video_output_widget (EmpathyCallWindow *self)
- g_assert (priv->video_output == NULL);
- g_assert (priv->pipeline != NULL);
-
-- priv->video_output = clutter_texture_new ();
--
-- clutter_texture_set_keep_aspect_ratio (CLUTTER_TEXTURE (priv->video_output),
-- TRUE);
--
-- priv->video_output_sink = gst_element_factory_make ("cluttersink", NULL);
-- if (priv->video_output_sink == NULL)
-- g_error ("Missing cluttersink");
-- else
-- g_object_set (priv->video_output_sink, "texture", priv->video_output, NULL);
-+ priv->video_output_sink = clutter_gst_video_sink_new ();
-+ priv->video_output = g_object_new (CLUTTER_TYPE_ACTOR,
-+ "content", g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO,
-+ "sink", priv->video_output_sink,
-+ NULL),
-+ NULL);
-
- clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_box),
- priv->video_output);
-+ clutter_actor_add_constraint (priv->video_output,
-+ clutter_bind_constraint_new (priv->video_box, CLUTTER_BIND_SIZE, 0));
-
- gtk_widget_add_events (priv->video_container,
- GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK);
-@@ -1063,7 +1062,7 @@ static void
- create_video_preview (EmpathyCallWindow *self)
- {
- EmpathyCallWindowPriv *priv = GET_PRIV (self);
-- ClutterLayoutManager *layout;
-+ ClutterLayoutManager *layout, *sublayout;
- ClutterActor *preview;
- ClutterActor *b;
- ClutterAction *action;
-@@ -1077,10 +1076,7 @@ create_video_preview (EmpathyCallWindow *self)
- clutter_actor_set_size (preview,
- SELF_VIDEO_SECTION_WIDTH, SELF_VIDEO_SECTION_HEIGHT);
-
-- priv->video_preview_sink = gst_element_factory_make ("cluttersink", NULL);
-- if (priv->video_preview_sink == NULL)
-- g_error ("Missing cluttersink, check your clutter-gst installation");
-- g_object_set (priv->video_preview_sink, "texture", preview, NULL);
-+ priv->video_preview_sink = clutter_gst_video_sink_new ();
- g_object_add_weak_pointer (G_OBJECT (priv->video_preview_sink), (gpointer) &priv->video_preview_sink);
-
- /* Add a little offset to the video preview */
-@@ -1090,6 +1086,10 @@ create_video_preview (EmpathyCallWindow *self)
- clutter_actor_set_size (priv->video_preview,
- SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
- SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
-+ clutter_actor_set_content (priv->video_preview,
-+ g_object_new (CLUTTER_GST_TYPE_ASPECTRATIO,
-+ "sink", priv->video_preview,
-+ NULL));
-
- /* Spinner for when changing the camera device */
- priv->preview_spinner_widget = gtk_spinner_new ();
---
-2.6.2
\ No newline at end of file
diff --git a/debian/patches/fix-missing-date-icons.patch b/debian/patches/fix-missing-date-icons.patch
deleted file mode 100644
index bcbeff3..0000000
--- a/debian/patches/fix-missing-date-icons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 5dc16e2a2c1d3f6fcbe318c1c67a3b02dc58f6c0
-Author: Hussam Al-Tayeb <me at hussam.eu.org>
-Date: Thu Oct 22 16:25:00 2015 -0500
-
- Fix missing date icons in chat history window
-
- use x-office-calendar icon instead
-
- https://bugzilla.gnome.org/show_bug.cgi?id=756990
-
-diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
-index d58de82e4..b3a66e7d1 100644
---- a/libempathy-gtk/empathy-log-window.c
-+++ b/libempathy-gtk/empathy-log-window.c
-@@ -204,7 +204,7 @@ enum
- COL_EVENTS_COUNT
- };
-
--#define CALENDAR_ICON "stock_calendar"
-+#define CALENDAR_ICON "x-office-calendar"
-
- /* Seconds between two messages to be considered one conversation */
- #define MAX_GAP 30*60
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3766d12..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-clutter-gst-3.0.patch
-fix-missing-date-icons.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/empathy.git
More information about the Pkg-telepathy-commits
mailing list