gnu: pidgin: Update to 2.14.2.

* gnu/packages/messaging.scm (pidgin): Update to 2.14.2.
[source]: Remove pidgin-vv-gst.patch.
* gnu/packages/patches/pidgin-vv-gst.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Tobias Geerinckx-Rice 2021-04-02 23:14:13 +02:00
parent 6f6b0ea0d4
commit 8d89d3c9bf
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
3 changed files with 3 additions and 54 deletions

View file

@ -1525,7 +1525,6 @@ dist_patch_DATA = \
%D%/packages/patches/picard-fix-id3-rename-test.patch \
%D%/packages/patches/picprog-non-intel-support.patch \
%D%/packages/patches/pidgin-add-search-path.patch \
%D%/packages/patches/pidgin-vv-gst.patch \
%D%/packages/patches/pinball-const-fix.patch \
%D%/packages/patches/pinball-cstddef.patch \
%D%/packages/patches/pinball-missing-separators.patch \

View file

@ -788,7 +788,7 @@ (define-public ngircd
(define-public pidgin
(package
(name "pidgin")
(version "2.14.1")
(version "2.14.2")
(source
(origin
(method url-fetch)
@ -796,11 +796,9 @@ (define-public pidgin
(string-append "mirror://sourceforge/pidgin/Pidgin/"
version "/pidgin-" version ".tar.gz"))
(sha256
(base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11"))
(base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1"))
(patches
(search-patches
"pidgin-add-search-path.patch"
"pidgin-vv-gst.patch"))
(search-patches "pidgin-add-search-path.patch"))
(modules '((guix build utils)))
(snippet
'(begin

View file

@ -1,48 +0,0 @@
Name: Gary Kramlich
Date: 2020-07-12
Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -2231,6 +2231,7 @@
purple_media_manager_unregister_gst_device(PurpleMediaManager *manager,
GstDevice *device)
{
+#ifdef USE_VV
GList *i;
gchar *name;
gchar *device_class;
@@ -2277,6 +2278,7 @@
g_free(name);
g_free(device_class);
+#endif /* USE_VV */
}
static gboolean
@@ -2304,7 +2306,7 @@
static void
purple_media_manager_init_device_monitor(PurpleMediaManager *manager)
{
-#if GST_CHECK_VERSION(1, 4, 0)
+#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV)
GstBus *bus;
GList *i;
@@ -2334,6 +2336,7 @@
PurpleMediaElementType type)
{
GList *result = NULL;
+#ifdef USE_VV
GList *i;
for (i = manager->priv->elements; i; i = i->next) {
@@ -2347,6 +2350,7 @@
result = g_list_prepend(result, info);
}
}
+#endif /* USE_VV */
return result;
}