From 72093960b5fad1002b6b9bcdaa261a475bf4489d Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Thu, 16 May 2013 22:17:39 +0300 Subject: [PATCH] media: remove BR glib-2.0 >= 2.28.0 Replace all g_slist_free_full() calls with sipe_utils_slist_free_full(). --- configure.ac | 4 ++-- contrib/opensuse-build-service/pidgin-sipe-VandV.dsc | 2 +- contrib/rpm/pidgin-sipe.spec | 4 +++- src/core/sdpmsg.c | 8 ++++---- src/core/sipe-media.c | 6 +++--- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index aeaadd54..ccb4cd39 100644 --- a/configure.ac +++ b/configure.ac @@ -348,11 +348,11 @@ system defaults. [AC_MSG_RESULT(ok) PKG_CHECK_MODULES(NICE, [nice >= 0.1.0], dnl sipe-media.c uses g_slist_free_full() - [PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [purple >= 2.8.0 glib-2.0 >= 2.28.0], + [PKG_CHECK_MODULES(_SIPE_MEDIA_RECHECK_PLEASE_IGNORE, [purple >= 2.8.0], [PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [with_purple_vv=yes], [AC_MSG_NOTICE(GStreamer required: disabling purple voice and video support)])], - [AC_MSG_NOTICE(libpurple >= 2.8.0 glib2 >= 2.28.0 required: disabling purple voice and video support)])], + [AC_MSG_NOTICE(libpurple >= 2.8.0 required: disabling purple voice and video support)])], [AC_MSG_NOTICE(libnice required: disabling purple voice and video support)])], [AC_MSG_RESULT(no - your purple hasn't been compiled with voice and video support.)], [AC_MSG_WARN([cross compiling: not checking])]) diff --git a/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc b/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc index fac147df..0f3d4233 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-VandV.dsc @@ -5,5 +5,5 @@ Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.4-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.12.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.4-dev Homepage: http://sipe.sourceforge.net/ diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index 56a2df8b..95abef38 100644 --- a/contrib/rpm/pidgin-sipe.spec +++ b/contrib/rpm/pidgin-sipe.spec @@ -52,7 +52,6 @@ BuildRequires: gettext-devel # Use "--with vv" to enable Voice & Video features %if 0%{?_with_vv:1} BuildRequires: libpurple-devel >= 2.8.0 -BuildRequires: glib2-devel >= 2.28.0 BuildRequires: libnice-devel >= 0.1.0 BuildRequires: gstreamer-devel %endif @@ -259,6 +258,9 @@ rm -rf %{buildroot} %changelog +* Thu May 16 2013 J. D. User 1.15.1-*git* +- BR glib-2.0 >= 2.28.0 no longer required for Voice & Video features + * Sun Apr 07 2013 J. D. User 1.15.1 - update to 1.15.1 diff --git a/src/core/sdpmsg.c b/src/core/sdpmsg.c index ecf4de81..84801ca0 100644 --- a/src/core/sdpmsg.c +++ b/src/core/sdpmsg.c @@ -773,11 +773,11 @@ sdpmedia_free(struct sdpmedia *media) sipe_utils_nameval_free(media->attributes); - g_slist_free_full(media->candidates, + sipe_utils_slist_free_full(media->candidates, (GDestroyNotify) sdpcandidate_free); - g_slist_free_full(media->codecs, + sipe_utils_slist_free_full(media->codecs, (GDestroyNotify) sdpcodec_free); - g_slist_free_full(media->remote_candidates, + sipe_utils_slist_free_full(media->remote_candidates, (GDestroyNotify) sdpcandidate_free); g_free(media); @@ -789,7 +789,7 @@ sdpmsg_free(struct sdpmsg *msg) { if (msg) { g_free(msg->ip); - g_slist_free_full(msg->media, + sipe_utils_slist_free_full(msg->media, (GDestroyNotify) sdpmedia_free); g_free(msg); } diff --git a/src/core/sipe-media.c b/src/core/sipe-media.c index 8c644fa6..c9e483a5 100644 --- a/src/core/sipe-media.c +++ b/src/core/sipe-media.c @@ -3,7 +3,7 @@ * * pidgin-sipe * - * Copyright (C) 2011-12 SIPE Project + * Copyright (C) 2011-13 SIPE Project * Copyright (C) 2010 Jakub Adam * * This program is free software; you can redistribute it and/or modify @@ -93,7 +93,7 @@ sipe_media_call_free(struct sipe_media_call_private *call_private) sipmsg_free(call_private->invitation); sdpmsg_free(call_private->smsg); - g_slist_free_full(call_private->failed_media, + sipe_utils_slist_free_full(call_private->failed_media, (GDestroyNotify)sdpmedia_free); g_free(call_private->with); g_free(call_private); @@ -490,7 +490,7 @@ apply_remote_message(struct sipe_media_call_private* call_private, { GSList *i; - g_slist_free_full(call_private->failed_media, (GDestroyNotify)sdpmedia_free); + sipe_utils_slist_free_full(call_private->failed_media, (GDestroyNotify)sdpmedia_free); call_private->failed_media = NULL; for (i = msg->media; i; i = i->next) { -- 2.11.4.GIT