cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to pidgin 2.6.2

Browse Source 
from Brad (maintainer)
This commit is contained in:
steven 2009-09-08 06:35:24 +00:00
parent 1789f68911
commit 8f6bd65375
20 changed files with 186 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
net/pidgin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2009/08/20 10:43:13 sthen Exp $
# $OpenBSD: Makefile,v 1.52 2009/09/08 06:35:24 steven Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant messaging client
COMMENT-finch= multi-protocol instant messaging client, console client
COMMENT-libpurple= multi-protocol instant messaging library
VERSION= 2.5.9
VERSION= 2.6.2
DISTNAME= pidgin-${VERSION}
PKGNAME= pidgin-${VERSION}
PKGNAME-main= pidgin-${VERSION}
@ -17,9 +17,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pidgin/}
SHARED_LIBS= jabber 0.0 \
oscar 0.0 \
purple 4.7 \
purple-client 4.7 \
gnt 4.7
purple 5.0 \
purple-client 5.0 \
gnt 5.0 \
ymsg 0.0
HOMEPAGE= http://pidgin.im/
@ -32,18 +33,18 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
gthread-2.0 iconv intl m ncurses pcre pthread xml2 z
gthread-2.0 m pcre pthread xml2 z
WANTLIB-main= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
WANTLIB-main= X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
Xfixes Xi Xinerama Xrandr Xrender Xss atk-1.0 cairo \
execinfo expat fontconfig freetype gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glitz gtk-x11-2.0 pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
stdc++ xcb xcb-atom xcb-aux xcb-event ${WANTLIB}
execinfo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
gio-2.0 glitz gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb-atom \
xcb-aux xcb-event xcb ${WANTLIB}
WANTLIB-libpurple= crypto ssl ${WANTLIB}
WANTLIB-finch= X11 Xau Xdmcp panel pthread-stubs xcb ${WANTLIB}
WANTLIB-finch= X11 Xau Xdmcp ncurses panel pthread-stubs xcb ${WANTLIB}
MODULES= devel/gettext \
textproc/intltool \
@ -54,14 +55,17 @@ BUILD_DEPENDS= ::x11/dbus-python
RUN_DEPENDS-main= ::x11/dbus-python \
::x11/py-gtk2 \
::devel/desktop-file-utils
LIB_DEPENDS-main= startup-notification-1::devel/startup-notification \
LIB_DEPENDS-main= ${LIB_DEPENDS} \
startup-notification-1::devel/startup-notification \
purple:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
LIB_DEPENDS-finch= purple:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
RUN_DEPENDS-finch= # empty
LIB_DEPENDS-libpurple= silc.>=7,silcclient.>=5::devel/silc-toolkit \
LIB_DEPENDS-finch= ${LIB_DEPENDS} \
purple:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS}
LIB_DEPENDS-libpurple= ${LIB_DEPENDS} \
silc.>=7,silcclient.>=5::devel/silc-toolkit \
meanwhile::net/meanwhile \
gadu.>=4::net/libgadu
RUN_DEPENDS-libpurple= ${MODGCONF2_RUN_DEPENDS}
MODGCONF2_SCHEMAS_DIR= pidgin
MODGCONF2_LIBDEP= No
@ -74,15 +78,18 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-avahi \
--disable-cap \
--disable-doxygen \
--disable-farsight \
--disable-gevolution \
--disable-gnutls \
--disable-idn \
--disable-nm \
--disable-nss \
--disable-perl \
--disable-tcl \
--disable-tk \
--disable-cap \
--disable-vv \
--with-python=${MODPY_BIN}
# XXX prevent a fatal error at install phase
CONFIGURE_ARGS+= --disable-schemas-install
@ -102,8 +109,6 @@ LIB_DEPENDS-main+= gstreamer-0.10:gstreamer->=0.10,<=0.11:multimedia/gstreamer-0
LIB_DEPENDS-finch+= gstreamer-0.10:gstreamer->=0.10,<=0.11:multimedia/gstreamer-0.10/core
.else
CONFIGURE_ARGS+= --disable-gstreamer
# --disable-gstreamer is not sufficient
MAKE_FLAGS+= GSTREAMER_CFLAGS= GSTREAMER_LIBS=
.endif
.if ${FLAVOR:L:Mgtkspell}

