diff options
author | Mounir Lamouri <volkmar@gentoo.org> | 2009-04-01 02:08:18 +0000 |
---|---|---|
committer | Mounir Lamouri <volkmar@gentoo.org> | 2009-04-01 02:08:18 +0000 |
commit | 696fa0fbd1a9972794b1e1c1fbde85a6c012fae4 (patch) | |
tree | 1fc2f2b85e1917047eb56fe4a7db5dad0c00f1b1 /net-im | |
parent | masking net-im/ekiga instead of net-voip/ekiga (diff) | |
download | voip-696fa0fbd1a9972794b1e1c1fbde85a6c012fae4.tar.gz voip-696fa0fbd1a9972794b1e1c1fbde85a6c012fae4.tar.bz2 voip-696fa0fbd1a9972794b1e1c1fbde85a6c012fae4.zip |
net-im/ekiga: version bump to 3.2.0
svn path=/trunk/; revision=827
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/ekiga/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/ekiga/Manifest | 9 | ||||
-rw-r--r-- | net-im/ekiga/ekiga-3.2.0.ebuild | 196 | ||||
-rw-r--r-- | net-im/ekiga/files/ekiga-3.2.0-configure.patch | 46 | ||||
-rw-r--r-- | net-im/ekiga/files/ekiga-3.2.0-ptracing.patch | 137 | ||||
-rw-r--r-- | net-im/ekiga/files/ekiga-3.2.0-xcap.patch | 77 | ||||
-rw-r--r-- | net-im/ekiga/metadata.xml | 1 |
7 files changed, 470 insertions, 2 deletions
diff --git a/net-im/ekiga/ChangeLog b/net-im/ekiga/ChangeLog index d221e7d..1104315 100644 --- a/net-im/ekiga/ChangeLog +++ b/net-im/ekiga/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*ekiga-3.2.0 (29 Mar 2009) + + 29 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com> + +ekiga-3.2.0: + Version bump to 3.2.0 + 18 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com> ekiga-3.0.2: Add ~x86 keyword diff --git a/net-im/ekiga/Manifest b/net-im/ekiga/Manifest index b1d7486..a33fccf 100644 --- a/net-im/ekiga/Manifest +++ b/net-im/ekiga/Manifest @@ -1,5 +1,10 @@ AUX ekiga-3.0.2-ptracing.patch 5708 RMD160 1031c2a8fa5b2ade6ceb513a56e9b5ae95a60809 SHA1 419c06ac2058943bea9fa21f96b231cc11b9fdba SHA256 1a83b04db2ab039c616ccf1b4f1071290b08d64a4929643d5147da53d353d3fe +AUX ekiga-3.2.0-configure.patch 974 RMD160 ba76cc8f23f4c2888ff301428dc6d713e82c3bca SHA1 20677405316db6941cdf2439f7676c752654b8ae SHA256 c6d7ff3051ffa55bc19a41076c4e79addd54717e38447deab2f80be5ebd29f22 +AUX ekiga-3.2.0-ptracing.patch 5073 RMD160 bad220709a9238347f2ed219a4ffe0ee9f5e1d0a SHA1 3050a2c4c2dc04b2ade582652df9fe8ea0c6e5e3 SHA256 78070f8e94c457d872979da177f612b1609e533ecbe943e2f13e863c67d8ffe8 +AUX ekiga-3.2.0-xcap.patch 2640 RMD160 c112e0a93c5dd121f83368ccf3dcf6f78bdd7eb6 SHA1 761ca9e87085e9cae194e47267ee4ed4b48cfd5b SHA256 e5284d49e703e43256f2a136159598c2f088d4e12698e158ae1b27ef357a26f2 DIST ekiga-3.0.2.tar.bz2 7142789 RMD160 997b890f5a18ae89020f7511db977f5ae0561ba2 SHA1 a89e2b493a1fcc518ffa2af36f6ffb2955bc2090 SHA256 df17dea4e6eb4c67ba3949e03fdc665840d9848c124126e765a510146f1e638e +DIST ekiga-3.2.0.tar.bz2 7679645 RMD160 f31e94dbe03038e39fb5b50bd71372992c13ae8b SHA1 6a8d6f203cd982cbfb37822b2a96f176176cd763 SHA256 998b50e3920546cb43cd281d519394a2db23f5bf10223cac49120296407b3c6d EBUILD ekiga-3.0.2.ebuild 4700 RMD160 de289cb1ea6f334be16c435ee0e534d2078febf4 SHA1 2245015dddd99a3461c43cba12fac58cc92a9226 SHA256 23ae2dbc5186a110089301f6bc51c51f2197ba7c3c2a499356da2b55bd9cfacd -MISC ChangeLog 371 RMD160 a5a1a6c2ae8dfbb5fb5e2a38785a1b470239a86d SHA1 a8846e1b04e1ca855a0b520eb4b26c54075817e5 SHA256 510cbb1fbe38d6d342675af339ea235f2f8902f5a25c895b9b2dd09f75d11a6a -MISC metadata.xml 474 RMD160 df4af0d05d375ddc171449124d71eacb3ff59581 SHA1 d2b9e343072e0b706680f6c222858c606c3e329f SHA256 afeef65ec57f8bbc62f2045cbec1bc564daf5858f0e8a3b052974aeadd92b654 +EBUILD ekiga-3.2.0.ebuild 6437 RMD160 79bf7b99da07f76ade77c2c78961327e75c14981 SHA1 7581d3af3fe3df870e09c889de12058a1e58ebee SHA256 7e632fe1f9f288c5baa32ebbea1661ef151f63132e76e7d6c1fb2f637e43d371 +MISC ChangeLog 507 RMD160 5530962739d787f90bf2a2463785baddc708b6c6 SHA1 faa4198b08a1adf9794da687d8bb9eadead15845 SHA256 899fd217cde890b9e083051eb71d414735d5620f18136b49162039671bb7406d +MISC metadata.xml 541 RMD160 1864969c975d3a2aae9e53374ba6eebfa2ddd7f9 SHA1 3c5c0f86e7b52e1111bd001d113db8a513f5ae8e SHA256 108cbc3a85578bccc058d02217c6a6e89441910eff3608be54881766558dddc9 diff --git a/net-im/ekiga/ekiga-3.2.0.ebuild b/net-im/ekiga/ekiga-3.2.0.ebuild new file mode 100644 index 0000000..80d4628 --- /dev/null +++ b/net-im/ekiga/ekiga-3.2.0.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils gnome2 + +DESCRIPTION="H.323 and SIP VoIP softphone" +HOMEPAGE="http://www.ekiga.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~ppc ~x86" +IUSE="avahi dbus debug doc eds gconf gnome +h323 kde kontact ldap libnotify mmx +nls +shm +sip static v4l xcap xv" + +RDEPEND="dev-libs/cyrus-sasl:2 + >=dev-libs/glib-2.8.0:2 + dev-libs/libsigc++:2 + dev-libs/libxml2:2 + >=net-libs/opal-3.6.1[audio,sip,video,debug=,h323?] + >=net-libs/ptlib-2.6.1[stun,video,wav,debug=] + sys-devel/gettext + >=x11-libs/gtk+-2.12.0:2 + avahi? ( >=net-dns/avahi-0.6[dbus] ) + dbus? ( >=sys-apps/dbus-0.36 >=dev-libs/dbus-glib-0.36 ) + eds? ( >=gnome-extra/evolution-data-server-1.2 ) + gconf? ( >=gnome-base/gconf-2.6.0:2 ) + gnome? ( || ( >=x11-libs/gtk+-2.14:2 + ( >=gnome-base/libgnome-2.14.0 + >=gnome-base/libgnomeui-2.14.0 ) ) ) + kde? ( kde-base/kdelibs + kontact? ( || ( kde-base/kdelibs:3.5 kde-base/kdepimlibs ) ) ) + ldap? ( net-nds/openldap[sasl] ) + libnotify? ( x11-libs/libnotify + debug? ( >=x11-libs/libnotify-0.4.5 ) ) + shm? ( x11-libs/libXext ) + xcap? ( net-libs/libsoup:2.4 ) + xv? ( x11-libs/libXv )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.20 + >=sys-devel/make-3.81 + doc? ( app-text/scrollkeeper + app-text/gnome-doc-utils ) + v4l? ( sys-kernel/linux-headers )" + +DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO" + +# debug is managed by the ebuild +GCONF_DEBUG="no" + +# NOTES: +# +# make 3.80 is breaking installation phase, need make 3.81 at least +# having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to +# represent it with || in gnome dep +# btw, configure.ac checks for >2.13.1 but ekiga blog talks about >=2.14 +# TODO: gstreamer version needed is not in portage, see bug 261879 +# gstreamer? ( >=media-libs/gst-plugins-base-0.10.21.3:0.10 ) +# and probably media-libs/gst-plugins-bad +# TODO: gnome2 eclass add --[dis|en]able-gtk-doc wich throws a QA warning +# a patch has been submitted, see bug 262491 +# ptlib/opal needed features are not checked by ekiga, see bug 577249 (upstream) +# opal[sip] should not be needed, it's an ekiga bug, see bug 577248 (upstream) +# default src_test is working (with make check) +# there is a bug in libnotify-0.4.4 fixed in 0.4.5 wich is thrown in debug + +# TODO: fix build with kde-4.2 (kde and kontact use flags) +# TODO: test with kde-3.5 (kde and kontact use flags) +# TODO: what is blocking ekiga.net register ? + +pkg_setup() { + if use kontact && ! use kde; then + eerror "You need to enable kde if you want to enable kontact" + eerror "Please, re-emerge with disabling kontact or enabling kde" + die + fi + + # update scrollkeeper database if doc has been enabled + if use doc; then + SCROLLKEEPER_UPDATE=1 + else + SCROLLKEEPER_UPDATE=0 + fi + + # dbus-service: always enable if dbus is enabled, no reason to disable it + # scrollkeeper: updates scrollkeeper database + # schemas-install: install gconf schemas + # TODO: needed gstreamer version is not in portage yet + G2CONF="${G2CONF} + --disable-dependency-tracking + --enable-fast-install + --disable-maintainer-mode + --enable-libtool-lock + --disable-gstreamer + $(use_enable avahi) + $(use_enable dbus) + $(use_enable dbus dbus_service) + $(use_enable debug gtk-debug) + $(use_enable debug opal-debug) + $(use_enable doc gdu) + $(use_enable doc scrollkeeper) + $(use_enable eds) + $(use_enable gconf) + $(use_enable gconf schemas-install) + $(use_enable gnome) + $(use_enable kde) + $(use_enable kontact kab) + $(use_enable ldap) + $(use_enable libnotify notify) + $(use_enable nls) + $(use_enable static static-libs) + $(use_enable xcap) + $(use_enable xv)" +} + +src_prepare() { + gnome2_src_prepare + + # configure has many mistakes with this release + # upstream has been contacted, see bug 577080 in their bugtracker + # fixing configure instead of configure.ac prevents eautoreconf + epatch "${FILESDIR}"/${P}-configure.patch + + # remove call to gconftool-2 --shutdown + # upstream has been contacted, see bug 555976 in their bugtracker + # gnome-2 eclass is reloading schemas with SIGHUP + sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \ + || die "patching Makefile.in failed" + + # fix compilation issues when PTRACING is disabled in ptlib + # upstream has been contacted, see bug 575433 in their bugtracker + epatch "${FILESDIR}"/${P}-ptracing.patch + + # compilation breaks with xcap enable + # it has been fixed in ekiga svn repository so backporting the patch + if use xcap; then + epatch "${FILESDIR}"/${P}-xcap.patch + fi + + # mmx is automatically enabled for some arch, want it to be a user choice + # upstream has been contacted, see bug 575831 in their bugtracker + if use mmx; then + sed -i -e "s/use_x86_asm=no/use_x86_asm=yes/" configure \ + || die "patching configure failed" + else + sed -i -e "s/use_x86_asm=yes/use_x86_asm=no/" configure \ + || die "patching configure failed" + fi + + # SIP is automatically enabled with opal[sip], want it to be a user choice + # upstream has been contacted, see bug 575832 in their bugtracker + if ! use sip; then + sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure \ + || die "patching configure failed" + sed -i -e \ + "s:SIP=\`\$PKG_CONFIG --variable=OPAL_SIP opal\`:SIP=\"no\":" \ + configure || die "patching configure failed" + fi + + # H323 is automatically enabled with opal[h323], want it to be a user choice + # upstream has been contacted, see bug 575833 in their bugtracker + if ! use h323; then + sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure \ + || die "patching configure failed" + sed -i -e \ + "s:H323=\`\$PKG_CONFIG --variable=OPAL_H323 opal\`:H323=\"no\":" \ + configure || die "patching configure failed" + fi + + # SHM support from libXext is auto-enabled, want it to be a user choice + # upstream has been contacted, see bug 575835 in their bugtracker + if ! use shm; then + sed -i -e "s/with_shm=\"yes\"/with_shm=\"no\"/" configure \ + || die "patching configure failed" + fi + + # V4L support is auto-enabled, want it to be a user choice + # do not contact upstream because that's a hack + # TODO: check if upstream has removed this hack + if ! use v4l; then + sed -i -e "s/V4L=\"enabled\"/V4L=\"disabled\"/" configure \ + || die "patching configure failed" + fi +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! use gnome; then + ewarn "USE=-gnome is experimental, some weirdness with the UI and" + ewarn "config keys can appear." + fi +} diff --git a/net-im/ekiga/files/ekiga-3.2.0-configure.patch b/net-im/ekiga/files/ekiga-3.2.0-configure.patch new file mode 100644 index 0000000..1687839 --- /dev/null +++ b/net-im/ekiga/files/ekiga-3.2.0-configure.patch @@ -0,0 +1,46 @@ +--- configure.old 2009-03-29 14:53:29.000000000 -0400 ++++ configure 2009-03-28 11:20:41.000000000 -0400 +@@ -25071,7 +25071,9 @@ + + # Check whether --enable-gstreamer was given. + if test "${enable_gstreamer+set}" = set; then +- enableval=$enable_gstreamer; enable_gstreamer=yes ++ enableval=$enable_gstreamer; ++else ++ enable_gstreamer=yes + fi + + +@@ -25220,7 +25222,9 @@ + + # Check whether --enable-kde was given. + if test "${enable_kde+set}" = set; then +- enableval=$enable_kde; enable_kde=yes ++ enableval=$enable_kde; ++else ++ enable_kde=yes + fi + + +@@ -25401,7 +25405,9 @@ + + # Check whether --enable-kab was given. + if test "${enable_kab+set}" = set; then +- enableval=$enable_kab; enable_kab=yes ++ enableval=$enable_kab; ++else ++ enable_kab=yes + fi + + +@@ -25588,7 +25594,9 @@ + + # Check whether --enable-xcap was given. + if test "${enable_xcap+set}" = set; then +- enableval=$enable_xcap; enable_xcap=yes ++ enableval=$enable_xcap; ++else ++ enable_xcap=yes + fi + + diff --git a/net-im/ekiga/files/ekiga-3.2.0-ptracing.patch b/net-im/ekiga/files/ekiga-3.2.0-ptracing.patch new file mode 100644 index 0000000..5b3c566 --- /dev/null +++ b/net-im/ekiga/files/ekiga-3.2.0-ptracing.patch @@ -0,0 +1,137 @@ +diff -ru ekiga-3.2.0-old/lib/engine/audioinput/audioinput-core.cpp ekiga-3.2.0/lib/engine/audioinput/audioinput-core.cpp +--- ekiga-3.2.0-old/lib/engine/audioinput/audioinput-core.cpp 2009-01-07 05:02:11.000000000 -0500 ++++ ekiga-3.2.0/lib/engine/audioinput/audioinput-core.cpp 2009-03-28 12:58:37.000000000 -0400 +@@ -197,13 +197,13 @@ + iter++) + (*iter)->get_devices (devices); + +- if (PTrace::CanTrace(4)) { +- for (std::vector<AudioInputDevice>::iterator iter = devices.begin (); +- iter != devices.end (); +- iter++) { +- PTRACE(4, "AudioInputCore\tDetected Device: " << *iter); +- } +- } ++#if PTRACING ++ for (std::vector<AudioInputDevice>::iterator iter = devices.begin (); ++ iter != devices.end (); ++ iter++) { ++ PTRACE(4, "AudioInputCore\tDetected Device: " << *iter); ++ } ++#endif // PTRACING + + } + +diff -ru ekiga-3.2.0-old/lib/engine/audiooutput/audiooutput-core.cpp ekiga-3.2.0/lib/engine/audiooutput/audiooutput-core.cpp +--- ekiga-3.2.0-old/lib/engine/audiooutput/audiooutput-core.cpp 2009-01-07 05:02:11.000000000 -0500 ++++ ekiga-3.2.0/lib/engine/audiooutput/audiooutput-core.cpp 2009-03-28 12:59:58.000000000 -0400 +@@ -151,13 +151,13 @@ + iter++) + (*iter)->get_devices (devices); + +- if (PTrace::CanTrace(4)) { +- for (std::vector<AudioOutputDevice>::iterator iter = devices.begin (); +- iter != devices.end (); +- iter++) { +- PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter); +- } +- } ++#if PTRACING ++ for (std::vector<AudioOutputDevice>::iterator iter = devices.begin (); ++ iter != devices.end (); ++ iter++) { ++ PTRACE(4, "AudioOutputCore\tDetected Device: " << *iter); ++ } ++#endif // PTRACING + + } + +diff -ru ekiga-3.2.0-old/lib/engine/videoinput/videoinput-core.cpp ekiga-3.2.0/lib/engine/videoinput/videoinput-core.cpp +--- ekiga-3.2.0-old/lib/engine/videoinput/videoinput-core.cpp 2009-03-01 17:47:10.000000000 -0500 ++++ ekiga-3.2.0/lib/engine/videoinput/videoinput-core.cpp 2009-03-28 12:57:34.000000000 -0400 +@@ -207,13 +207,13 @@ + iter++) + (*iter)->get_devices (devices); + +- if (PTrace::CanTrace(4)) { +- for (std::vector<VideoInputDevice>::iterator iter = devices.begin (); +- iter != devices.end (); +- iter++) { +- PTRACE(4, "VidInputCore\tDetected Device: " << *iter); +- } +- } ++#if PTRACING ++ for (std::vector<VideoInputDevice>::iterator iter = devices.begin (); ++ iter != devices.end (); ++ iter++) { ++ PTRACE(4, "VidInputCore\tDetected Device: " << *iter); ++ } ++#endif // PTRACING + } + + void VideoInputCore::set_device(const VideoInputDevice & device, int channel, VideoInputFormat format) +diff -ru ekiga-3.2.0-old/lib/gui/xvwindow.cpp ekiga-3.2.0/lib/gui/xvwindow.cpp +--- ekiga-3.2.0-old/lib/gui/xvwindow.cpp 2009-01-07 05:02:11.000000000 -0500 ++++ ekiga-3.2.0/lib/gui/xvwindow.cpp 2009-03-28 12:50:33.000000000 -0400 +@@ -409,8 +409,9 @@ + continue; + } + +- if (PTrace::CanTrace (4)) +- DumpCapabilities (candidateXVPort); ++#if PTRACING ++ DumpCapabilities (candidateXVPort); ++#endif // PTRACING + + // Check if the Port supports YV12/YUV colorspace + supportsYV12 = false; +@@ -684,7 +685,8 @@ + } + } + +- if ( (_useShm) && (PTrace::CanTrace (4)) ) { ++#if PTRACING ++ if ( (_useShm) ) { + int j = 0; + PTRACE(4, "XVideo\tCreated XvImage (" << _XVImage[i]->width << "x" << _XVImage[i]->height + << ", data size: " << _XVImage[i]->data_size << ", num_planes: " << _XVImage[i]->num_planes); +@@ -692,6 +694,7 @@ + for (j = 0 ; j < _XVImage[i]->num_planes ; j++) + PTRACE(4, "XVideo\t Plane " << j << ": pitch=" << _XVImage[i]->pitches [j] << ", offset=" << _XVImage[i]->offsets [j]); + } ++#endif // PTRACING + + if (_useShm) { + _XShmInfo[i].shmid = shmget (IPC_PRIVATE, _XVImage[i]->data_size, IPC_CREAT | 0777); +diff -ru ekiga-3.2.0-old/lib/gui/xwindow.cpp ekiga-3.2.0/lib/gui/xwindow.cpp +--- ekiga-3.2.0-old/lib/gui/xwindow.cpp 2009-01-07 05:02:11.000000000 -0500 ++++ ekiga-3.2.0/lib/gui/xwindow.cpp 2009-03-28 12:47:40.000000000 -0400 +@@ -200,8 +200,9 @@ + PTRACE(4, "X11\tInitiasing new X11 window with " << windowWidth << "x" << windowHeight << " at " << x << "," << y); + XLockDisplay (_display); + +- if (PTrace::CanTrace (4)) +- DumpVisuals(); ++#if PTRACING ++ DumpVisuals(); ++#endif // PTRACING + + if (!CreateAtomsAndWindow(gc, x, y, windowWidth, windowHeight)) { + XUnlockDisplay(_display); +diff -ru ekiga-3.2.0-old/src/gui/main.cpp ekiga-3.2.0/src/gui/main.cpp +--- ekiga-3.2.0-old/src/gui/main.cpp 2009-03-03 16:48:37.000000000 -0500 ++++ ekiga-3.2.0/src/gui/main.cpp 2009-03-28 13:16:24.000000000 -0400 +@@ -4453,10 +4453,13 @@ + /* Ekiga initialisation */ + static GnomeMeeting instance; + ++#if PTRACING + if (debug_level != 0) + PTrace::Initialise (PMAX (PMIN (5, debug_level), 0), NULL, + PTrace::Timestamp | PTrace::Thread + | PTrace::Blocks | PTrace::DateAndTime); ++#endif // PTRACING ++ + #ifdef EKIGA_REVISION + PTRACE(1, "Ekiga SVN revision: " << EKIGA_REVISION); + #endif diff --git a/net-im/ekiga/files/ekiga-3.2.0-xcap.patch b/net-im/ekiga/files/ekiga-3.2.0-xcap.patch new file mode 100644 index 0000000..756fc79 --- /dev/null +++ b/net-im/ekiga/files/ekiga-3.2.0-xcap.patch @@ -0,0 +1,77 @@ +--- trunk/lib/engine/components/resource-list/rl-entry-ref.cpp 2009/01/05 17:10:55 7516 ++++ trunk/lib/engine/components/resource-list/rl-entry-ref.cpp 2009/03/17 20:28:41 7784 +@@ -37,6 +37,8 @@ + + #include "config.h" + ++#include <glib/gi18n-lib.h> ++ + #include "rl-entry-ref.h" + + #include "presence-core.h" +@@ -131,8 +133,7 @@ + sigc::mem_fun (this, &RL::EntryRef::refresh)); + + if ( !uri.empty ()) +- populated = +- presence_core->populate_presentity_menu (*this, uri, builder) ++ populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder) + || populated; + + return populated; +--- trunk/lib/engine/components/resource-list/rl-entry.cpp 2009/01/05 17:10:55 7516 ++++ trunk/lib/engine/components/resource-list/rl-entry.cpp 2009/03/17 20:28:41 7784 +@@ -37,6 +37,8 @@ + + #include "config.h" + ++#include <glib/gi18n-lib.h> ++ + #include "rl-entry.h" + + #include "presence-core.h" +@@ -144,8 +146,7 @@ + sigc::mem_fun (this, &RL::Entry::refresh)); + + if ( !uri.empty ()) +- populated = +- presence_core->populate_presentity_menu (*this, uri, builder) ++ populated = presence_core->populate_presentity_menu (gmref_ptr<Ekiga::Presentity> (this), uri, builder) + || populated; + + return populated; +--- trunk/lib/engine/components/resource-list/rl-list.cpp 2009/01/05 17:10:55 7516 ++++ trunk/lib/engine/components/resource-list/rl-list.cpp 2009/03/17 20:28:41 7784 +@@ -38,6 +38,7 @@ + #include "config.h" + + #include <glib.h> ++#include <glib/gi18n-lib.h> + + #include "rl-list.h" + +@@ -320,8 +321,9 @@ + && child->name != NULL + && xmlStrEqual (BAD_CAST "list", child->name)) { + +- gmref_ptr<List> list = new List (core, path, +- list_pos, display_name, child); ++ gmref_ptr<List> list = gmref_ptr<List> (new List (core, path, ++ list_pos, display_name, ++ child)); + list->entry_added.connect (entry_added.make_slot ()); + list->entry_updated.connect (entry_updated.make_slot ()); + list->entry_removed.connect (entry_removed.make_slot ()); +@@ -336,8 +338,10 @@ + && child->name != NULL + && xmlStrEqual (BAD_CAST "entry", child->name)) { + +- gmref_ptr<Entry> entry = new Entry (core, path, +- entry_pos, display_name, child); ++ gmref_ptr<Entry> entry = gmref_ptr<Entry> (new Entry (core, path, ++ entry_pos, ++ display_name, ++ child)); + std::list<sigc::connection> conns; + conns.push_back (entry->updated.connect (sigc::bind (entry_updated.make_slot (), entry))); + conns.push_back (entry->removed.connect (sigc::bind (entry_removed.make_slot (), entry))); diff --git a/net-im/ekiga/metadata.xml b/net-im/ekiga/metadata.xml index ef56750..6db3b1f 100644 --- a/net-im/ekiga/metadata.xml +++ b/net-im/ekiga/metadata.xml @@ -8,5 +8,6 @@ <flag name="shm">Enable the Shared Memory Extension from libXext</flag> <flag name="sip">Enable Session Initiation Protocol</flag> <flag name="static">Statically link to opal and ptlib</flag> + <flag name="xcap">Enable XML Configuration Access Protocal</flag> </use> </pkgmetadata> |