update to pidgin 2.4.1

from brad
This commit is contained in:
steven 2008-04-04 22:39:09 +00:00
parent 48c582d4b0
commit 603407d22b
6 changed files with 28 additions and 28 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.17 2008/03/24 08:23:22 steven Exp $
# $OpenBSD: Makefile,v 1.18 2008/04/04 22:39:09 steven Exp $
SHARED_ONLY= Yes
COMMENT= multi-protocol instant messaging client
DISTNAME= pidgin-2.4.0
DISTNAME= pidgin-2.4.1
SHARED_LIBS += jabber 0.0 # .0.0
SHARED_LIBS += oscar 0.0 # .0.0
SHARED_LIBS += purple 3.0 # .4.0
SHARED_LIBS += purple-client 3.0 # .4.0
SHARED_LIBS += purple 3.1 # .4.1
SHARED_LIBS += purple-client 3.1 # .4.1
SHARED_LIBS += gnt 3.0 # .0.0
CATEGORIES= net

View File

@ -1,5 +1,5 @@
MD5 (pidgin-2.4.0.tar.gz) = m9ZxqCdIrAqMXWKDGY9WTQ==
RMD160 (pidgin-2.4.0.tar.gz) = RMG+vwJJBk8KWBYELWqNLQTzVnw=
SHA1 (pidgin-2.4.0.tar.gz) = EYLRqsIvAwO3Z6CWI3bc5p65GmU=
SHA256 (pidgin-2.4.0.tar.gz) = s6wPzMpQdGr3Hi9zz0smq89sEb1IeIu590T9e0S4XdA=
SIZE (pidgin-2.4.0.tar.gz) = 13437184
MD5 (pidgin-2.4.1.tar.gz) = JeNZPV5r/BeRERFHWgV3eA==
RMD160 (pidgin-2.4.1.tar.gz) = knagzM4MSlzTkViWAquaLUtqH4I=
SHA1 (pidgin-2.4.1.tar.gz) = /T74gl5jNdxO+NA7zwyD+bcWLTU=
SHA256 (pidgin-2.4.1.tar.gz) = O7IxLhDPnMSuoSDseo6WNhrTHT68Db/Kv440T4ivsM4=
SIZE (pidgin-2.4.1.tar.gz) = 13297380

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_h_in,v 1.7 2008/03/24 08:23:22 steven Exp $
--- config.h.in.orig Fri Feb 29 13:10:42 2008
+++ config.h.in Sat Mar 22 10:28:49 2008
@@ -169,6 +169,12 @@
$OpenBSD: patch-config_h_in,v 1.8 2008/04/04 22:39:09 steven Exp $
--- config.h.in.orig Mon Mar 31 13:21:59 2008
+++ config.h.in Mon Mar 31 21:48:49 2008
@@ -172,6 +172,12 @@
/* Define to 1 if you have the <nss.h> header file. */
#undef HAVE_NSS_H

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.9 2008/03/24 08:23:22 steven Exp $
--- configure.ac.orig Fri Feb 29 13:09:17 2008
+++ configure.ac Sat Mar 22 10:28:49 2008
$OpenBSD: patch-configure_ac,v 1.10 2008/04/04 22:39:09 steven Exp $
--- configure.ac.orig Mon Mar 31 13:21:22 2008
+++ configure.ac Mon Mar 31 21:48:49 2008
@@ -610,6 +610,7 @@ if test "x$enable_consoleui" = "xyes"; then
# ncursesw was not found. Look for plain old ncurses
enable_consoleui=yes
@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2008/03/24 08:23:22 steven Exp $
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
@@ -773,7 +774,7 @@ else
@@ -780,7 +781,7 @@ else
if test "$ac_silc_libs" != "no"; then
SILC_LIBS="-L$ac_silc_libs"
fi
@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2008/03/24 08:23:22 steven Exp $
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
@@ -1483,8 +1484,13 @@ dnl ##################################################
@@ -1490,8 +1491,13 @@ dnl ##################################################
dnl These two are inverses of each other <-- stolen from evolution!
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2008/03/24 08:23:22 steven Exp $
[enable_gnutls="$enableval"],
[enable_gnutls="yes"])
@@ -1496,6 +1502,90 @@ AC_ARG_ENABLE(nss,
@@ -1503,6 +1509,90 @@ AC_ARG_ENABLE(nss,
msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
dnl #
@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.9 2008/03/24 08:23:22 steven Exp $
dnl # Check for GnuTLS if it's specified.
dnl #
if test "x$enable_gnutls" != "xno"; then
@@ -1858,12 +1948,20 @@ fi
@@ -1865,12 +1955,20 @@ fi
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.7 2008/03/24 08:23:22 steven Exp $
--- pidgin/gtkdialogs.c.orig Fri Feb 29 13:09:28 2008
+++ pidgin/gtkdialogs.c Sat Mar 22 10:28:40 2008
@@ -604,6 +604,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.8 2008/04/04 22:39:09 steven Exp $
--- pidgin/gtkdialogs.c.orig Mon Mar 31 13:21:25 2008
+++ pidgin/gtkdialogs.c Mon Mar 31 21:48:38 2008
@@ -605,6 +605,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
#endif

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pidgin_gtkmain_c,v 1.5 2008/03/24 08:23:22 steven Exp $
--- pidgin/gtkmain.c.orig Fri Feb 29 13:09:29 2008
+++ pidgin/gtkmain.c Sat Mar 22 10:28:40 2008
$OpenBSD: patch-pidgin_gtkmain_c,v 1.6 2008/04/04 22:39:09 steven Exp $
--- pidgin/gtkmain.c.orig Mon Mar 31 13:21:25 2008
+++ pidgin/gtkmain.c Mon Mar 31 21:48:38 2008
@@ -87,6 +87,7 @@ static SnDisplay *sn_display = NULL;
#endif
@ -9,7 +9,7 @@ $OpenBSD: patch-pidgin_gtkmain_c,v 1.5 2008/03/24 08:23:22 steven Exp $
/*
* Lists of signals we wish to catch and those we wish to ignore.
@@ -182,6 +183,8 @@ clean_pid(void)
@@ -157,6 +158,8 @@ clean_pid(void)
do {
pid = waitpid(-1, &status, WNOHANG);
} while (pid != 0 && pid != (pid_t)-1);