10
net/pidgin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.5.9.tar.gz) = bR6qW8PVIj/P41g6mDefpg==
RMD160 (pidgin-2.5.9.tar.gz) = QraN7BOdzZByfzO+fiRF9EV0gd8=
SHA1 (pidgin-2.5.9.tar.gz) = +pOTEa7s7/HXTMi1+ge8LynThqY=
SHA256 (pidgin-2.5.9.tar.gz) = /NcaaDyeiL2Z3fF4jnwT0EvBS17EwYmfYuKOtYp6N+k=
SIZE (pidgin-2.5.9.tar.gz) = 11932429
MD5 (pidgin-2.6.2.tar.gz) = LbIMnETpqErkqSkPnkeugw==
RMD160 (pidgin-2.6.2.tar.gz) = 8sye1KK30F+LQSYqzexTww1iCGE=
SHA1 (pidgin-2.6.2.tar.gz) = bOskWqx+ycWSZRjToXxazvOdtY4=
SHA256 (pidgin-2.6.2.tar.gz) = A5KchqrtMW4vea/QNucANOEvTtvHYvMEd5oUOiw+caQ=
SIZE (pidgin-2.6.2.tar.gz) = 12811209

16
net/pidgin/patches/patch-config_h_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-config_h_in,v 1.11 2009/07/12 20:01:32 sthen Exp $
--- config.h.in.orig Sat Jun 27 22:12:40 2009
+++ config.h.in Mon Jun 29 22:43:21 2009
@@ -196,6 +196,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H
+/* Define if you have OpenSSL */
+#undef HAVE_OPENSSL
+
+/* Define to 1 if you have the <openssl/ssl.h> header file. */
+#undef HAVE_OPENSSL_SSL_H
+
/* Define if we have Pango 1.4 or newer. */
#undef HAVE_PANGO14

41
net/pidgin/patches/patch-configure_ac
View File

