update to 2.4.0.
feedback/ok brad@ (maintainer), tested/ok merdely@ on similar diff
This commit is contained in:
parent
c3a88cc59a
commit
fca8be156d
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2007/12/15 21:13:00 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2008/03/24 08:23:22 steven Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= multi-protocol instant messaging client
|
||||
|
||||
DISTNAME= pidgin-2.3.1
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= pidgin-2.4.0
|
||||
SHARED_LIBS += jabber 0.0 # .0.0
|
||||
SHARED_LIBS += oscar 0.0 # .0.0
|
||||
SHARED_LIBS += purple 2.1 # .3.1
|
||||
SHARED_LIBS += purple-client 2.1 # .3.1
|
||||
SHARED_LIBS += gnt 2.0 # .0.0
|
||||
SHARED_LIBS += purple 3.0 # .4.0
|
||||
SHARED_LIBS += purple-client 3.0 # .4.0
|
||||
SHARED_LIBS += gnt 3.0 # .0.0
|
||||
CATEGORIES= net
|
||||
|
||||
HOMEPAGE= http://pidgin.im/
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (pidgin-2.3.1.tar.gz) = p1CZ9QE8e7cWHSlL+nQ5ww==
|
||||
RMD160 (pidgin-2.3.1.tar.gz) = SaKAr5ztNKgs6WIB8Ogh06Rpi3c=
|
||||
SHA1 (pidgin-2.3.1.tar.gz) = JYjDj65nbtyYGm8s00RE5KkqxG4=
|
||||
SHA256 (pidgin-2.3.1.tar.gz) = FavIvI+ABtfbNtfGTluign2B5v17LnxBMLjN2A62+cs=
|
||||
SIZE (pidgin-2.3.1.tar.gz) = 13262172
|
||||
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
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- config.h.in.orig Sat Nov 24 14:06:47 2007
|
||||
+++ config.h.in Mon Nov 26 16:06:45 2007
|
||||
@@ -160,6 +160,12 @@
|
||||
$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 @@
|
||||
/* Define to 1 if you have the <nss.h> header file. */
|
||||
#undef HAVE_NSS_H
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.8 2007/12/09 10:56:31 steven Exp $
|
||||
--- configure.ac.orig Fri Dec 7 15:36:58 2007
|
||||
+++ configure.ac Sat Dec 8 21:03:07 2007
|
||||
$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
|
||||
@@ -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.8 2007/12/09 10:56:31 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
|
||||
@@ -831,7 +832,7 @@ else
|
||||
@@ -773,7 +774,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.8 2007/12/09 10:56:31 steven Exp $
|
||||
AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
|
||||
|
||||
if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
|
||||
@@ -1518,8 +1519,13 @@ dnl ##################################################
|
||||
@@ -1483,8 +1484,13 @@ dnl ##################################################
|
||||
|
||||
dnl These two are inverses of each other <-- stolen from evolution!
|
||||
|
||||
@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.8 2007/12/09 10:56:31 steven Exp $
|
||||
[enable_gnutls="$enableval"],
|
||||
[enable_gnutls="yes"])
|
||||
|
||||
@@ -1531,6 +1537,90 @@ AC_ARG_ENABLE(nss,
|
||||
@@ -1496,6 +1502,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.8 2007/12/09 10:56:31 steven Exp $
|
||||
dnl # Check for GnuTLS if it's specified.
|
||||
dnl #
|
||||
if test "x$enable_gnutls" != "xno"; then
|
||||
@@ -1893,12 +1983,20 @@ fi
|
||||
@@ -1858,12 +1948,20 @@ fi
|
||||
|
||||
AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- finch/libgnt/Makefile.in.orig Sat Nov 24 14:07:07 2007
|
||||
+++ finch/libgnt/Makefile.in Mon Nov 26 16:06:45 2007
|
||||
@@ -354,7 +354,7 @@ target_vendor = @target_vendor@
|
||||
$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- finch/libgnt/Makefile.in.orig Fri Feb 29 13:11:08 2008
|
||||
+++ finch/libgnt/Makefile.in Sat Mar 22 10:28:49 2008
|
||||
@@ -355,7 +355,7 @@ target_vendor = @target_vendor@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = genmarshal pygnt
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.4 2007/12/09 10:56:31 steven Exp $
|
||||
--- finch/libgnt/gntwm.c.orig Fri Dec 7 15:37:01 2007
|
||||
+++ finch/libgnt/gntwm.c Sat Dec 8 21:04:33 2007
|
||||
@@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
$OpenBSD: patch-finch_libgnt_gntwm_c,v 1.5 2008/03/24 08:23:22 steven Exp $
|
||||
--- finch/libgnt/gntwm.c.orig Fri Feb 29 13:09:19 2008
|
||||
+++ finch/libgnt/gntwm.c Sat Mar 22 10:28:39 2008
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <Python.h>
|
||||
#else
|
||||
#define _GNU_SOURCE
|
||||
-#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__)
|
||||
+#if (defined(__APPLE__) || defined(__unix__)) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
#define _XOPEN_SOURCE_EXTENDED
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-finch_plugins_Makefile_am,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
|
||||
--- finch/plugins/Makefile.am.orig Thu Apr 12 07:53:30 2007
|
||||
+++ finch/plugins/Makefile.am Tue May 1 23:11:26 2007
|
||||
@@ -24,7 +24,7 @@ gntgf_la_CFLAGS = $(X11_CFLAGS)
|
||||
$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
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- finch/plugins/Makefile.in.orig Sat Nov 24 14:07:07 2007
|
||||
+++ finch/plugins/Makefile.in Mon Nov 26 16:06:45 2007
|
||||
$OpenBSD: patch-finch_plugins_Makefile_in,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- finch/plugins/Makefile.in.orig Fri Feb 29 13:11:08 2008
|
||||
+++ finch/plugins/Makefile.in Mon Mar 24 08:19:27 2008
|
||||
@@ -81,7 +81,8 @@ gnthistory_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
|
||||
$(gnthistory_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@ -11,12 +11,12 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
am__gntlastlog_la_SOURCES_DIST = lastlog.c
|
||||
@PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
|
||||
gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
|
||||
@@ -380,7 +381,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
|
||||
@PLUGINS_TRUE@gntclipboard_la_CFLAGS = $(X11_CFLAGS)
|
||||
@PLUGINS_TRUE@gntgf_la_CFLAGS = $(X11_CFLAGS)
|
||||
@@ -397,7 +398,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@gntgf_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)
|
||||
+@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 = \
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- libpurple/plugins/ssl/Makefile.in.orig Sat Nov 24 14:07:09 2007
|
||||
+++ libpurple/plugins/ssl/Makefile.in Mon Nov 26 16:06:45 2007
|
||||
$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- libpurple/plugins/ssl/Makefile.in.orig Fri Feb 29 13:11:11 2008
|
||||
+++ libpurple/plugins/ssl/Makefile.in Sat Mar 22 10:28:49 2008
|
||||
@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
|
||||
pluginLTLIBRARIES_INSTALL = $(INSTALL)
|
||||
LTLIBRARIES = $(plugin_LTLIBRARIES)
|
||||
@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.6 2007/11/28 08:48:32 stev
|
||||
GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
|
||||
GNUTLS_LIBS = @GNUTLS_LIBS@
|
||||
GREP = @GREP@
|
||||
@@ -356,17 +364,21 @@ EXTRA_DIST = \
|
||||
@@ -357,17 +365,21 @@ EXTRA_DIST = \
|
||||
|
||||
plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
|
||||
ssl_la_LDFLAGS = -module -avoid-version
|
||||
@ -54,7 +54,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.6 2007/11/28 08:48:32 stev
|
||||
@PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
|
||||
@PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
|
||||
AM_CPPFLAGS = \
|
||||
@@ -378,6 +390,7 @@ AM_CPPFLAGS = \
|
||||
@@ -379,6 +391,7 @@ AM_CPPFLAGS = \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(PLUGIN_CFLAGS)
|
||||
|
||||
@ -62,7 +62,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.6 2007/11/28 08:48:32 stev
|
||||
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
|
||||
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
|
||||
all: all-am
|
||||
@@ -440,6 +453,8 @@ clean-pluginLTLIBRARIES:
|
||||
@@ -441,6 +454,8 @@ clean-pluginLTLIBRARIES:
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
@ -71,7 +71,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.6 2007/11/28 08:48:32 stev
|
||||
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)
|
||||
ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
|
||||
@@ -454,6 +469,7 @@ distclean-compile:
|
||||
@@ -455,6 +470,7 @@ distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- libpurple/protocols/gg/Makefile.in.orig Sat Nov 24 14:07:11 2007
|
||||
+++ libpurple/protocols/gg/Makefile.in Mon Nov 26 16:06:45 2007
|
||||
@@ -420,7 +420,7 @@ libgg_la_LDFLAGS = -module -avoid-version
|
||||
$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- libpurple/protocols/gg/Makefile.in.orig Fri Feb 29 13:11:12 2008
|
||||
+++ libpurple/protocols/gg/Makefile.in Sat Mar 22 10:28:49 2008
|
||||
@@ -421,7 +421,7 @@ libgg_la_LDFLAGS = -module -avoid-version
|
||||
@STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS)
|
||||
@STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS)
|
||||
@STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- libpurple/protocols/oscar/Makefile.in.orig Sat Nov 24 14:07:14 2007
|
||||
+++ libpurple/protocols/oscar/Makefile.in Mon Nov 26 16:06:45 2007
|
||||
@@ -469,9 +469,9 @@ libicq_la_LDFLAGS = -module -avoid-version
|
||||
$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- libpurple/protocols/oscar/Makefile.in.orig Fri Feb 29 13:11:16 2008
|
||||
+++ libpurple/protocols/oscar/Makefile.in Sat Mar 22 10:28:49 2008
|
||||
@@ -470,9 +470,9 @@ libicq_la_LDFLAGS = -module -avoid-version
|
||||
@STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES)
|
||||
@STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
|
||||
@STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-libpurple_purple-remote,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
|
||||
--- libpurple/purple-remote.orig Fri Feb 2 17:22:36 2007
|
||||
+++ libpurple/purple-remote Fri Feb 2 17:22:59 2007
|
||||
$OpenBSD: patch-libpurple_purple-remote,v 1.2 2008/03/24 08:23:22 steven Exp $
|
||||
--- libpurple/purple-remote.orig Fri Feb 29 13:09:28 2008
|
||||
+++ libpurple/purple-remote Sat Mar 22 10:28:40 2008
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
-#!/usr/bin/env python
|
||||
+#!%python%
|
||||
|
||||
import dbus
|
||||
|
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-libpurple_purple-url-handler,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
|
||||
--- libpurple/purple-url-handler.orig Fri Feb 2 17:18:14 2007
|
||||
+++ libpurple/purple-url-handler Fri Feb 2 17:19:23 2007
|
||||
$OpenBSD: patch-libpurple_purple-url-handler,v 1.2 2008/03/24 08:23:22 steven Exp $
|
||||
--- libpurple/purple-url-handler.orig Fri Feb 29 13:09:28 2008
|
||||
+++ libpurple/purple-url-handler Sat Mar 22 10:28:40 2008
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
-#!/usr/bin/env python
|
||||
+#!%python%
|
||||
|
||||
import dbus
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-pidgin_gtkdialogs_c,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- pidgin/gtkdialogs.c.orig Sat Nov 24 14:06:02 2007
|
||||
+++ pidgin/gtkdialogs.c Mon Nov 26 16:06:34 2007
|
||||
@@ -611,6 +611,12 @@ g_string_append(str, "<br/> <b>Library Support</b><br
|
||||
$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
|
||||
g_string_append(str, " <b>GtkSpell:</b> Disabled<br/>");
|
||||
#endif
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-pidgin_gtkmain_c,v 1.4 2007/10/01 22:03:30 merdely Exp $
|
||||
--- pidgin/gtkmain.c.orig Fri Sep 14 00:45:41 2007
|
||||
+++ pidgin/gtkmain.c Tue Sep 18 20:13:19 2007
|
||||
$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
|
||||
@@ -87,6 +87,7 @@ static SnDisplay *sn_display = NULL;
|
||||
#endif
|
||||
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-pidgin_gtkmain_c,v 1.4 2007/10/01 22:03:30 merdely Exp $
|
||||
|
||||
/*
|
||||
* Lists of signals we wish to catch and those we wish to ignore.
|
||||
@@ -182,6 +183,8 @@ clean_pid()
|
||||
@@ -182,6 +183,8 @@ clean_pid(void)
|
||||
do {
|
||||
pid = waitpid(-1, &status, WNOHANG);
|
||||
} while (pid != 0 && pid != (pid_t)-1);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-pidgin_gtknotify_c,v 1.6 2007/11/28 08:48:32 steven Exp $
|
||||
--- pidgin/gtknotify.c.orig Sat Nov 24 14:06:02 2007
|
||||
+++ pidgin/gtknotify.c Mon Nov 26 16:06:34 2007
|
||||
@@ -1014,7 +1014,16 @@ uri_command(const char *command, gboolean sync)
|
||||
$OpenBSD: patch-pidgin_gtknotify_c,v 1.7 2008/03/24 08:23:22 steven Exp $
|
||||
--- pidgin/gtknotify.c.orig Fri Feb 29 13:09:29 2008
|
||||
+++ pidgin/gtknotify.c Sat Mar 22 10:28:40 2008
|
||||
@@ -1024,7 +1024,16 @@ uri_command(const char *command, gboolean sync)
|
||||
g_error_free(error);
|
||||
}
|
||||
else
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2007/12/15 21:13:00 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2008/03/24 08:23:22 steven Exp $
|
||||
@conflict gaim-*
|
||||
bin/finch
|
||||
bin/pidgin
|
||||
@ -17,11 +17,13 @@ include/finch/gntconv.h
|
||||
include/finch/gntdebug.h
|
||||
include/finch/gntft.h
|
||||
include/finch/gntidle.h
|
||||
include/finch/gntlog.h
|
||||
include/finch/gntnotify.h
|
||||
include/finch/gntplugin.h
|
||||
include/finch/gntpounce.h
|
||||
include/finch/gntprefs.h
|
||||
include/finch/gntrequest.h
|
||||
include/finch/gntroomlist.h
|
||||
include/finch/gntsound.h
|
||||
include/finch/gntstatus.h
|
||||
include/finch/gntui.h
|
||||
@ -160,6 +162,7 @@ include/pidgin/minidialog.h
|
||||
include/pidgin/pidgin.h
|
||||
include/pidgin/pidgincombobox.h
|
||||
include/pidgin/pidginstock.h
|
||||
include/pidgin/pidgintooltip.h
|
||||
lib/finch/
|
||||
lib/finch/gntclipboard.la
|
||||
lib/finch/gntclipboard.so
|
||||
@ -169,6 +172,8 @@ lib/finch/gnthistory.la
|
||||
lib/finch/gnthistory.so
|
||||
lib/finch/gntlastlog.la
|
||||
lib/finch/gntlastlog.so
|
||||
lib/finch/grouping.la
|
||||
lib/finch/grouping.so
|
||||
lib/libgnt.la
|
||||
@lib lib/libgnt.so.${LIBgnt_VERSION}
|
||||
lib/libjabber.la
|
||||
@ -276,7 +281,6 @@ lib/purple-2/statenotify.so
|
||||
@man man/man1/finch.1
|
||||
@man man/man1/pidgin.1
|
||||
share/aclocal/purple.m4
|
||||
share/applications/
|
||||
share/applications/pidgin.desktop
|
||||
share/dbus-1/services/purple.service
|
||||
share/doc/pidgin/
|
||||
@ -347,6 +351,7 @@ share/locale/pt/LC_MESSAGES/pidgin.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/pidgin.mo
|
||||
share/locale/ro/LC_MESSAGES/pidgin.mo
|
||||
share/locale/ru/LC_MESSAGES/pidgin.mo
|
||||
share/locale/si/LC_MESSAGES/pidgin.mo
|
||||
share/locale/sk/LC_MESSAGES/pidgin.mo
|
||||
share/locale/sl/LC_MESSAGES/pidgin.mo
|
||||
share/locale/sq/LC_MESSAGES/pidgin.mo
|
||||
@ -915,6 +920,7 @@ share/purple/ca-certs/
|
||||
share/purple/ca-certs/Equifax_Secure_CA.pem
|
||||
share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
|
||||
share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
|
||||
share/purple/ca-certs/StartCom_Free_SSL_CA.pem
|
||||
share/purple/ca-certs/Verisign_Class3_Primary_CA.pem
|
||||
share/purple/ca-certs/Verisign_RSA_Secure_Server_CA.pem
|
||||
share/sounds/
|
||||
|
Loading…
x
Reference in New Issue
Block a user