Re: pkg/42005: Update the Pidgin family of packages from 2.6.1 to 2.6.2

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost,joachim.kuebart%gmx.net@localhost
Subject: Re: pkg/42005: Update the Pidgin family of packages from 2.6.1 to 2.6.2
From: Joachim Kuebart <joachim.kuebart%gmx.net@localhost>
Date: Wed, 9 Sep 2009 09:45:02 +0000 (UTC)
The following reply was made to PR pkg/42005; it has been noted by GNATS.

From: Joachim Kuebart <joachim.kuebart%gmx.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/42005: Update the Pidgin family of packages from 2.6.1 to
 2.6.2
Date: Wed, 09 Sep 2009 10:25:49 +0100

 --=-xlWu/STR7kqVutbWe+Ms
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Playing around with voice and video support in Pidgin, it turned out
 that libpurple does need the --enable-vv configure option as well as
 dependencies on farsight2 and gst-plugins0.10-base. So below is a new
 set of patches.
 
 Previously, the voice/video plugin was greyed out in the plugins menu,
 whereas now it can be selected and configured. The "audio call" option
 is still greyed out for me though.
 
 Note: chat/libpurple/patches/patch-aa isn't needed anymore!
 
 
 --=-xlWu/STR7kqVutbWe+Ms
 Content-Disposition: attachment; filename="pidgin-1.6.2.diff"
 Content-Type: text/x-patch; name="pidgin-1.6.2.diff"; charset="UTF-8"
 Content-Transfer-Encoding: 7bit
 
 Index: chat/finch/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/finch/options.mk,v
 retrieving revision 1.3
 diff -p -U8 -r1.3 options.mk
 --- chat/finch/options.mk      18 May 2008 00:06:46 -0000      1.3
 +++ chat/finch/options.mk      9 Sep 2009 09:36:20 -0000
 @@ -1,13 +1,13 @@
  # $NetBSD: options.mk,v 1.3 2008/05/18 00:06:46 tnn Exp $
  
  PKG_OPTIONS_VAR=              PKG_OPTIONS.finch
  PKG_SUPPORTED_OPTIONS+=               gstreamer debug
 -PKG_SUGGESTED_OPTIONS+=
 +PKG_SUGGESTED_OPTIONS+=               gstreamer
  
  .include "../../mk/bsd.options.mk"
  
  .if !empty(PKG_OPTIONS:Mgstreamer)
  .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
  .endif
  
  .if !empty(PKG_OPTIONS:Mdebug)
 Index: chat/libpurple/Makefile.common
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/Makefile.common,v
 retrieving revision 1.29
 diff -p -U8 -r1.29 Makefile.common
 --- chat/libpurple/Makefile.common     6 Sep 2009 21:06:44 -0000       1.29
 +++ chat/libpurple/Makefile.common     9 Sep 2009 09:36:20 -0000
 @@ -1,17 +1,17 @@
  # $NetBSD: Makefile.common,v 1.29 2009/09/06 21:06:44 abs Exp $
  #
  # used by chat/finch/Makefile
  # used by chat/libpurple/Makefile
  # used by chat/pidgin/Makefile
  # used by chat/pidgin-sametime/Makefile
  # used by chat/pidgin-silc/Makefile
  
 -PIDGIN_VERSION=       2.6.1
 +PIDGIN_VERSION=       2.6.2
  DISTNAME=     pidgin-${PIDGIN_VERSION}
  CATEGORIES=   chat
  MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
  EXTRACT_SUFX= .tar.bz2
  
  MAINTAINER=   pkgsrc-users%NetBSD.org@localhost
  HOMEPAGE=     http://www.pidgin.im/
  
 @@ -27,14 +27,16 @@ CONFIGURE_ARGS+=   --disable-gevolution
  CONFIGURE_ARGS+=      --disable-gtkui
  CONFIGURE_ARGS+=      --disable-consoleui
  CONFIGURE_ARGS+=      --disable-meanwhile
  CONFIGURE_ARGS+=      --disable-farsight
  CONFIGURE_ARGS+=      --disable-gstreamer
  CONFIGURE_ARGS+=      --disable-avahi
  CONFIGURE_ARGS+=      --disable-perl
  CONFIGURE_ARGS+=      --disable-tcl
 +CONFIGURE_ARGS+=      --disable-tk
  CONFIGURE_ARGS+=      --disable-gnutls
  CONFIGURE_ARGS+=      --disable-nss
  CONFIGURE_ARGS+=      --disable-dbus
  CONFIGURE_ARGS+=      --disable-cyrus-sasl
  CONFIGURE_ARGS+=      --disable-debug
  CONFIGURE_ARGS+=      --disable-nm
 +CONFIGURE_ARGS+=      --disable-vv
 Index: chat/libpurple/PLIST
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/PLIST,v
 retrieving revision 1.19
 diff -p -U8 -r1.19 PLIST
 --- chat/libpurple/PLIST       6 Sep 2009 21:06:44 -0000       1.19
 +++ chat/libpurple/PLIST       9 Sep 2009 09:36:20 -0000
 @@ -1,9 +1,9 @@
 -@comment $NetBSD: PLIST,v 1.19 2009/09/06 21:06:44 abs Exp $
 +@comment $NetBSD$
  include/libpurple/account.h
  include/libpurple/accountopt.h
  include/libpurple/blist.h
  include/libpurple/buddyicon.h
  include/libpurple/certificate.h
  include/libpurple/cipher.h
  include/libpurple/circbuffer.h
  include/libpurple/cmds.h
 @@ -87,16 +87,17 @@ lib/purple-2/libzephyr.la
  lib/purple-2/log_reader.la
  lib/purple-2/newline.la
  lib/purple-2/offlinemsg.la
  lib/purple-2/psychic.la
  ${PLIST.gnutls}lib/purple-2/ssl-gnutls.la
  ${PLIST.nss}lib/purple-2/ssl-nss.la
  lib/purple-2/ssl.la
  lib/purple-2/statenotify.la
 +${PLIST.tcl}lib/purple-2/tcl.la
  share/aclocal/purple.m4
  share/gconf/schemas/purple.schemas
  share/locale/af/LC_MESSAGES/pidgin.mo
  share/locale/am/LC_MESSAGES/pidgin.mo
  share/locale/ar/LC_MESSAGES/pidgin.mo
  share/locale/az/LC_MESSAGES/pidgin.mo
  share/locale/be@latin/LC_MESSAGES/pidgin.mo
  share/locale/bg/LC_MESSAGES/pidgin.mo
 Index: chat/libpurple/distinfo
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/distinfo,v
 retrieving revision 1.24
 diff -p -U8 -r1.24 distinfo
 --- chat/libpurple/distinfo    6 Sep 2009 21:06:44 -0000       1.24
 +++ chat/libpurple/distinfo    9 Sep 2009 09:36:20 -0000
 @@ -1,6 +1,5 @@
 -$NetBSD: distinfo,v 1.24 2009/09/06 21:06:44 abs Exp $
 +$NetBSD$
  
 -SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
 -RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
 -Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
 -SHA1 (patch-aa) = 7a1ec6bc64226dff60eac4b4835fabf1daecb9b3
 +SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
 +RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
 +Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
 Index: chat/libpurple/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/libpurple/options.mk,v
 retrieving revision 1.11
 diff -p -U8 -r1.11 options.mk
 --- chat/libpurple/options.mk  6 Sep 2009 21:06:44 -0000       1.11
 +++ chat/libpurple/options.mk  9 Sep 2009 09:36:20 -0000
 @@ -2,20 +2,21 @@
  
  PKG_OPTIONS_VAR=              PKG_OPTIONS.libpurple
  PKG_SUPPORTED_OPTIONS+=               gnutls perl tcl debug dbus sasl avahi
  PKG_SUPPORTED_OPTIONS+=               farsight gstreamer
  PKG_SUGGESTED_OPTIONS+=               gnutls dbus avahi farsight gstreamer
  
  .include "../../mk/bsd.options.mk"
  
 -PLIST_VARS+=          avahi dbus gnutls nss perl
 +PLIST_VARS+=          avahi dbus gnutls nss perl tcl
  
  .if !empty(PKG_OPTIONS:Mavahi)
  PLIST.avahi=            yes
 +CONFIGURE_ARGS+=      --enable-avahi
  .  include "../../net/avahi/buildlink3.mk"
  .endif
  
  .if !empty(PKG_OPTIONS:Mgnutls)
  PLIST.gnutls=         yes
  CONFIGURE_ARGS+=      --enable-gnutls
  CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
  CONFIGURE_ARGS+= --with-gnutls-libs=${BUILDLINK_PREFIX.gnutls}/lib
 @@ -35,16 +36,18 @@ CONFIGURE_ARGS+= --with-nss-libs=${BUILD
  .if !empty(PKG_OPTIONS:Mperl)
  PLIST.perl=           yes
  CONFIGURE_ARGS+=      --enable-perl
  USE_TOOLS+=           perl:run
  .  include "../../lang/perl5/buildlink3.mk"
  .endif
  
  .if !empty(PKG_OPTIONS:Mtcl)
 +PLIST.tcl=            yes
 +CONFIGURE_ARGS+=      --enable-tcl
  CONFIGURE_ARGS+=      --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib
  .  include "../../lang/tcl/buildlink3.mk"
  .endif
  
  .if !empty(PKG_OPTIONS:Mdbus)
  CONFIGURE_ARGS+=      --enable-dbus
  CONFIGURE_ARGS+=      --with-python=${PYTHONBIN}
  PLIST.dbus=           yes
 @@ -62,17 +65,24 @@ REPLACE_PYTHON+=   libpurple/purple-url-ha
  CONFIGURE_ARGS+=      --enable-debug
  .endif
  
  .if !empty(PKG_OPTIONS:Msasl)
  CONFIGURE_ARGS+=      --enable-cyrus-sasl
  .  include "../../security/cyrus-sasl/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"
  .endif
  
  .if !empty(PKG_OPTIONS:Mgstreamer)
  CONFIGURE_ARGS+=      --enable-gstreamer
  .  include "../../multimedia/gstreamer0.10/buildlink3.mk"
 +.  include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
  .endif
 Index: chat/pidgin/PLIST
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/PLIST,v
 retrieving revision 1.14
 diff -p -U8 -r1.14 PLIST
 --- chat/pidgin/PLIST  6 Sep 2009 21:06:45 -0000       1.14
 +++ chat/pidgin/PLIST  9 Sep 2009 09:36:21 -0000
 @@ -1,9 +1,9 @@
 -@comment $NetBSD: PLIST,v 1.14 2009/09/06 21:06:45 abs Exp $
 +@comment $NetBSD$
  bin/pidgin
  include/pidgin/eggtrayicon.h
  include/pidgin/gtkaccount.h
  include/pidgin/gtkblist-theme-loader.h
  include/pidgin/gtkblist-theme.h
  include/pidgin/gtkblist.h
  include/pidgin/gtkcelllayout.h
  include/pidgin/gtkcellrendererexpander.h
 @@ -69,16 +69,17 @@ lib/pidgin/notify.la
  lib/pidgin/pidginrc.la
  lib/pidgin/relnot.la
  lib/pidgin/sendbutton.la
  lib/pidgin/spellchk.la
  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
  share/applications/pidgin.desktop
  share/icons/hicolor/16x16/apps/pidgin.png
  share/icons/hicolor/22x22/apps/pidgin.png
  share/icons/hicolor/24x24/apps/pidgin.png
  share/icons/hicolor/32x32/apps/pidgin.png
 @@ -569,23 +570,23 @@ share/pixmaps/pidgin/toolbar/16/insert-i
  share/pixmaps/pidgin/toolbar/16/insert-link.png
  share/pixmaps/pidgin/toolbar/16/insert.png
  share/pixmaps/pidgin/toolbar/16/message-new.png
  share/pixmaps/pidgin/toolbar/16/plugins.png
  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
  share/pixmaps/pidgin/tray/16/connecting_4bit.ico
  share/pixmaps/pidgin/tray/16/extended-away_4bit.ico
  share/pixmaps/pidgin/tray/16/invisible_4bit.ico
  share/pixmaps/pidgin/tray/16/message_4bit.ico
  share/pixmaps/pidgin/tray/16/offline_4bit.ico
 Index: chat/pidgin/options.mk
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin/options.mk,v
 retrieving revision 1.7
 diff -p -U8 -r1.7 options.mk
 --- chat/pidgin/options.mk     6 Sep 2009 21:06:45 -0000       1.7
 +++ chat/pidgin/options.mk     9 Sep 2009 09:36:21 -0000
 @@ -1,25 +1,31 @@
  # $NetBSD: options.mk,v 1.7 2009/09/06 21:06:45 abs Exp $
  
  PKG_OPTIONS_VAR=              PKG_OPTIONS.pidgin
  PKG_SUPPORTED_OPTIONS+=               dbus debug farsight gstreamer gtkspell
  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
  PLIST.dbus=           yes
  .  include "../../sysutils/dbus/buildlink3.mk"
  .  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"
  .endif
  
  .if !empty(PKG_OPTIONS:Mgtkspell)
  CONFIGURE_ARGS+=      --enable-gtkspell
  .  include "../../textproc/gtkspell/buildlink3.mk"
 Index: chat/pidgin-silc/distinfo
 ===================================================================
 RCS file: /pub/NetBSD-CVS/pkgsrc/chat/pidgin-silc/distinfo,v
 retrieving revision 1.20
 diff -p -U8 -r1.20 distinfo
 --- chat/pidgin-silc/distinfo  6 Sep 2009 21:06:45 -0000       1.20
 +++ chat/pidgin-silc/distinfo  9 Sep 2009 09:36:21 -0000
 @@ -1,9 +1,9 @@
  $NetBSD: distinfo,v 1.20 2009/09/06 21:06:45 abs Exp $
  
 -SHA1 (pidgin-2.6.1.tar.bz2) = f14b1a6d36f3fc168c0e0d5949046eedee56d724
 -RMD160 (pidgin-2.6.1.tar.bz2) = f1682e2d37ca272bc10b0c7710e73fb4807749bf
 -Size (pidgin-2.6.1.tar.bz2) = 8964827 bytes
 +SHA1 (pidgin-2.6.2.tar.bz2) = 730b9bfaf79045f13e5d8dd736b91726bb11d332
 +RMD160 (pidgin-2.6.2.tar.bz2) = a070ebe07a40d650c173065e4c448034e096963b
 +Size (pidgin-2.6.2.tar.bz2) = 9093010 bytes
  SHA1 (silc-toolkit-1.1.7.tar.gz) = a25918e83d5070ff75b7d6f296698dada76a92ca
  RMD160 (silc-toolkit-1.1.7.tar.gz) = 783297f44d577d5ec7dcff7952996944e4b1d5c6
  Size (silc-toolkit-1.1.7.tar.gz) = 2678989 bytes
  SHA1 (patch-aa) = 1b1e34c7ecf91fb2ac8ddca3376b7803975420c0
 
 --=-xlWu/STR7kqVutbWe+Ms--
Prev by Date: Re: pkg/42012 (ejabberd needs expat but is not listed in dependencies)
Next by Date: PR/34444 CVS commit: pkgsrc/net/samba
Previous by Thread: pkg/42005: Update the Pidgin family of packages from 2.6.1 to 2.6.2
Next by Thread: pkg/42006: math/qalculate needs a revbump
Indexes:
Home | Main Index | Thread Index | Old Index