@ -1,15 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.17 2009/06/23 22:47:23 sthen Exp $
--- configure.ac.orig Sat Jun 20 22:34:16 2009
+++ configure.ac Sun Jun 21 23:50:42 2009
@@ -671,6 +671,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
+ LIBS="${LIBS} -lncurses"
AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
if test x"$ac_ncurses_includes" != "x"; then
@@ -866,7 +867,7 @@ else
$OpenBSD: patch-configure_ac,v 1.18 2009/09/08 06:35:24 steven Exp $
--- configure.ac.orig Sat Sep 5 17:12:04 2009
+++ configure.ac Mon Sep 7 11:08:19 2009
@@ -956,7 +956,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -18,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2009/06/23 22:47:23 sthen Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1606,6 +1607,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
@@ -1661,6 +1661,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
dnl These two are inverses of each other <-- stolen from evolution!
@ -30,12 +22,12 @@ $OpenBSD: patch-configure_ac,v 1.17 2009/06/23 22:47:23 sthen Exp $
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support [default=yes]],
[enable_gnutls="$enableval"],
@@ -1616,7 +1622,95 @@ AC_ARG_ENABLE(nss,
@@ -1671,10 +1676,98 @@ AC_ARG_ENABLE(nss,
[enable_nss="$enableval"],
[enable_nss="yes"])
-msg_ssl="None. MSN, Novell Groupwise, Yahoo! and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
+msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without OpenSSL, GnuTLS or NSS."
-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
+msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without OpenSSL, GnuTLS or NSS."
+
+
+dnl # Check for OpenSSL if it's specified.
@ -126,8 +118,12 @@ $OpenBSD: patch-configure_ac,v 1.17 2009/06/23 22:47:23 sthen Exp $
+dnl #
looked_for_gnutls="no"
dnl #
dnl # Check for GnuTLS if it's specified.
@@ -2000,17 +2094,31 @@ fi
-dnl # Check for GnuTLS if it's specified.
+dnl # Check for GnuTLS if it's specified, or if OpenSSL checks failed.
dnl #
if test "x$enable_gnutls" != "xno"; then
enable_gnutls="no"
@@ -2055,17 +2148,32 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
@ -151,16 +147,17 @@ $OpenBSD: patch-configure_ac,v 1.17 2009/06/23 22:47:23 sthen Exp $
AC_MSG_ERROR([
-Neither GnuTLS or NSS SSL development headers found.
-Use --disable-nss --disable-gnutls if you do not need SSL support.
-MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+Neither OpenSSL, GnuTLS or NSS SSL development headers found.
-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+OpenSSL, GnuTLS or NSS SSL development headers found.
+Use --disable-openssl --disable-nss --disable-gnutls if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without OpenSSL, GnuTLS or NSS.
+MSN, Yahoo!, Novell Groupwise and Google Talk will not work without OpenSSL, GnuTLS or NSS.
+])
+
+elif test "x$looked_for_openssl" = "xyes" -a "$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+OpenSSL SSL development headers not found.
+Use --disable-openssl if you do not need SSL support.
+MSN, Novell Groupwise and Google Talk will not work without SSL support.
+MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
])
elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([

11
net/pidgin/patches/patch-finch_libgnt_Makefile_am
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-finch_libgnt_Makefile_am,v 1.3 2008/06/05 10:24:15 ajacoutot Exp $
--- finch/libgnt/Makefile.am.orig Tue May 6 08:04:00 2008
+++ finch/libgnt/Makefile.am Mon May 19 00:40:56 2008
@@ -1,6 +1,6 @@
EXTRA_DIST=genmarshal
-SUBDIRS = . wms
+SUBDIRS = .
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnt.pc

12
net/pidgin/patches/patch-finch_libgnt_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.17 2009/08/20 10:43:13 sthen Exp $
--- finch/libgnt/Makefile.in.orig Fri Aug 14 19:31:35 2009
+++ finch/libgnt/Makefile.in Wed Aug 19 22:05:37 2009
@@ -340,7 +340,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = genmarshal
-SUBDIRS = . wms
+SUBDIRS = .
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnt.pc
lib_LTLIBRARIES = libgnt.la

12
net/pidgin/patches/patch-finch_plugins_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-finch_plugins_Makefile_am,v 1.2 2008/03/24 08:23:22 steven Exp $
--- finch/plugins/Makefile.am.orig Mon Mar 24 08:12:27 2008
+++ finch/plugins/Makefile.am Mon Mar 24 08:12:48 2008
@@ -27,7 +27,7 @@ gntgf_la_CFLAGS = $(X11_CFLAGS)
gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
gnthistory_la_LIBADD = $(GLIB_LIBS)
-gntlastlog_la_LIBADD = $(GLIB_LIBS)
+gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
grouping_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
endif # PLUGINS

22
net/pidgin/patches/patch-finch_plugins_Makefile_in
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.17 2009/08/20 10:43:13 sthen Exp $
--- finch/plugins/Makefile.in.orig Fri Aug 14 19:31:35 2009
+++ finch/plugins/Makefile.in Wed Aug 19 22:05:37 2009
@@ -81,7 +81,8 @@ gnthistory_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(gnthistory_la_LDFLAGS) $(LDFLAGS) -o $@
@PLUGINS_TRUE@am_gnthistory_la_rpath = -rpath $(plugindir)
-@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@PLUGINS_TRUE@ $(top_builddir)/finch/libgnt/libgnt.la
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
@@ -382,7 +383,7 @@ grouping_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
@PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
@PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)
-@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS)
+@PLUGINS_TRUE@gntlastlog_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
@PLUGINS_TRUE@grouping_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
EXTRA_DIST = pietray.py
AM_CPPFLAGS = \

