diff options
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/ekiga/ChangeLog | 9 | ||||
| -rw-r--r-- | net-voip/ekiga/ekiga-3.2.5.ebuild (renamed from net-voip/ekiga/ekiga-3.2.4.ebuild) | 51 | ||||
| -rw-r--r-- | net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch | 21 |
3 files changed, 21 insertions, 60 deletions
diff --git a/net-voip/ekiga/ChangeLog b/net-voip/ekiga/ChangeLog index c0f7eb72ca29..8503245920a4 100644 --- a/net-voip/ekiga/ChangeLog +++ b/net-voip/ekiga/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-voip/ekiga # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.6 2009/08/03 21:34:42 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ChangeLog,v 1.7 2009/08/26 11:25:39 volkmar Exp $ + +*ekiga-3.2.5 (26 Aug 2009) + + 26 Aug 2009; Mounir Lamouri <volkmar@gentoo.org> + -files/ekiga-3.2.4-gtk+-2.12-fix.patch, -ekiga-3.2.4.ebuild, + +ekiga-3.2.5.ebuild: + Version bump to 3.2.5. Fix bug 281170. 03 Aug 2009; Markus Meier <maekke@gentoo.org> ekiga-3.2.4.ebuild: add ~amd64, bug #276355 diff --git a/net-voip/ekiga/ekiga-3.2.4.ebuild b/net-voip/ekiga/ekiga-3.2.5.ebuild index 27fb2df66438..35df748b6353 100644 --- a/net-voip/ekiga/ekiga-3.2.4.ebuild +++ b/net-voip/ekiga/ekiga-3.2.5.ebuild @@ -1,17 +1,18 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.4.ebuild,v 1.4 2009/08/03 21:34:42 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-voip/ekiga/ekiga-3.2.5.ebuild,v 1.1 2009/08/26 11:25:39 volkmar Exp $ EAPI="2" KDE_REQUIRED="optional" +WANT_CMAKE="false" +GCONF_DEBUG="no" # debug managed by the ebuild -inherit eutils kde4-base gnome2 +inherit kde4-base gnome2 # gnome2 at the end to make it default DESCRIPTION="H.323 and SIP VoIP softphone" HOMEPAGE="http://www.ekiga.org/" -SRC_URI="${SRC_URI} mirror://gentoo/${P}-remove-exceptions.patch.bz2" LICENSE="GPL-2" SLOT="0" @@ -22,8 +23,8 @@ libnotify mmx nls +shm +sip static v4l xcap xv" RDEPEND=">=dev-libs/glib-2.8.0:2 dev-libs/libsigc++:2 dev-libs/libxml2:2 - >=net-libs/opal-3.6.2[audio,sip,video,debug=,h323?] - >=net-libs/ptlib-2.6.2[stun,video,wav,debug=] + >=net-libs/opal-3.6.4[audio,sip,video,debug=,h323?] + >=net-libs/ptlib-2.6.4[stun,video,wav,debug=] >=x11-libs/gtk+-2.12.0:2 avahi? ( >=net-dns/avahi-0.6[dbus] ) dbus? ( >=sys-apps/dbus-0.36 @@ -52,21 +53,8 @@ DEPEND="${RDEPEND} app-text/gnome-doc-utils ) v4l? ( sys-kernel/linux-headers )" -DOC_LINGUAS="bg ca de el en_GB es eu fi fr oc pt_BR ru sv uk" -IUSE_LINGUAS="${DOC_LINGUAS} am ar as az be bg bn_IN bn bs ca crh cs cy da de dz -el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku -lt lv mai mk ml mn mr ms nb ne nl nn oc or pa pl pt_BR pt ro ru rw si sk sl sq -sr@latin sr sv ta te th tr uk vi wa xh zh_CN zh_HK zh_TW" - -for l in ${IUSE_LINGUAS}; do - IUSE="${IUSE} linguas_${l}" -done - DOCS="AUTHORS ChangeLog FAQ MAINTAINERS NEWS README TODO" -# debug is managed by the ebuild -GCONF_DEBUG="no" - # NOTES: # having >=gtk+-2.14 is actually removing need of +gnome but it's clearer to # represent it with || in gnome dep @@ -75,7 +63,7 @@ GCONF_DEBUG="no" # ptlib/opal needed features are not checked by ekiga, upstream bug 577249 # opal[sip] should be opal[sip?], upstream bug 577248 # libnotify-0.4.4 bug with +debug, upstream bug 583719 -# doc is not installing dev doc (doxygen) +# +doc is not installing dev doc (doxygen) # TODO: # if really want to use ked4-base, should use COMMONDEPEND @@ -101,13 +89,6 @@ pkg_setup() { die "You need to enable kde or disable kontact." fi - strip-linguas ${IUSE_LINGUAS} - - if [[ -z "${LINGUAS}" ]]; then - # no linguas set, using the default one - LINGUAS=" " - fi - # update scrollkeeper database if doc has been enabled if use doc; then SCROLLKEEPER_UPDATE=1 @@ -149,32 +130,26 @@ pkg_setup() { src_prepare() { gnome2_src_prepare - epatch "${FILESDIR}"/${P}-gtk+-2.12-fix.patch - epatch "${WORKDIR}"/${P}-remove-exceptions.patch - # remove call to gconftool-2 --shutdown, upstream bug 555976 # gnome-2 eclass is reloading schemas with SIGHUP - sed -i -e '/gconftool-2 --shutdown/d' Makefile.in \ - || die "patching Makefile.in failed" + sed -i -e '/gconftool-2 --shutdown/d' Makefile.in || die "sed failed" # SIP is automatically enabled with opal[sip], want it to be a user choice # upstream bug 575832 if ! use sip; then - sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure \ - || die "patching configure failed" + sed -i -e "s/SIP=\"yes\"/SIP=\"no\"/" configure || die "sed failed" sed -i -e \ "s:SIP=\`\$PKG_CONFIG --variable=OPAL_SIP opal\`:SIP=\"no\":" \ - configure || die "patching configure failed" + configure || die "sed failed" fi # H323 is automatically enabled with opal[h323], want it to be a user choice # upstream bug 575833 if ! use h323; then - sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure \ - || die "patching configure failed" + sed -i -e "s/H323=\"yes\"/H323=\"no\"/" configure || die "sed failed" sed -i -e \ "s:H323=\`\$PKG_CONFIG --variable=OPAL_H323 opal\`:H323=\"no\":" \ - configure || die "patching configure failed" + configure || die "sed failed" fi # V4L support is auto-enabled, want it to be a user choice @@ -182,7 +157,7 @@ src_prepare() { # 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" + || die "sed failed" fi } diff --git a/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch b/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch deleted file mode 100644 index 9378590a0252..000000000000 --- a/net-voip/ekiga/files/ekiga-3.2.4-gtk+-2.12-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6e79ecaaa2230a879ea51ff7c5680d9402b96321 Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Mon, 25 May 2009 12:14:23 +0000 -Subject: Fix compilation with gtk 2.12 - ---- -diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp -index 238609b..883c10d 100644 ---- a/src/gui/assistant.cpp -+++ b/src/gui/assistant.cpp -@@ -343,7 +343,7 @@ static void - name_changed_cb (GtkEntry *entry, - GtkAssistant *assistant) - { -- set_current_page_complete (assistant, gtk_entry_get_text_length (entry) > 0); -+ set_current_page_complete (assistant, (gtk_entry_get_text (entry))[0] != '\0'); - } - - --- -cgit v0.8.2 |