On Tue, 25 Aug 2009 18:05:55 +0200, Stuart Henderson wrote:
> On 2009/08/25 17:57, Tim van der Molen wrote:
> > On Tue, 25 Aug 2009 16:42:13 +0200, Brad wrote:
> > > On Mon, Aug 24, 2009 at 09:22:44PM -0700, Aaron Stellman wrote:
> > > > On Mon, Aug 24, 2009 at 11:29:37PM -0400, Brad wrote:
> > > > > Here is an update to Pidgin / Finch 2.6.1.
> > > > >
> > > > > I am more so looking for some Finch users to try that out but
> > > > > some testing of Pidgin wouldn't hurt either.
> >
> > > > The pidgin port has been updated to 2.5.9 several days ago. Your patch
> > > > doesn't apply.
> > >
> > > oops. I was updating to 2.6.1 in a separate dir while also working on
> > > 2.5.9
> > > and forgot to update my separate dir after 2.5.9 was commited.
> >
> > It still doesn't apply, I'm afraid. A few files in your patches dir
> > appear to be outdated.
> >
> > Also, it's worth mentioning that the diff should be applied with `patch
> > -E'.
> >
> > Regards,
> > Tim
> >
>
> I've just built this one on amd64.
That works. Thanks.
Regards,
Tim
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- Makefile 20 Aug 2009 10:43:13 -0000 1.51
> +++ Makefile 25 Aug 2009 16:05:18 -0000
> @@ -6,7 +6,7 @@ COMMENT-main= multi-protocol instant mes
> COMMENT-finch= multi-protocol instant messaging client, console client
> COMMENT-libpurple= multi-protocol instant messaging library
>
> -VERSION= 2.5.9
> +VERSION= 2.6.1
> DISTNAME= pidgin-${VERSION}
> PKGNAME= pidgin-${VERSION}
> PKGNAME-main= pidgin-${VERSION}
> @@ -17,9 +17,10 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
>
> 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 iconv intl 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 \
> @@ -74,15 +75,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 +106,6 @@ LIB_DEPENDS-main+= gstreamer-0.10:gstrea
> 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}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/distinfo,v
> retrieving revision 1.22
> diff -u -p -r1.22 distinfo
> --- distinfo 20 Aug 2009 10:43:13 -0000 1.22
> +++ distinfo 25 Aug 2009 16:05:18 -0000
> @@ -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.1.tar.gz) = VdYl1984EcubpzS2N5G2eQ==
> +RMD160 (pidgin-2.6.1.tar.gz) = lkcNMzOqP5fLbJLnCChasp+dKFs=
> +SHA1 (pidgin-2.6.1.tar.gz) = bds3qHeOq748iQFc1QVwWYaT8vM=
> +SHA256 (pidgin-2.6.1.tar.gz) = lJQNQdew1GPh8wiTk0FGouEghYUHwt5H/IEy0SEjeZ4=
> +SIZE (pidgin-2.6.1.tar.gz) = 12672445
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v
> retrieving revision 1.17
> diff -u -p -r1.17 patch-configure_ac
> --- patches/patch-configure_ac 23 Jun 2009 22:47:23 -0000 1.17
> +++ patches/patch-configure_ac 25 Aug 2009 16:05:18 -0000
> @@ -1,15 +1,27 @@
> $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
> +--- configure.ac.orig Wed Aug 19 04:12:47 2009
> ++++ configure.ac Wed Aug 19 20:47:18 2009
> +@@ -632,7 +632,8 @@ AC_ARG_WITH(ncurses-headers, [AC_HELP_STRING([--with-n
> + [ac_ncurses_includes="$withval"], [ac_ncurses_includes=""])
> + if test "x$enable_consoleui" = "xyes"; then
> + AC_CHECK_LIB(ncursesw, initscr, [GNT_LIBS="-lncursesw"],
> [enable_consoleui=no])
> +- AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
> [enable_consoleui=no])
> ++ AC_CHECK_LIB(panelw, update_panels, [GNT_LIBS="$GNT_LIBS -lpanelw"],
> ++ [enable_consoleui=no], [$GNT_LIBS])
> +
> + if test "x$enable_consoleui" = "xyes"; then
> + dnl # Some distros put the headers in ncursesw/, some don't
> +@@ -675,7 +676,8 @@ 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_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS
> -lpanel"], [enable_consoleui=no])
> ++ AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS
> -lpanel"],
> ++ [enable_consoleui=no], [$GNT_LIBS])
> 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
> + GNT_CFLAGS="-I$ac_ncurses_includes"
> +@@ -950,7 +952,7 @@ else
> if test "$ac_silc_libs" != "no"; then
> SILC_LIBS="-L$ac_silc_libs"
> fi
> @@ -18,7 +30,7 @@ $OpenBSD: patch-configure_ac,v 1.17 2009
> 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
> +@@ -1655,6 +1657,11 @@ AM_CONDITIONAL(INSTALL_SSL_CERTIFICATES, test "x$SSL_C
>
> dnl These two are inverses of each other <-- stolen from evolution!
>
> @@ -30,12 +42,12 @@ $OpenBSD: patch-configure_ac,v 1.17 2009
> 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,
> +@@ -1665,10 +1672,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 +138,12 @@ $OpenBSD: patch-configure_ac,v 1.17 2009
> +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"
> +@@ -2049,17 +2144,32 @@ fi
>
> AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
>
> @@ -151,16 +167,17 @@ $OpenBSD: patch-configure_ac,v 1.17 2009
> 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([
> Index: patches/patch-finch_libgnt_Makefile_am
> ===================================================================
> RCS file: patches/patch-finch_libgnt_Makefile_am
> diff -N patches/patch-finch_libgnt_Makefile_am
> --- patches/patch-finch_libgnt_Makefile_am 5 Jun 2008 10:24:15 -0000
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> -
> Index: patches/patch-finch_libgnt_Makefile_in
> ===================================================================
> RCS file: patches/patch-finch_libgnt_Makefile_in
> diff -N patches/patch-finch_libgnt_Makefile_in
> --- patches/patch-finch_libgnt_Makefile_in 20 Aug 2009 10:43:13 -0000
> 1.17
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> Index: patches/patch-finch_plugins_Makefile_am
> ===================================================================
> RCS file: patches/patch-finch_plugins_Makefile_am
> diff -N patches/patch-finch_plugins_Makefile_am
> --- patches/patch-finch_plugins_Makefile_am 24 Mar 2008 08:23:22 -0000
> 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> Index: patches/patch-finch_plugins_Makefile_in
> ===================================================================
> RCS file: patches/patch-finch_plugins_Makefile_in
> diff -N patches/patch-finch_plugins_Makefile_in
> --- patches/patch-finch_plugins_Makefile_in 20 Aug 2009 10:43:13 -0000
> 1.17
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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_t...@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_t...@am_gntlastlog_la_objects = lastlog.lo
> - gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
> -@@ -382,7 +383,7 @@ grouping_la_LDFLAGS = -module -avoid-version
> - @plugins_t...@gntclipboard_la_libadd = $(GLIB_LIBS) $(X11_LIBS)
> - @plugins_t...@gntgf_la_libadd = $(GLIB_LIBS) $(X11_LIBS)
> $(top_builddir)/finch/libgnt/libgnt.la
> - @plugins_t...@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_t...@grouping_la_libadd = $(GLIB_LIBS)
> $(top_builddir)/finch/libgnt/libgnt.la
> - EXTRA_DIST = pietray.py
> - AM_CPPFLAGS = \
> Index: patches/patch-libpurple_plugins_ssl_Makefile_in
> ===================================================================
> RCS file:
> /cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in,v
> retrieving revision 1.17
> diff -u -p -r1.17 patch-libpurple_plugins_ssl_Makefile_in
> --- patches/patch-libpurple_plugins_ssl_Makefile_in 20 Aug 2009 10:43:13
> -0000 1.17
> +++ patches/patch-libpurple_plugins_ssl_Makefile_in 25 Aug 2009 16:05:18
> -0000
> @@ -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)"
> +--- libpurple/plugins/ssl/Makefile.in.orig Wed Aug 19 04:13:08 2009
> ++++ libpurple/plugins/ssl/Makefile.in Wed Aug 19 16:28:21 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_Ma
> @plugins_t...@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_Ma
> $(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_Ma
> GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
> GNUTLS_LIBS = @GNUTLS_LIBS@
> GREP = @GREP@
> -@@ -362,6 +370,7 @@ EXTRA_DIST = \
> +@@ -452,6 +460,7 @@ EXTRA_DIST = \
>
> plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
> ssl_la_LDFLAGS = -module -avoid-version
> @@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
> ssl_gnutls_la_LDFLAGS = -module -avoid-version
> ssl_nss_la_LDFLAGS = -module -avoid-version
> @PLUGINS_TRUE@@USE_GNUTLS_FALSE@@use_nss_fa...@plugin_ltlibraries = \
> -@@ -375,19 +384,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
> +@@ -465,19 +474,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_Ma
> @plugins_t...@ssl_gnutls_la_libadd = $(GLIB_LIBS) $(GNUTLS_LIBS)
> @plugins_t...@ssl_nss_la_libadd = $(GLIB_LIBS) $(NSS_LIBS)
> AM_CPPFLAGS = \
> -@@ -399,6 +414,7 @@ AM_CPPFLAGS = \
> +@@ -489,6 +504,7 @@ AM_CPPFLAGS = \
> $(GLIB_CFLAGS) \
> $(PLUGIN_CFLAGS)
>
> @@ -74,16 +74,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
> 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:
> +@@ -551,6 +567,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:
> +@@ -565,6 +583,7 @@ distclean-compile:
> -rm -f *.tab.c
>
> @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/ssl....@am__quote@
> Index: patches/patch-libpurple_protocols_gg_Makefile_am
> ===================================================================
> RCS file: patches/patch-libpurple_protocols_gg_Makefile_am
> diff -N patches/patch-libpurple_protocols_gg_Makefile_am
> --- patches/patch-libpurple_protocols_gg_Makefile_am 27 Dec 2008 20:48:00
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> -
> Index: patches/patch-libpurple_protocols_gg_Makefile_in
> ===================================================================
> RCS file: patches/patch-libpurple_protocols_gg_Makefile_in
> diff -N patches/patch-libpurple_protocols_gg_Makefile_in
> --- patches/patch-libpurple_protocols_gg_Makefile_in 20 Aug 2009 10:43:13
> -0000 1.17
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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_fa...@libgg_la_sources = $(GGSOURCES)
> - @static_gg_t...@libgg_la_sources = $(GGSOURCES)
> - @static_gg_t...@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_t...@libgg_la_libadd = $(GADU_LIBS)
> - @static_gg_fa...@pkg_ltlibraries = libgg.la
> - AM_CPPFLAGS = \
> Index: patches/patch-libpurple_protocols_oscar_Makefile_am
> ===================================================================
> RCS file: patches/patch-libpurple_protocols_oscar_Makefile_am
> diff -N patches/patch-libpurple_protocols_oscar_Makefile_am
> --- patches/patch-libpurple_protocols_oscar_Makefile_am 27 Dec 2008
> 20:48:00 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> -
> Index: patches/patch-libpurple_protocols_oscar_Makefile_in
> ===================================================================
> RCS file: patches/patch-libpurple_protocols_oscar_Makefile_in
> diff -N patches/patch-libpurple_protocols_oscar_Makefile_in
> --- patches/patch-libpurple_protocols_oscar_Makefile_in 20 Aug 2009
> 10:43:13 -0000 1.17
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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_fa...@pkg_ltlibraries = liboscar.la libaim.la libicq.la
> - @static_oscar_fa...@liboscar_la_libadd = $(GLIB_LIBS)
> - @static_oscar_fa...@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_fa...@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 \
> Index: patches/patch-pidgin_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_Makefile_in,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-pidgin_Makefile_in
> --- patches/patch-pidgin_Makefile_in 12 Jul 2009 20:01:32 -0000 1.8
> +++ patches/patch-pidgin_Makefile_in 25 Aug 2009 16:05:18 -0000
> @@ -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)
> +--- 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)
> Index: patches/patch-pidgin_gtkdialogs_c
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-pidgin_gtkdialogs_c
> --- patches/patch-pidgin_gtkdialogs_c 21 May 2009 15:07:37 -0000 1.16
> +++ patches/patch-pidgin_gtkdialogs_c 25 Aug 2009 16:05:18 -0000
> @@ -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
> +--- pidgin/gtkdialogs.c.orig Wed Aug 19 04:12:48 2009
> ++++ pidgin/gtkdialogs.c Wed Aug 19 16:28:22 2009
> +@@ -590,6 +590,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
> g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
> #endif
>
> Index: patches/patch-pidgin_gtkmain_c
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkmain_c,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-pidgin_gtkmain_c
> --- patches/patch-pidgin_gtkmain_c 21 Aug 2008 05:59:01 -0000 1.8
> +++ patches/patch-pidgin_gtkmain_c 25 Aug 2009 16:05:18 -0000
> @@ -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;
> +--- pidgin/gtkmain.c.orig Wed Aug 19 04:12:48 2009
> ++++ pidgin/gtkmain.c Wed Aug 19 16:28:22 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 2
>
> /*
> * 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);
> Index: patches/patch-pidgin_gtknotify_c
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtknotify_c,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-pidgin_gtknotify_c
> --- patches/patch-pidgin_gtknotify_c 27 Dec 2008 20:48:00 -0000 1.10
> +++ patches/patch-pidgin_gtknotify_c 25 Aug 2009 16:05:18 -0000
> @@ -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)
> +--- pidgin/gtknotify.c.orig Wed Aug 19 04:12:48 2009
> ++++ pidgin/gtknotify.c Wed Aug 19 16:28:22 2009
> +@@ -1158,7 +1158,16 @@ uri_command(const char *command, gboolean sync)
> g_error_free(error);
> }
> else
> Index: pkg/PLIST-finch
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/pkg/PLIST-finch,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-finch
> --- pkg/PLIST-finch 17 Jun 2009 02:08:35 -0000 1.3
> +++ pkg/PLIST-finch 25 Aug 2009 16:05:18 -0000
> @@ -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,8 +60,15 @@ 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
> Index: pkg/PLIST-libpurple
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/pkg/PLIST-libpurple,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-libpurple
> --- pkg/PLIST-libpurple 12 Jul 2009 20:01:32 -0000 1.3
> +++ pkg/PLIST-libpurple 25 Aug 2009 16:05:18 -0000
> @@ -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_Roo
> 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
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/net/pidgin/pkg/PLIST-main,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST-main
> --- pkg/PLIST-main 16 Jun 2009 19:31:30 -0000 1.2
> +++ pkg/PLIST-main 25 Aug 2009 16:05:18 -0000
> @@ -5,6 +5,8 @@
> 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.pn
> 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/s...@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.p
> 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.p
> 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/exten
> 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.
> 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/select-avatar.png
> +share/pixmaps/pidgin/toolbar/22/video-call.png
> +share/pixmaps/pidgin/toolbar/22/voice-call.png
> +share/pixmaps/pidgin/toolbar/32/
> +share/pixmaps/pidgin/toolbar/32/video-call.png
> +share/pixmaps/pidgin/toolbar/32/voice-call.png
> +share/pixmaps/pidgin/toolbar/48/
> +share/pixmaps/pidgin/toolbar/48/video-call.png
> +share/pixmaps/pidgin/toolbar/48/voice-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.p
> 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.p
> 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