26
net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sthen Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Fri Aug 14 19:31:36 2009
+++ libpurple/plugins/ssl/Makefile.in Wed Aug 19 22:05:37 2009
@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.18 2009/09/08 06:35:24 steven Exp $
--- libpurple/plugins/ssl/Makefile.in.orig Sat Sep 5 17:12:40 2009
+++ libpurple/plugins/ssl/Makefile.in Mon Sep 7 11:08:19 2009
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@ -14,8 +14,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
@PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@PLUGINS_TRUE@ $(am__DEPENDENCIES_1)
am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
@@ -113,7 +119,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
$(LDFLAGS) -o $@
@@ -107,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
$(ssl_la_SOURCES)
-DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
ETAGS = etags
CTAGS = ctags
@@ -177,6 +183,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
@@ -194,6 +200,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
GNT_VERSION = @GNT_VERSION@
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
GREP = @GREP@
@@ -362,6 +370,7 @@ EXTRA_DIST = \
@@ -454,6 +462,7 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
ssl_gnutls_la_LDFLAGS = -module -avoid-version
ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
@@ -375,19 +384,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@@ -467,19 +476,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl.la \
@PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@ ssl-gnutls.la
@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
@@ -399,6 +414,7 @@ AM_CPPFLAGS = \
@@ -491,6 +506,7 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PLUGIN_CFLAGS)
@ -74,16 +74,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.17 2009/08/20 10:43:13 sth
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
all: all-am
@@ -461,6 +477,8 @@ clean-pluginLTLIBRARIES:
@@ -553,6 +569,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
+ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
+ $(LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_LDFLAGS) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
$(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
@@ -475,6 +493,7 @@ distclean-compile:
@@ -567,6 +585,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@

12
net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_am
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_am,v 1.2 2008/12/27 20:48:00 steven Exp $
--- libpurple/protocols/gg/Makefile.am.orig Sat Dec 20 19:38:16 2008
+++ libpurple/protocols/gg/Makefile.am Sun Dec 21 23:49:42 2008
@@ -62,7 +62,7 @@ else
st = $(GADU_CFLAGS)
pkg_LTLIBRARIES = libgg.la
libgg_la_SOURCES = $(GGSOURCES)
-libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS)
+libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS)
endif

12
net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.17 2009/08/20 10:43:13 sthen Exp $
--- libpurple/protocols/gg/Makefile.in.orig Fri Aug 14 19:31:36 2009
+++ libpurple/protocols/gg/Makefile.in Wed Aug 19 22:05:37 2009
@@ -386,7 +386,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)
@STATIC_GG_TRUE@libgg_la_SOURCES = $(GGSOURCES)
@STATIC_GG_TRUE@libgg_la_CFLAGS = $(AM_CFLAGS)
-@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS)
+@STATIC_GG_FALSE@libgg_la_LIBADD = $(GLIB_LIBS) $(GADU_LIBS) $(LIBGADU_LIBS)
@STATIC_GG_TRUE@libgg_la_LIBADD = $(GADU_LIBS)
@STATIC_GG_FALSE@pkg_LTLIBRARIES = libgg.la
AM_CPPFLAGS = \

16
net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_am
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_am,v 1.5 2008/12/27 20:48:00 steven Exp $
--- libpurple/protocols/oscar/Makefile.am.orig Sat Dec 20 19:38:16 2008
+++ libpurple/protocols/oscar/Makefile.am Sun Dec 21 23:55:19 2008
@@ -64,10 +64,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES)
liboscar_la_LIBADD = $(GLIB_LIBS)
libaim_la_SOURCES = libaim.c
-libaim_la_LIBADD = liboscar.la
+libaim_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir)
libicq_la_SOURCES = libicq.c
-libicq_la_LIBADD = liboscar.la
+libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir)
endif

15
net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.17 2009/08/20 10:43:13 sthen Exp $
--- libpurple/protocols/oscar/Makefile.in.orig Fri Aug 14 19:31:38 2009
+++ libpurple/protocols/oscar/Makefile.in Wed Aug 19 22:05:37 2009
@@ -423,9 +423,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@STATIC_OSCAR_FALSE@pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la
@STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
@STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c
-@STATIC_OSCAR_FALSE@libaim_la_LIBADD = liboscar.la
+@STATIC_OSCAR_FALSE@libaim_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir)
@STATIC_OSCAR_FALSE@libicq_la_SOURCES = libicq.c
-@STATIC_OSCAR_FALSE@libicq_la_LIBADD = liboscar.la
+@STATIC_OSCAR_FALSE@libicq_la_LIBADD = liboscar.la -Wl,-rpath,$(pkgdir)
AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \

20
net/pidgin/patches/patch-pidgin_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.8 2009/07/12 20:01:32 sthen Exp $
--- pidgin/Makefile.in.orig Sat Jun 27 22:12:48 2009
+++ pidgin/Makefile.in Mon Jun 29 22:47:25 2009
@@ -108,7 +108,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
$OpenBSD: patch-pidgin_Makefile_in,v 1.9 2009/09/08 06:35:24 steven Exp $
--- pidgin/Makefile.in.orig Wed Aug 19 04:13:14 2009
+++ pidgin/Makefile.in Wed Aug 19 16:29:12 2009
@@ -116,7 +116,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
+CCLD = $(CXX)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(pidgin_SOURCES)

