rpms/ekiga/F-11 ekiga-3.2.0-malloc.patch, NONE, 1.1 ekiga-3.2.0-ptlib-devices.patch, NONE, 1.1 ekiga.spec, 1.78, 1.79
Peter Robinson
pbrobinson at fedoraproject.org
Mon Apr 20 14:37:37 UTC 2009
- Previous message (by thread): rpms/moin/F-10 001_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 003_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 022_CVE-2009-0260_attach_file_XSS.patch, NONE, 1.1 999_attachfile_fix_escaping_problems.patch, NONE, 1.1 CVE-2009-0312_XSS_antispam.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 moin.spec, 1.22, 1.23 sources, 1.14, 1.15
- Next message (by thread): rpms/boo/F-11 boo-mono.patch,NONE,1.1 boo.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pbrobinson
Update of /cvs/pkgs/rpms/ekiga/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10672
Modified Files:
ekiga.spec
Added Files:
ekiga-3.2.0-malloc.patch ekiga-3.2.0-ptlib-devices.patch
Log Message:
- Add a couple of upstream patches from 3.2.1
ekiga-3.2.0-malloc.patch:
--- NEW FILE ekiga-3.2.0-malloc.patch ---
>From 1bc70ca544872f5513d151462e8f1172dbfe91fe Mon Sep 17 00:00:00 2001
From: ededu <ededu at localhost>
Date: Mon, 06 Apr 2009 17:45:46 +0000
Subject: Use g_malloc instead of malloc.
svn path=/branches/gnome-2-26/; revision=7852
---
2009-03-23 Eugen Dedu <ededu at svn.gnome.org>
* src/gui/accounts.cpp:
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index afb63ce..f4b8bcf 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1299,7 +1299,7 @@ convert_string_list (const std::vector<std::string> & list)
gchar **array = NULL;
unsigned i;
- array = (gchar**) malloc (sizeof(gchar*) * (list.size() + 1));
+ array = (gchar**) g_malloc (sizeof(gchar*) * (list.size() + 1));
for (i = 0; i < list.size(); i++)
array[i] = (gchar*) list[i].c_str();
array[i] = NULL;
--
cgit v0.8.2
ekiga-3.2.0-ptlib-devices.patch:
--- NEW FILE ekiga-3.2.0-ptlib-devices.patch ---
>From d90f2f1094c0d5c6457f2afe1b4231450e847780 Mon Sep 17 00:00:00 2001
From: Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Date: Sat, 18 Apr 2009 08:42:10 +0000
Subject: Remove FFMPEG and WAVFile modules from preferences->devices, unused for the moment (Damien dixit).
---
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index f56d882..8598442 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioInputManager_ptlib::get_devices(std::vector <Ekiga::AudioInputDevice
device.source = sources_array[i];
- if (device.source != "EKIGA") {
+ if ((device.source != "EKIGA") &&
+ (device.source != "WAVFile")) {
audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Recorder);
devices_array = audio_devices.ToCharArray ();
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index ac96579..8c83e25 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -73,7 +73,8 @@ void GMAudioOutputManager_ptlib::get_devices(std::vector <Ekiga::AudioOutputDevi
device.source = sources_array[i];
- if (device.source != "EKIGA") {
+ if ((device.source != "EKIGA") &&
+ (device.source != "WAVFile")) {
audio_devices = PSoundChannel::GetDeviceNames (device.source, PSoundChannel::Player);
devices_array = audio_devices.ToCharArray ();
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index bc21aa1..d550f81 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -75,7 +75,8 @@ void GMVideoInputManager_ptlib::get_devices(std::vector <Ekiga::VideoInputDevice
if ( (device.source != "YUVFile") &&
(device.source != "Shm") &&
(device.source != "FakeVideo") &&
- (device.source != "EKIGA" ) ) {
+ (device.source != "EKIGA") &&
+ (device.source != "FFMPEG") ) {
video_devices = PVideoInputDevice::GetDriversDeviceNames (device.source);
devices_array = video_devices.ToCharArray ();
--
cgit v0.8.2
Index: ekiga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekiga/F-11/ekiga.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ekiga.spec 17 Mar 2009 11:41:47 -0000 1.78
+++ ekiga.spec 20 Apr 2009 14:37:07 -0000 1.79
@@ -1,9 +1,11 @@
Summary: A Gnome based SIP/H323 teleconferencing application
Name: ekiga
Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.ekiga.org/
Source0: ftp://ftp.gnome.org/pub/gnome/sources/ekiga/3.1/%{name}-%{version}.tar.bz2
+Patch1: ekiga-3.2.0-malloc.patch
+Patch2: ekiga-3.2.0-ptlib-devices.patch
License: GPLv2+
Group: Applications/Communications
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +50,8 @@
%prep
%setup -q
+%patch1 -p1 -b .malloc
+%patch2 -p1 -b .ptlib-devices
%build
CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC"
@@ -139,6 +143,9 @@
%{_sysconfdir}/gconf/schemas/ekiga.schemas
%changelog
+* Mon Apr 20 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-2
+- Add a couple of upstream patches from 3.2.1
+
* Tue Mar 17 2009 Peter Robinson <pbrobinson at gmail.com> - 3.2.0-1
- Ekiga 3.2.0 stable
- Previous message (by thread): rpms/moin/F-10 001_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 002_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 003_CVE-2008-0781_attach_file_XSS.patch, NONE, 1.1 022_CVE-2009-0260_attach_file_XSS.patch, NONE, 1.1 999_attachfile_fix_escaping_problems.patch, NONE, 1.1 CVE-2009-0312_XSS_antispam.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 moin.spec, 1.22, 1.23 sources, 1.14, 1.15
- Next message (by thread): rpms/boo/F-11 boo-mono.patch,NONE,1.1 boo.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list