SHA256
1
0
forked from pool/pidgin
OBS User unknown 2008-07-11 21:22:52 +00:00 committed by Git OBS Bridge
parent 8e4354b51e
commit 9a7f87e01f
6 changed files with 59 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4fa66247266e8e7453e13322a30910b944e7a406fa30c56cb84be9816b253c7
size 9459078

3
pidgin-2.4.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f09878883c6980083e7774371ec57d8bdc320a325342965afb120d52780d15f
size 9376721

View File

@ -1,13 +1,15 @@
Fix autoreconf for latest version of check.
--- configure.ac
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1938,11 +1938,7 @@
@@ -2243,11 +2243,7 @@ fi
dnl #######################################################################
dnl # Check for check
dnl #######################################################################
-PKG_CHECK_MODULES(CHECK,[check >= 0.9.4],:,[
- ifdef([AM_PATH_CHECK],
- ifdef([[AM_PATH_CHECK]],
- [AM_PATH_CHECK(0.8.2,:,:)],
- [AC_MSG_RESULT([no, testing is disabled])])
- ])

View File

@ -1,6 +1,8 @@
--- pidgin-2.1.0/configure.ac
+++ pidgin-2.1.0/configure.ac
@@ -1479,6 +1479,20 @@
Index: pidgin-2.4.2/configure.ac
===================================================================
--- pidgin-2.4.2.orig/configure.ac
+++ pidgin-2.4.2/configure.ac
@@ -1678,6 +1678,20 @@ if test "x$enable_nss" != "xno"; then
[AC_HELP_STRING([--with-nss-libs=PREFIX], [specify location of Mozilla nss3 libs.])],
[with_nss_libs="$withval"])
@ -21,28 +23,32 @@
if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
test -n "$with_nss_includes" || test -n "$with_nss_libs" ||
--- pidgin-2.1.0/libpurple/Makefile.am
+++ pidgin-2.1.0/libpurple/Makefile.am
@@ -230,6 +230,7 @@
Index: pidgin-2.4.2/libpurple/Makefile.am
===================================================================
--- pidgin-2.4.2.orig/libpurple/Makefile.am
+++ pidgin-2.4.2/libpurple/Makefile.am
@@ -245,6 +245,7 @@ libpurple_la_LIBADD = \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
$(LIBNM_LIBS) \
$(NETWORKMANAGER_LIBS) \
+ $(PURPLE_KEYRING_LIBS) \
$(INTLLIBS) \
-lm
@@ -242,5 +243,6 @@
@@ -257,5 +258,6 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(PURPLE_KEYRING_CFLAGS) \
$(LIBXML_CFLAGS) \
$(LIBNM_CFLAGS)
--- pidgin-2.1.0/libpurple/account.c
+++ pidgin-2.1.0/libpurple/account.c
@@ -40,6 +40,13 @@
#include "util.h"
#include "xmlnode.h"
$(NETWORKMANAGER_CFLAGS)
Index: pidgin-2.4.2/libpurple/account.c
===================================================================
--- pidgin-2.4.2.orig/libpurple/account.c
+++ pidgin-2.4.2/libpurple/account.c
@@ -49,6 +49,13 @@ typedef struct
#define PURPLE_ACCOUNT_GET_PRIVATE(account) \
((PurpleAccountPrivate *) (account->priv))
+#ifdef PURPLE_ENABLE_KEYRING
+#include <gnome-keyring.h>
@ -54,7 +60,7 @@
/* TODO: Should use PurpleValue instead of this? What about "ui"? */
typedef struct
{
@@ -324,8 +331,13 @@
@@ -374,8 +381,13 @@ account_to_xmlnode(PurpleAccount *accoun
if (purple_account_get_remember_password(account) &&
((tmp = purple_account_get_password(account)) != NULL))
{
@ -68,7 +74,7 @@
}
if ((tmp = purple_account_get_alias(account)) != NULL)
@@ -700,17 +712,30 @@
@@ -790,17 +802,30 @@ parse_account(xmlnode *node)
}
ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
@ -105,9 +111,9 @@
/* Read the alias */
child = xmlnode_get_child(node, "alias");
@@ -2448,3 +2473,60 @@
purple_signals_unregister_by_instance(purple_accounts_get_handle());
@@ -2778,3 +2803,60 @@ purple_accounts_uninit(void)
purple_signals_disconnect_by_handle(handle);
purple_signals_unregister_by_instance(handle);
}
+
+#ifdef PURPLE_ENABLE_KEYRING

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jun 30 20:32:10 CEST 2008 - maw@suse.de
- Update to version 2.4.2:
+ Usability imprvements in typing notification, buddy icon, and
imput area size
+ Memory leaks
+ MSN buddy list synchronisation improvements
+ For a blow-by-blow account, see
http://developer.pidgin.im/query?status=closed&milestone=2.4.2
- Respin the following patches: pidgin-gnome-keyring.patch and
pidgin-check.patch.
-------------------------------------------------------------------
Wed May 7 16:43:39 CEST 2008 - coolo@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package pidgin (Version 2.4.1)
# spec file for package pidgin (Version 2.4.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,8 +13,8 @@
Name: pidgin
Summary: GTK+-Based Multiprotocol Instant Messaging Client
Version: 2.4.1
Release: 16
Version: 2.4.2
Release: 1
License: GPL v2 or later
Group: Productivity/Networking/Instant Messenger
Url: http://www.pidgin.im/
@ -880,6 +880,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/gnt.pc
%changelog
* Mon Jun 30 2008 maw@suse.de
- Update to version 2.4.2:
+ Usability imprvements in typing notification, buddy icon, and
imput area size
+ Memory leaks
+ MSN buddy list synchronisation improvements
+ For a blow-by-blow account, see
http://developer.pidgin.im/query?status=closed&milestone=2.4.2
- Respin the following patches: pidgin-gnome-keyring.patch and
pidgin-check.patch.
* Wed May 07 2008 coolo@suse.de
- also provide gaim-devel to fix update
* Wed Apr 02 2008 maw@suse.de