8
net/pidgin/patches/patch-pidgin_gtkdialogs_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.16 2009/05/21 15:07:37 steven Exp $
--- pidgin/gtkdialogs.c.orig Tue Apr 28 16:10:24 2009
+++ pidgin/gtkdialogs.c Wed May 20 13:23:00 2009
@@ -583,6 +583,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.17 2009/09/08 06:35:24 steven Exp $
--- pidgin/gtkdialogs.c.orig Sat Sep 5 17:12:04 2009
+++ pidgin/gtkdialogs.c Mon Sep 7 12:31:33 2009
@@ -596,6 +596,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

10
net/pidgin/patches/patch-pidgin_gtkmain_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.8 2008/08/21 05:59:01 brad Exp $
--- pidgin/gtkmain.c.orig Mon Aug 18 21:53:52 2008
+++ pidgin/gtkmain.c Wed Aug 20 00:48:35 2008
@@ -89,6 +89,7 @@ static SnDisplay *sn_display = NULL;
$OpenBSD: patch-pidgin_gtkmain_c,v 1.9 2009/09/08 06:35:24 steven Exp $
--- pidgin/gtkmain.c.orig Sat Sep 5 17:12:04 2009
+++ pidgin/gtkmain.c Mon Sep 7 12:31:33 2009
@@ -90,6 +90,7 @@ static SnDisplay *sn_display = NULL;
#endif
#ifdef HAVE_SIGNAL_H
@ -9,7 +9,7 @@ $OpenBSD: patch-pidgin_gtkmain_c,v 1.8 2008/08/21 05:59:01 brad Exp $
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -159,6 +160,8 @@ clean_pid(void)
@@ -160,6 +161,8 @@ clean_pid(void)
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);

8
net/pidgin/patches/patch-pidgin_gtknotify_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtknotify_c,v 1.10 2008/12/27 20:48:00 steven Exp $
--- pidgin/gtknotify.c.orig Sat Dec 20 19:38:16 2008
+++ pidgin/gtknotify.c Sun Dec 21 23:49:44 2008
@@ -1048,7 +1048,16 @@ uri_command(const char *command, gboolean sync)
$OpenBSD: patch-pidgin_gtknotify_c,v 1.11 2009/09/08 06:35:24 steven Exp $
--- pidgin/gtknotify.c.orig Sat Sep 5 17:12:04 2009
+++ pidgin/gtknotify.c Mon Sep 7 12:31:33 2009
@@ -1235,7 +1235,16 @@ uri_command(const char *command, gboolean sync)
g_error_free(error);
}
else

12
net/pidgin/pkg/PLIST-finch
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-finch,v 1.3 2009/06/17 02:08:35 sthen Exp $
@comment $OpenBSD: PLIST-finch,v 1.4 2009/09/08 06:35:24 steven Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@bin bin/finch
@ -13,6 +13,7 @@ include/finch/gntdebug.h
include/finch/gntft.h
include/finch/gntidle.h
include/finch/gntlog.h
include/finch/gntmedia.h
include/finch/gntnotify.h
include/finch/gntplugin.h
include/finch/gntpounce.h
@ -40,6 +41,7 @@ include/gnt/gntmarshal.h
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntmenuitemcheck.h
include/gnt/gntprogressbar.h
include/gnt/gntslider.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
@ -58,10 +60,18 @@ lib/finch/gnthistory.la
lib/finch/gnthistory.so
lib/finch/gntlastlog.la
lib/finch/gntlastlog.so
lib/finch/gnttinyurl.la
lib/finch/gnttinyurl.so
lib/finch/grouping.la
lib/finch/grouping.so
lib/gnt/
lib/gnt/irssi.la
lib/gnt/irssi.so
lib/gnt/s.la
lib/gnt/s.so
lib/libgnt.la
@lib lib/libgnt.so.${LIBgnt_VERSION}
lib/pkgconfig/finch.pc
lib/pkgconfig/gnt.pc
@man man/man1/finch.1
share/applications/

