diff options
author | wiz <wiz@pkgsrc.org> | 2009-12-08 12:45:42 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2009-12-08 12:45:42 +0000 |
commit | 15709c62b1b81b82e4e1df800d4c5fde9ef93fcf (patch) | |
tree | 3d28c74b5b33b1a06b1f52d82aa8ee4e45c360ab /chat/pidgin | |
parent | 8f160db64499f70f853c69672e42e56661060093 (diff) | |
download | pkgsrc-15709c62b1b81b82e4e1df800d4c5fde9ef93fcf.tar.gz |
Update to 2.6.2, based on patches provided by Joachim Kuebart in PR 42005.
Additional changes:
Fix farsight handling in libpurple.
Set LICENSE.
2.6.2 (09/05/2009):
Mark: Woo boy it's been a busy two weeks. There was a lot of new code
in 2.6.0, and with new code comes new bugs. The cadre of relentless
developers responsible for Pidgin have been hard at work, and I believe
they have fixed all the major bugs that cropped up. My thanks to all
those names listed as Current Developers in Pidgin's 'About' window.
Elliott: Well now, just as Mark said, there was a lot of new stuff that
probably came up with tons of bugs. So I can't say I wrote anything
super-awesome, but I definitely fixed quite a few of those itty-bitty
why-didn't-this-work-this-way sort of bugs.
Diffstat (limited to 'chat/pidgin')
-rw-r--r-- | chat/pidgin/PLIST | 9 | ||||
-rw-r--r-- | chat/pidgin/options.mk | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/chat/pidgin/PLIST b/chat/pidgin/PLIST index 667f531cece..4e1f5fe239d 100644 --- a/chat/pidgin/PLIST +++ b/chat/pidgin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $ +@comment $NetBSD: PLIST,v 1.15 2009/12/08 12:45:42 wiz Exp $ bin/pidgin include/pidgin/eggtrayicon.h include/pidgin/gtkaccount.h @@ -74,6 +74,7 @@ lib/pidgin/themeedit.la lib/pidgin/ticker.la lib/pidgin/timestamp.la lib/pidgin/timestamp_format.la +${PLIST.vv}lib/pidgin/vvconfig.la lib/pidgin/xmppconsole.la lib/pidgin/xmppdisco.la lib/pkgconfig/pidgin.pc @@ -574,13 +575,13 @@ share/pixmaps/pidgin/toolbar/16/send-file.png share/pixmaps/pidgin/toolbar/16/transfer.png share/pixmaps/pidgin/toolbar/16/unblock.png share/pixmaps/pidgin/toolbar/16/video-call.png +share/pixmaps/pidgin/toolbar/22/audio-call.png share/pixmaps/pidgin/toolbar/22/select-avatar.png share/pixmaps/pidgin/toolbar/22/video-call.png -share/pixmaps/pidgin/toolbar/22/voice-call.png +share/pixmaps/pidgin/toolbar/32/audio-call.png share/pixmaps/pidgin/toolbar/32/video-call.png -share/pixmaps/pidgin/toolbar/32/voice-call.png +share/pixmaps/pidgin/toolbar/48/audio-call.png share/pixmaps/pidgin/toolbar/48/video-call.png -share/pixmaps/pidgin/toolbar/48/voice-call.png share/pixmaps/pidgin/tray/16/available_4bit.ico share/pixmaps/pidgin/tray/16/away_4bit.ico share/pixmaps/pidgin/tray/16/busy_4bit.ico diff --git a/chat/pidgin/options.mk b/chat/pidgin/options.mk index 51c33767ee4..1ae5581bc5c 100644 --- a/chat/pidgin/options.mk +++ b/chat/pidgin/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $ +# $NetBSD: options.mk,v 1.8 2009/12/08 12:45:42 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pidgin PKG_SUPPORTED_OPTIONS+= dbus debug farsight gstreamer gtkspell @@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS+= gtkspell dbus farsight gstreamer .include "../../mk/bsd.options.mk" -PLIST_VARS+= dbus +PLIST_VARS+= dbus vv .if !empty(PKG_OPTIONS:Mdbus) CONFIGURE_ARGS+= --enable-dbus @@ -15,6 +15,12 @@ PLIST.dbus= yes . include "../../sysutils/dbus-glib/buildlink3.mk" .endif +# voice/video support requires both farsight and gstreamer +.if !empty(PKG_OPTIONS:Mfarsight) && !empty(PKG_OPTIONS:Mgstreamer) +CONFIGURE_ARGS+= --enable-vv +PLIST.vv= yes +.endif + .if !empty(PKG_OPTIONS:Mfarsight) CONFIGURE_ARGS+= --enable-farsight . include "../../multimedia/farsight2/buildlink3.mk" |