Brad [2007-07-04, 12:57:52]:
> On Fri, 15 Jun 2007 21:33:28 -0400
> Brad <[EMAIL PROTECTED]> wrote:
>
> > Here is an update to Pidgin 2.0.2 as well as an update to silc-toolkit 1.1
> > as the Pidgin SILC support has been updated to use the 1.1 API.
> >
> > http://comstyle.com/pidgin/silc-toolkit.diff
>
> The diff has been updated to now include an update to silc-toolkit 1.1.2.
and here's an update to pidgin 2.1.0. please give this a try.
thanks
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 28 May 2007 12:43:34 -0000 1.5
+++ Makefile 31 Jul 2007 17:18:33 -0000
@@ -4,7 +4,7 @@
COMMENT= "multi-protocol instant messaging client"
-DISTNAME= pidgin-2.0.1
+DISTNAME= pidgin-2.1.0
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 0.0 # .0.0
@@ -37,7 +37,7 @@
:py-gtk2-*:x11/py-gtk2
LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
startup-notification-1::devel/startup-notification \
- silc,silcclient::devel/silc-toolkit \
+ silc.>=7,silcclient.>=5::devel/silc-toolkit \
meanwhile::net/meanwhile \
gadu::net/libgadu \
xml2::textproc/libxml \
@@ -49,7 +49,7 @@
USE_GMAKE= Yes
SEPARATE_BUILD= simple
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.59
+AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= --disable-gevolution \
--disable-gnutls \
--disable-nss \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 28 May 2007 12:43:34 -0000 1.2
+++ distinfo 31 Jul 2007 17:18:33 -0000
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.0.1.tar.gz) = ZWkTFtgVfLXBEdeG/YVTMg==
-RMD160 (pidgin-2.0.1.tar.gz) = A4EijmDx1lywbq8DE/+56h+FDyc=
-SHA1 (pidgin-2.0.1.tar.gz) = CVTxqnuO5iTha90Ac6yfC2J8Nq0=
-SHA256 (pidgin-2.0.1.tar.gz) = gg+3GoWF8EgVaGa7AGpC9BPe9u0xEFM0gdkvFTOufo4=
-SIZE (pidgin-2.0.1.tar.gz) = 10836164
+MD5 (pidgin-2.1.0.tar.gz) = QLuBhnsZ7v3EE1Hh09VbRg==
+RMD160 (pidgin-2.1.0.tar.gz) = rFbY1Ry16vjkaLyvPuFgEZCigL8=
+SHA1 (pidgin-2.1.0.tar.gz) = pHqwgnCK5HdioauYGLE12HGbgMQ=
+SHA256 (pidgin-2.1.0.tar.gz) = izoUkAwoyzFaHfHetdv/j7/Mziqrz1sBQXPyPJazV34=
+SIZE (pidgin-2.1.0.tar.gz) = 11061958
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-config_h_in,v
retrieving revision 1.2
diff -u -r1.2 patch-config_h_in
--- patches/patch-config_h_in 28 May 2007 12:43:34 -0000 1.2
+++ patches/patch-config_h_in 31 Jul 2007 17:18:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.2 2007/05/28 12:43:34 steven Exp $
---- config.h.in.orig Fri May 25 12:28:50 2007
-+++ config.h.in Mon May 28 01:57:22 2007
-@@ -150,6 +150,12 @@
+--- config.h.in.orig Sun Jul 29 08:34:20 2007
++++ config.h.in Tue Jul 31 17:43:25 2007
+@@ -154,6 +154,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -r1.2 patch-configure_ac
--- patches/patch-configure_ac 28 May 2007 12:43:34 -0000 1.2
+++ patches/patch-configure_ac 31 Jul 2007 17:18:33 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.2 2007/05/28 12:43:34 steven Exp $
---- configure.ac.orig Fri May 25 12:28:21 2007
-+++ configure.ac Mon May 28 01:57:22 2007
+--- configure.ac.orig Thu Jun 14 23:11:46 2007
++++ configure.ac Fri Jun 15 13:53:22 2007
@@ -521,6 +521,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@@ -9,16 +9,16 @@
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
-@@ -683,7 +684,7 @@ else
+@@ -695,7 +696,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
- SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
+ SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -pthread $LIBDL"
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], ,
$SILC_LIBS)
- fi
- AC_SUBST(SILC_LIBS)
-@@ -1312,8 +1313,13 @@ dnl ##################################################
+
+ if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
+@@ -1360,8 +1361,13 @@ dnl ##################################################
dnl These two are inverses of each other <-- stolen from evolution!
@@ -33,7 +33,7 @@
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
-@@ -1325,6 +1331,90 @@ AC_ARG_ENABLE(nss,
+@@ -1373,6 +1379,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None (MSN and Google Talk will not work without SSL!)"
dnl #
@@ -124,7 +124,7 @@
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
-@@ -1679,12 +1769,20 @@ fi
+@@ -1727,12 +1817,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
Index: patches/patch-finch_libgnt_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_libgnt_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-finch_libgnt_Makefile_in
--- patches/patch-finch_libgnt_Makefile_in 28 May 2007 12:43:34 -0000
1.2
+++ patches/patch-finch_libgnt_Makefile_in 31 Jul 2007 17:18:33 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.2 2007/05/28 12:43:34 steven Exp $
---- finch/libgnt/Makefile.in.orig Fri May 25 12:29:19 2007
-+++ finch/libgnt/Makefile.in Mon May 28 01:57:22 2007
-@@ -429,7 +429,7 @@ target_cpu = @target_cpu@
+--- finch/libgnt/Makefile.in.orig Sun Jul 29 08:33:32 2007
++++ finch/libgnt/Makefile.in Tue Jul 31 17:43:25 2007
+@@ -435,7 +435,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = genmarshal
Index: patches/patch-finch_libgnt_gntmain_c
===================================================================
RCS file: patches/patch-finch_libgnt_gntmain_c
diff -N patches/patch-finch_libgnt_gntmain_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-finch_libgnt_gntmain_c 31 Jul 2007 17:18:33 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- finch/libgnt/gntmain.c.orig Tue Jul 31 18:31:35 2007
++++ finch/libgnt/gntmain.c Tue Jul 31 18:31:48 2007
+@@ -21,7 +21,7 @@
+ */
+
+ #define _GNU_SOURCE
+-#if defined(__APPLE__) || defined(__unix__)
++#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
+ #define _XOPEN_SOURCE_EXTENDED
+ #endif
+
Index: patches/patch-finch_libgnt_gntwm_c
===================================================================
RCS file: patches/patch-finch_libgnt_gntwm_c
diff -N patches/patch-finch_libgnt_gntwm_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-finch_libgnt_gntwm_c 31 Jul 2007 17:18:33 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- finch/libgnt/gntwm.c.orig Tue Jul 31 18:31:26 2007
++++ finch/libgnt/gntwm.c Tue Jul 31 18:31:58 2007
+@@ -21,7 +21,7 @@
+ */
+
+ #define _GNU_SOURCE
+-#if defined(__APPLE__) || defined(__unix__)
++#if defined(__APPLE__) || defined(__unix__) && !defined(__OpenBSD__)
+ #define _XOPEN_SOURCE_EXTENDED
+ #endif
+
Index: patches/patch-finch_plugins_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_plugins_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-finch_plugins_Makefile_in
--- patches/patch-finch_plugins_Makefile_in 28 May 2007 12:43:34 -0000
1.2
+++ patches/patch-finch_plugins_Makefile_in 31 Jul 2007 17:18:33 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.2 2007/05/28 12:43:34 steven Exp
$
---- finch/plugins/Makefile.in.orig Fri May 25 12:29:19 2007
-+++ finch/plugins/Makefile.in Mon May 28 01:57:22 2007
+--- finch/plugins/Makefile.in.orig Sun Jul 29 08:33:32 2007
++++ finch/plugins/Makefile.in Tue Jul 31 17:44:10 2007
@@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c
@[EMAIL PROTECTED] = gnthistory.lo
gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS)
@@ -11,12 +11,12 @@
am__gntlastlog_la_SOURCES_DIST = lastlog.c
@[EMAIL PROTECTED] = lastlog.lo
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
-@@ -452,7 +453,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
+@@ -455,7 +456,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
+ @[EMAIL PROTECTED] = $(X11_CFLAGS)
+ @[EMAIL PROTECTED] = $(X11_CFLAGS)
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(X11_LIBS)
- @[EMAIL PROTECTED] = $(GLIB_LIBS) $(X11_LIBS)
$(top_builddir)/finch/libgnt/libgnt.la
[EMAIL PROTECTED]@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
$(top_builddir)/finch/libgnt/libgnt.la
[EMAIL PROTECTED]@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
@[EMAIL PROTECTED] = $(GLIB_LIBS)
[EMAIL PROTECTED]@gntlastlog_la_LIBADD = $(GLIB_LIBS)
[EMAIL PROTECTED]@gntlastlog_la_LIBADD = $(GLIB_LIBS)
$(top_builddir)/finch/libgnt/libgnt.la
- EXTRA_DIST =
- AM_CPPFLAGS = \
- -DDATADIR=\"$(datadir)\" \
+ @[EMAIL PROTECTED] = $(GLIB_LIBS)
+ EXTRA_DIST = pietray.py
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.2
diff -u -r1.2 patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 28 May 2007 12:43:34
-0000 1.2
+++ patches/patch-libpurple_plugins_ssl_Makefile_in 31 Jul 2007 17:18:33
-0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.2 2007/05/28 12:43:34
steven Exp $
---- libpurple/plugins/ssl/Makefile.in.orig Fri May 25 12:29:21 2007
-+++ libpurple/plugins/ssl/Makefile.in Mon May 28 01:57:22 2007
+--- libpurple/plugins/ssl/Makefile.in.orig Sun Jul 29 08:33:34 2007
++++ libpurple/plugins/ssl/Makefile.in Tue Jul 31 17:43:25 2007
@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
@@ -31,8 +31,8 @@
+OPENSSL_LIBS = @OPENSSL_LIBS@
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
GNUTLS_LIBS = @GNUTLS_LIBS@
- GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
-@@ -341,6 +349,8 @@ TCL_LIBS = @TCL_LIBS@
+ GREP = @GREP@
+@@ -342,6 +350,8 @@ TCL_LIBS = @TCL_LIBS@
TK_LIBS = @TK_LIBS@
USE_GCONFTOOL_FALSE = @USE_GCONFTOOL_FALSE@
USE_GCONFTOOL_TRUE = @USE_GCONFTOOL_TRUE@
@@ -41,7 +41,7 @@
USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@
-@@ -429,17 +439,21 @@ EXTRA_DIST = \
+@@ -434,17 +444,21 @@ EXTRA_DIST = \
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
ssl_la_LDFLAGS = -module -avoid-version
@@ -63,7 +63,7 @@
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(GNUTLS_LIBS)
@[EMAIL PROTECTED] = $(GLIB_LIBS) $(NSS_LIBS)
AM_CPPFLAGS = \
-@@ -513,6 +527,8 @@ clean-pluginLTLIBRARIES:
+@@ -518,6 +532,8 @@ clean-pluginLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -72,7 +72,7 @@
ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
$(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)
-@@ -527,6 +543,7 @@ distclean-compile:
+@@ -532,6 +548,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
Index: patches/patch-libpurple_protocols_gg_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-libpurple_protocols_gg_Makefile_in
--- patches/patch-libpurple_protocols_gg_Makefile_in 28 May 2007 12:43:34
-0000 1.2
+++ patches/patch-libpurple_protocols_gg_Makefile_in 31 Jul 2007 17:18:34
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.2 2007/05/28 12:43:34
steven Exp $
---- libpurple/protocols/gg/Makefile.in.orig Fri May 25 12:29:22 2007
-+++ libpurple/protocols/gg/Makefile.in Mon May 28 01:57:22 2007
-@@ -499,7 +499,7 @@ libgg_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/gg/Makefile.in.orig Sun Jul 29 08:33:35 2007
++++ libpurple/protocols/gg/Makefile.in Tue Jul 31 17:43:26 2007
+@@ -504,7 +504,7 @@ libgg_la_LDFLAGS = -module -avoid-version
@[EMAIL PROTECTED] = $(AM_CFLAGS)
@[EMAIL PROTECTED] = $(GADU_LIBS)
@[EMAIL PROTECTED] = $(GGSOURCES)
Index: patches/patch-libpurple_protocols_oscar_Makefile_am
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-libpurple_protocols_oscar_Makefile_am
--- patches/patch-libpurple_protocols_oscar_Makefile_am 12 May 2007 15:19:36
-0000 1.1.1.1
+++ patches/patch-libpurple_protocols_oscar_Makefile_am 31 Jul 2007 17:18:34
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_am,v 1.1.1.1 2007/05/12
15:19:36 alek Exp $
---- libpurple/protocols/oscar/Makefile.am.orig Thu Jan 18 23:28:23 2007
-+++ libpurple/protocols/oscar/Makefile.am Fri Jan 19 22:02:01 2007
-@@ -70,10 +70,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES)
+--- libpurple/protocols/oscar/Makefile.am.orig Thu Jun 14 23:11:58 2007
++++ libpurple/protocols/oscar/Makefile.am Fri Jun 15 13:53:22 2007
+@@ -65,10 +65,10 @@ liboscar_la_SOURCES = $(OSCARSOURCES)
liboscar_la_LIBADD = $(GLIB_LIBS)
libaim_la_SOURCES = libaim.c
Index: patches/patch-libpurple_protocols_oscar_Makefile_in
===================================================================
RCS file:
/cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-libpurple_protocols_oscar_Makefile_in
--- patches/patch-libpurple_protocols_oscar_Makefile_in 28 May 2007 12:43:34
-0000 1.2
+++ patches/patch-libpurple_protocols_oscar_Makefile_in 31 Jul 2007 17:18:34
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.2 2007/05/28
12:43:34 steven Exp $
---- libpurple/protocols/oscar/Makefile.in.orig Fri May 25 12:29:24 2007
-+++ libpurple/protocols/oscar/Makefile.in Mon May 28 01:57:22 2007
-@@ -559,9 +559,9 @@ libicq_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/oscar/Makefile.in.orig Sun Jul 29 08:33:36 2007
++++ libpurple/protocols/oscar/Makefile.in Tue Jul 31 17:43:26 2007
+@@ -550,9 +550,9 @@ libicq_la_LDFLAGS = -module -avoid-version
@[EMAIL PROTECTED] = $(OSCARSOURCES)
@[EMAIL PROTECTED] = $(GLIB_LIBS)
@[EMAIL PROTECTED] = libaim.c
Index: patches/patch-pidgin_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-pidgin_Makefile_in
--- patches/patch-pidgin_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-pidgin_Makefile_in 31 Jul 2007 17:18:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- pidgin/Makefile.in.orig Mon Apr 30 06:17:59 2007
-+++ pidgin/Makefile.in Tue May 1 23:11:28 2007
-@@ -104,7 +104,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+--- pidgin/Makefile.in.orig Sun Jul 29 08:33:39 2007
++++ pidgin/Makefile.in Tue Jul 31 17:43:26 2007
+@@ -106,7 +106,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
Index: patches/patch-pidgin_gtkdialogs_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.2
diff -u -r1.2 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c 28 May 2007 12:43:34 -0000 1.2
+++ patches/patch-pidgin_gtkdialogs_c 31 Jul 2007 17:18:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.2 2007/05/28 12:43:34 steven Exp $
---- pidgin/gtkdialogs.c.orig Fri May 25 12:28:22 2007
-+++ pidgin/gtkdialogs.c Mon May 28 01:57:23 2007
-@@ -560,6 +560,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
+--- pidgin/gtkdialogs.c.orig Sat Jul 28 07:12:36 2007
++++ pidgin/gtkdialogs.c Tue Jul 31 17:43:26 2007
+@@ -563,6 +563,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.1.1.1
diff -u -r1.1.1.1 patch-pidgin_gtkmain_c
--- patches/patch-pidgin_gtkmain_c 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-pidgin_gtkmain_c 31 Jul 2007 17:18:34 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- pidgin/gtkmain.c.orig Mon Apr 30 05:37:55 2007
-+++ pidgin/gtkmain.c Tue May 1 23:11:28 2007
+--- pidgin/gtkmain.c.orig Thu Jun 14 23:12:03 2007
++++ pidgin/gtkmain.c Fri Jun 15 13:53:06 2007
@@ -86,6 +86,7 @@ static SnDisplay *sn_display = NULL;
#endif
@@ -9,7 +9,7 @@
/*
* Lists of signals we wish to catch and those we wish to ignore.
-@@ -186,6 +187,8 @@ clean_pid()
+@@ -181,6 +182,8 @@ clean_pid()
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.2
diff -u -r1.2 patch-pidgin_gtknotify_c
--- patches/patch-pidgin_gtknotify_c 28 May 2007 12:43:34 -0000 1.2
+++ patches/patch-pidgin_gtknotify_c 31 Jul 2007 17:18:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtknotify_c,v 1.2 2007/05/28 12:43:34 steven Exp $
---- pidgin/gtknotify.c.orig Fri May 25 12:28:22 2007
-+++ pidgin/gtknotify.c Mon May 28 01:57:23 2007
-@@ -967,7 +967,16 @@ uri_command(const char *command, gboolean sync)
+--- pidgin/gtknotify.c.orig Sat Jul 21 20:45:34 2007
++++ pidgin/gtknotify.c Tue Jul 31 17:43:26 2007
+@@ -980,7 +980,16 @@ uri_command(const char *command, gboolean sync)
g_error_free(error);
}
else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/pidgin/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 28 May 2007 12:43:34 -0000 1.2
+++ pkg/PLIST 31 Jul 2007 17:18:34 -0000
@@ -21,6 +21,7 @@
include/finch/gntpounce.h
include/finch/gntprefs.h
include/finch/gntrequest.h
+include/finch/gntsound.h
include/finch/gntstatus.h
include/finch/gntui.h
include/gnt/
@@ -41,6 +42,7 @@
include/gnt/gntmenu.h
include/gnt/gntmenuitem.h
include/gnt/gntmenuitemcheck.h
+include/gnt/gntslider.h
include/gnt/gntstyle.h
include/gnt/gnttextview.h
include/gnt/gnttree.h
@@ -48,6 +50,7 @@
include/gnt/gntwidget.h
include/gnt/gntwindow.h
include/gnt/gntwm.h
+include/gnt/gntws.h
include/libpurple/
include/libpurple/account.h
include/libpurple/accountopt.h
@@ -142,6 +145,8 @@
include/pidgin/gtksession.h
include/pidgin/gtksound.h
include/pidgin/gtksourceiter.h
+include/pidgin/gtksourceundomanager.h
+include/pidgin/gtksourceview-marshal.h
include/pidgin/gtkstatusbox.h
include/pidgin/gtkthemes.h
include/pidgin/gtkutils.h
@@ -175,6 +180,8 @@
lib/pidgin/extplacement.so
lib/pidgin/gestures.la
lib/pidgin/gestures.so
+lib/pidgin/gtkbuddynote.la
+lib/pidgin/gtkbuddynote.so
lib/pidgin/history.la
lib/pidgin/history.so
lib/pidgin/iconaway.la
@@ -416,6 +423,7 @@
share/pixmaps/pidgin/emotes/default/angel.png
share/pixmaps/pidgin/emotes/default/angry.png
share/pixmaps/pidgin/emotes/default/arrogant.png
+share/pixmaps/pidgin/emotes/default/at-wits-end.png
share/pixmaps/pidgin/emotes/default/bad.png
share/pixmaps/pidgin/emotes/default/bashful.png
share/pixmaps/pidgin/emotes/default/beat-up.png
@@ -466,6 +474,7 @@
share/pixmaps/pidgin/emotes/default/embarrassed.png
share/pixmaps/pidgin/emotes/default/excruciating.png
share/pixmaps/pidgin/emotes/default/eyeroll.png
+share/pixmaps/pidgin/emotes/default/female-fighter.png
share/pixmaps/pidgin/emotes/default/film.png
share/pixmaps/pidgin/emotes/default/fingers-crossed.png
share/pixmaps/pidgin/emotes/default/flag.png
@@ -514,6 +523,7 @@
share/pixmaps/pidgin/emotes/default/musical-note.png
share/pixmaps/pidgin/emotes/default/nailbiting.png
share/pixmaps/pidgin/emotes/default/neutral.png
+share/pixmaps/pidgin/emotes/default/on-the-phone.png
share/pixmaps/pidgin/emotes/default/party.png
share/pixmaps/pidgin/emotes/default/peace.png
share/pixmaps/pidgin/emotes/default/phone.png
@@ -567,6 +577,7 @@
share/pixmaps/pidgin/emotes/default/theme
share/pixmaps/pidgin/emotes/default/thinking.png
share/pixmaps/pidgin/emotes/default/thunder.png
+share/pixmaps/pidgin/emotes/default/time-out.png
share/pixmaps/pidgin/emotes/default/tongue.png
share/pixmaps/pidgin/emotes/default/tremble.png
share/pixmaps/pidgin/emotes/default/turtle.png
@@ -696,6 +707,7 @@
share/pixmaps/pidgin/toolbar/16/font-size-up.png
share/pixmaps/pidgin/toolbar/16/insert-image.png
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
@@ -710,6 +722,7 @@
share/pixmaps/pidgin/tray/16/tray-extended-away.png
share/pixmaps/pidgin/tray/16/tray-invisible.png
share/pixmaps/pidgin/tray/16/tray-message.png
+share/pixmaps/pidgin/tray/16/tray-new-im.png
share/pixmaps/pidgin/tray/16/tray-offline.png
share/pixmaps/pidgin/tray/16/tray-online.png
share/pixmaps/pidgin/tray/22/
@@ -719,8 +732,27 @@
share/pixmaps/pidgin/tray/22/tray-extended-away.png
share/pixmaps/pidgin/tray/22/tray-invisible.png
share/pixmaps/pidgin/tray/22/tray-message.png
+share/pixmaps/pidgin/tray/22/tray-new-im.png
share/pixmaps/pidgin/tray/22/tray-offline.png
share/pixmaps/pidgin/tray/22/tray-online.png
+share/pixmaps/pidgin/tray/32/
+share/pixmaps/pidgin/tray/32/tray-away.png
+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-new-im.png
+share/pixmaps/pidgin/tray/32/tray-offline.png
+share/pixmaps/pidgin/tray/32/tray-online.png
+share/pixmaps/pidgin/tray/48/
+share/pixmaps/pidgin/tray/48/tray-away.png
+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-new-im.png
+share/pixmaps/pidgin/tray/48/tray-offline.png
+share/pixmaps/pidgin/tray/48/tray-online.png
share/pixmaps/purple/
share/pixmaps/purple/buddy_icons/
share/pixmaps/purple/buddy_icons/qq/