23
net/pidgin/pkg/PLIST-libpurple
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-libpurple,v 1.3 2009/07/12 20:01:32 sthen Exp $
@comment $OpenBSD: PLIST-libpurple,v 1.4 2009/09/08 06:35:24 steven Exp $
@conflict pidgin-<2.5.6p3
@pkgpath net/pidgin
@bin bin/purple-client-example
@ -35,6 +35,10 @@ include/libpurple/gaim-compat.h
include/libpurple/idle.h
include/libpurple/imgstore.h
include/libpurple/log.h
include/libpurple/marshallers.h
include/libpurple/media-gst.h
include/libpurple/media.h
include/libpurple/mediamanager.h
include/libpurple/mime.h
include/libpurple/nat-pmp.h
include/libpurple/network.h
@ -54,13 +58,19 @@ include/libpurple/savedstatuses.h
include/libpurple/server.h
include/libpurple/signals.h
include/libpurple/smiley.h
include/libpurple/sound-theme-loader.h
include/libpurple/sound-theme.h
include/libpurple/sound.h
include/libpurple/sslconn.h
include/libpurple/status.h
include/libpurple/stringref.h
include/libpurple/stun.h
include/libpurple/theme-loader.h
include/libpurple/theme-manager.h
include/libpurple/theme.h
include/libpurple/upnp.h
include/libpurple/util.h
include/libpurple/valgrind.h
include/libpurple/value.h
include/libpurple/version.h
include/libpurple/whiteboard.h
@ -87,8 +97,6 @@ lib/purple-2/joinpart.la
lib/purple-2/joinpart.so
lib/purple-2/libaim.la
lib/purple-2/libaim.so
@comment lib/purple-2/libbonjour.la
@comment lib/purple-2/libbonjour.so
lib/purple-2/libgg.la
lib/purple-2/libgg.so
lib/purple-2/libicq.la
@ -113,6 +121,10 @@ lib/purple-2/libxmpp.la
lib/purple-2/libxmpp.so
lib/purple-2/libyahoo.la
lib/purple-2/libyahoo.so
lib/purple-2/libyahoojp.la
lib/purple-2/libyahoojp.so
lib/purple-2/libymsg.la
@lib lib/purple-2/libymsg.so.${LIBymsg_VERSION}
lib/purple-2/libzephyr.la
lib/purple-2/libzephyr.so
lib/purple-2/log_reader.la
@ -138,11 +150,16 @@ share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
share/purple/ca-certs/CAcert_Class3.pem
share/purple/ca-certs/CAcert_Root.pem
share/purple/ca-certs/Equifax_Secure_CA.pem
share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
share/purple/ca-certs/Microsoft_Internet_Authority.pem
share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
share/purple/ca-certs/StartCom_Certification_Authority.pem
share/purple/ca-certs/StartCom_Free_SSL_CA.pem
share/purple/ca-certs/Thawte_Premium_Server_CA.pem
share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
share/purple/ca-certs/VeriSign_International_Server_Class_3_CA.pem
share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem

72
net/pidgin/pkg/PLIST-main
View File

@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST-main,v 1.2 2009/06/16 19:31:30 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2009/09/08 06:35:24 steven Exp $
@conflict gaim-*
@pkgpath net/pidgin
@bin bin/pidgin
include/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
@ -23,10 +25,13 @@ include/pidgin/gtkeventloop.h
include/pidgin/gtkexpander.h
include/pidgin/gtkft.h
include/pidgin/gtkgaim-compat.h
include/pidgin/gtkicon-theme-loader.h
include/pidgin/gtkicon-theme.h
include/pidgin/gtkidle.h
include/pidgin/gtkimhtml.h
include/pidgin/gtkimhtmltoolbar.h
include/pidgin/gtklog.h
include/pidgin/gtkmedia.h
include/pidgin/gtkmenutray.h
include/pidgin/gtknickcolors.h
include/pidgin/gtknotify.h
@ -45,6 +50,7 @@ include/pidgin/gtksound.h
include/pidgin/gtksourceiter.h
include/pidgin/gtksourceundomanager.h
include/pidgin/gtksourceview-marshal.h
include/pidgin/gtkstatus-icon-theme.h
include/pidgin/gtkstatusbox.h
include/pidgin/gtkthemes.h
include/pidgin/gtkutils.h
@ -81,6 +87,8 @@ lib/pidgin/sendbutton.la
lib/pidgin/sendbutton.so
lib/pidgin/spellchk.la
lib/pidgin/spellchk.so
lib/pidgin/themeedit.la
lib/pidgin/themeedit.so
lib/pidgin/ticker.la
lib/pidgin/ticker.so
lib/pidgin/timestamp.la
@ -89,6 +97,8 @@ lib/pidgin/timestamp_format.la
lib/pidgin/timestamp_format.so
lib/pidgin/xmppconsole.la
lib/pidgin/xmppconsole.so
lib/pidgin/xmppdisco.la
lib/pidgin/xmppdisco.so
lib/pkgconfig/pidgin.pc
@man man/man1/pidgin.1
share/applications/pidgin.desktop
@ -98,6 +108,7 @@ share/icons/hicolor/22x22/apps/pidgin.png
share/icons/hicolor/24x24/apps/pidgin.png
share/icons/hicolor/32x32/apps/pidgin.png
share/icons/hicolor/48x48/apps/pidgin.png
share/icons/hicolor/scalable/apps/pidgin.svg
share/locale/af/LC_MESSAGES/pidgin.mo
share/locale/am/LC_MESSAGES/pidgin.mo
share/locale/ar/LC_MESSAGES/pidgin.mo
@ -131,6 +142,7 @@ share/locale/gu/LC_MESSAGES/pidgin.mo
share/locale/he/LC_MESSAGES/pidgin.mo
share/locale/hi/LC_MESSAGES/pidgin.mo
share/locale/hu/LC_MESSAGES/pidgin.mo
share/locale/hy/LC_MESSAGES/pidgin.mo
share/locale/id/LC_MESSAGES/pidgin.mo
share/locale/it/LC_MESSAGES/pidgin.mo
share/locale/ja/LC_MESSAGES/pidgin.mo
@ -169,6 +181,9 @@ share/locale/sq/LC_MESSAGES/pidgin.mo
share/locale/sr/LC_MESSAGES/pidgin.mo
share/locale/sr@latin/LC_MESSAGES/pidgin.mo
share/locale/sv/LC_MESSAGES/pidgin.mo
share/locale/sw/
share/locale/sw/LC_MESSAGES/
share/locale/sw/LC_MESSAGES/pidgin.mo
share/locale/ta/LC_MESSAGES/pidgin.mo
share/locale/te/LC_MESSAGES/pidgin.mo
share/locale/th/LC_MESSAGES/pidgin.mo
@ -255,6 +270,14 @@ share/pixmaps/pidgin/dialogs/64/info.png
share/pixmaps/pidgin/dialogs/64/mail.png
share/pixmaps/pidgin/dialogs/64/question.png
share/pixmaps/pidgin/dialogs/64/warning.png
share/pixmaps/pidgin/dialogs/scalable/
share/pixmaps/pidgin/dialogs/scalable/auth.svg
share/pixmaps/pidgin/dialogs/scalable/cool.svg
share/pixmaps/pidgin/dialogs/scalable/dialog.svg
share/pixmaps/pidgin/dialogs/scalable/error.svg
share/pixmaps/pidgin/dialogs/scalable/info.svg
share/pixmaps/pidgin/dialogs/scalable/question.svg
share/pixmaps/pidgin/dialogs/scalable/warning.svg
share/pixmaps/pidgin/emblems/
share/pixmaps/pidgin/emblems/16/
share/pixmaps/pidgin/emblems/16/aol-client.png
@ -278,6 +301,23 @@ share/pixmaps/pidgin/emblems/16/secure.png
share/pixmaps/pidgin/emblems/16/unavailable.png
share/pixmaps/pidgin/emblems/16/video.png
share/pixmaps/pidgin/emblems/16/voice.png
share/pixmaps/pidgin/emblems/scalable/
share/pixmaps/pidgin/emblems/scalable/aol-client.svg
share/pixmaps/pidgin/emblems/scalable/blocked.svg
share/pixmaps/pidgin/emblems/scalable/bot.svg
share/pixmaps/pidgin/emblems/scalable/external.svg
share/pixmaps/pidgin/emblems/scalable/female.svg
share/pixmaps/pidgin/emblems/scalable/free-for-chat.svg
share/pixmaps/pidgin/emblems/scalable/game.svg
share/pixmaps/pidgin/emblems/scalable/male.svg
share/pixmaps/pidgin/emblems/scalable/mobile.svg
share/pixmaps/pidgin/emblems/scalable/music.svg
share/pixmaps/pidgin/emblems/scalable/not-authorized.svg
share/pixmaps/pidgin/emblems/scalable/qq-member.svg
share/pixmaps/pidgin/emblems/scalable/secure.svg
share/pixmaps/pidgin/emblems/scalable/unavailable.svg
share/pixmaps/pidgin/emblems/scalable/video.svg
share/pixmaps/pidgin/emblems/scalable/voice.svg
share/pixmaps/pidgin/emotes/
share/pixmaps/pidgin/emotes/default/
share/pixmaps/pidgin/emotes/default/act-up.png
@ -568,6 +608,22 @@ share/pixmaps/pidgin/protocols/48/silc.png
share/pixmaps/pidgin/protocols/48/simple.png
share/pixmaps/pidgin/protocols/48/yahoo.png
share/pixmaps/pidgin/protocols/48/zephyr.png
share/pixmaps/pidgin/protocols/scalable/
share/pixmaps/pidgin/protocols/scalable/aim.svg
share/pixmaps/pidgin/protocols/scalable/bonjour.svg
share/pixmaps/pidgin/protocols/scalable/gadu-gadu.svg
share/pixmaps/pidgin/protocols/scalable/google-talk.svg
share/pixmaps/pidgin/protocols/scalable/icq.svg
share/pixmaps/pidgin/protocols/scalable/irc.svg
share/pixmaps/pidgin/protocols/scalable/jabber.svg
share/pixmaps/pidgin/protocols/scalable/meanwhile.svg
share/pixmaps/pidgin/protocols/scalable/msn.svg
share/pixmaps/pidgin/protocols/scalable/novell.svg
share/pixmaps/pidgin/protocols/scalable/qq.svg
share/pixmaps/pidgin/protocols/scalable/silc.svg
share/pixmaps/pidgin/protocols/scalable/simple.svg
share/pixmaps/pidgin/protocols/scalable/yahoo.svg
share/pixmaps/pidgin/protocols/scalable/zephyr.svg
share/pixmaps/pidgin/status/
share/pixmaps/pidgin/status/11/
share/pixmaps/pidgin/status/11/available.png
@ -645,7 +701,10 @@ share/pixmaps/pidgin/status/48/rtl/extended-away.png
share/pixmaps/pidgin/status/48/rtl/log-in.png
share/pixmaps/pidgin/status/48/rtl/log-out.png
share/pixmaps/pidgin/toolbar/
share/pixmaps/pidgin/toolbar/11/
share/pixmaps/pidgin/toolbar/11/message-new.png
share/pixmaps/pidgin/toolbar/16/
share/pixmaps/pidgin/toolbar/16/audio-call.png
share/pixmaps/pidgin/toolbar/16/change-bgcolor.png
share/pixmaps/pidgin/toolbar/16/change-fgcolor.png
share/pixmaps/pidgin/toolbar/16/emote-select.png
@ -660,8 +719,17 @@ 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/
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/32/
share/pixmaps/pidgin/toolbar/32/audio-call.png
share/pixmaps/pidgin/toolbar/32/video-call.png
share/pixmaps/pidgin/toolbar/48/
share/pixmaps/pidgin/toolbar/48/audio-call.png
share/pixmaps/pidgin/toolbar/48/video-call.png
share/pixmaps/pidgin/tray/
share/pixmaps/pidgin/tray/16/
share/pixmaps/pidgin/tray/16/available_4bit.ico
@ -697,6 +765,7 @@ share/pixmaps/pidgin/tray/32/tray-busy.png
share/pixmaps/pidgin/tray/32/tray-connecting.png
share/pixmaps/pidgin/tray/32/tray-extended-away.png
share/pixmaps/pidgin/tray/32/tray-invisible.png
share/pixmaps/pidgin/tray/32/tray-message.png
share/pixmaps/pidgin/tray/32/tray-new-im.png
share/pixmaps/pidgin/tray/32/tray-offline.png
share/pixmaps/pidgin/tray/32/tray-online.png
@ -706,6 +775,7 @@ share/pixmaps/pidgin/tray/48/tray-busy.png
share/pixmaps/pidgin/tray/48/tray-connecting.png
share/pixmaps/pidgin/tray/48/tray-extended-away.png
share/pixmaps/pidgin/tray/48/tray-invisible.png
share/pixmaps/pidgin/tray/48/tray-message.png
share/pixmaps/pidgin/tray/48/tray-new-im.png
share/pixmaps/pidgin/tray/48/tray-offline.png
share/pixmaps/pidgin/tray/48/tray-online.png