rpm/pidgin
SHA256
1
0
Fork 0
forked from pool/pidgin
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-05-31 19:10:32 +00:00 committed by Git OBS Bridge
parent f8f9bd5819
commit 8bbda4bffa
6 changed files with 70 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pidgin-2.0.0.tar.bz2
View File

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

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

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

85
pidgin-nonblock-common.patch
View File

@ -1,16 +1,15 @@
diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c gaim-1.5.0-new/libpurple/plugins/ssl/ssl-gnutls.c --- pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c
--- gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c 2004-09-03 16:34:16.000000000 -0500 +++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-gnutls.c
+++ gaim-1.5.0-new/libpurple/plugins/ssl/ssl-gnutls.c 2005-11-12 21:42:43.000000000 -0600 @@ -137,8 +137,6 @@
@@ -131,8 +131,6 @@ ssl_gnutls_close(PurpleSslConnection *gsc) if(gnutls_data->handshake_handler)
if(!gnutls_data) purple_input_remove(gnutls_data->handshake_handler);
return;
- gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR); - gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR);
- -
gnutls_deinit(gnutls_data->session); gnutls_deinit(gnutls_data->session);
g_free(gnutls_data); g_free(gnutls_data);
@@ -160,6 +158,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc, @@ -173,6 +171,22 @@
} }
static size_t static size_t
@ -33,7 +32,7 @@ diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c gaim-1.5.0-new/libp
ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len) ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len)
{ {
PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc); PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
@@ -171,6 +185,23 @@ ssl_gnutls_write(PurpleSslConnection *gsc, @@ -201,6 +215,23 @@
return s; return s;
} }
@ -57,21 +56,19 @@ diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-gnutls.c gaim-1.5.0-new/libp
static PurpleSslOps ssl_ops = static PurpleSslOps ssl_ops =
{ {
ssl_gnutls_init, ssl_gnutls_init,
@@ -178,7 +209,9 @@ static PurpleSslOps ssl_ops = @@ -208,7 +239,9 @@
ssl_gnutls_connect, ssl_gnutls_connect,
ssl_gnutls_close, ssl_gnutls_close,
ssl_gnutls_read, ssl_gnutls_read,
- ssl_gnutls_write,
+ ssl_gnutls_read_nonblock, + ssl_gnutls_read_nonblock,
+ ssl_gnutls_write, ssl_gnutls_write,
+ ssl_gnutls_write_nonblock, + ssl_gnutls_write_nonblock,
/* padding */ /* padding */
NULL, NULL,
diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-nss.c gaim-1.5.0-new/libpurple/plugins/ssl/ssl-nss.c --- pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c
--- gaim-1.5.0-old/libpurple/plugins/ssl/ssl-nss.c 2005-01-16 18:32:26.000000000 -0600 +++ pidgin-2.0.1/libpurple/plugins/ssl/ssl-nss.c
+++ gaim-1.5.0-new/libpurple/plugins/ssl/ssl-nss.c 2005-11-12 21:42:23.000000000 -0600 @@ -359,6 +359,8 @@
@@ -269,6 +269,8 @@ static PurpleSslOps ssl_ops =
ssl_nss_connect, ssl_nss_connect,
ssl_nss_close, ssl_nss_close,
ssl_nss_read, ssl_nss_read,
@ -80,9 +77,8 @@ diff -uprN gaim-1.5.0-old/libpurple/plugins/ssl/ssl-nss.c gaim-1.5.0-new/libpurp
ssl_nss_write, ssl_nss_write,
/* padding */ /* padding */
diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.c gaim-1.5.0-new/libpurple/purple-fifo.c --- pidgin-2.0.1/libpurple/purple-fifo.c
--- gaim-1.5.0-old/libpurple/purple-fifo.c 1969-12-31 18:00:00.000000000 -0600 +++ pidgin-2.0.1/libpurple/purple-fifo.c
+++ gaim-1.5.0-new/libpurple/purple-fifo.c 2005-11-12 21:42:23.000000000 -0600
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
+/* +/*
+ * @file purple-fifo.c A FIFO byte queue. + * @file purple-fifo.c A FIFO byte queue.
@ -316,9 +312,8 @@ diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.c gaim-1.5.0-new/libpurple/purpl
+ +
+ return TRUE; + return TRUE;
+} +}
diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.h gaim-1.5.0-new/libpurple/purple-fifo.h --- pidgin-2.0.1/libpurple/purple-fifo.h
--- gaim-1.5.0-old/libpurple/purple-fifo.h 1969-12-31 18:00:00.000000000 -0600 +++ pidgin-2.0.1/libpurple/purple-fifo.h
+++ gaim-1.5.0-new/libpurple/purple-fifo.h 2005-11-12 21:42:23.000000000 -0600
@@ -0,0 +1,54 @@ @@ -0,0 +1,54 @@
+/** +/**
+ * @file purple-fifo.h A FIFO byte queue. + * @file purple-fifo.h A FIFO byte queue.
@ -374,9 +369,8 @@ diff -uprN gaim-1.5.0-old/libpurple/purple-fifo.h gaim-1.5.0-new/libpurple/purpl
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* _purple_fifo_H_ */ +#endif /* _purple_fifo_H_ */
diff -uprN gaim-1.5.0-old/libpurple/purple-io.c gaim-1.5.0-new/libpurple/purple-io.c --- pidgin-2.0.1/libpurple/purple-io.c
--- gaim-1.5.0-old/libpurple/purple-io.c 1969-12-31 18:00:00.000000000 -0600 +++ pidgin-2.0.1/libpurple/purple-io.c
+++ gaim-1.5.0-new/libpurple/purple-io.c 2005-11-12 21:42:23.000000000 -0600
@@ -0,0 +1,391 @@ @@ -0,0 +1,391 @@
+/* +/*
+ * @file purple-io.c Buffering I/O layer. + * @file purple-io.c Buffering I/O layer.
@ -769,9 +763,8 @@ diff -uprN gaim-1.5.0-old/libpurple/purple-io.c gaim-1.5.0-new/libpurple/purple-
+{ +{
+ return purple_fifo_get_used (io->write_fifo); + return purple_fifo_get_used (io->write_fifo);
+} +}
diff -uprN gaim-1.5.0-old/libpurple/purple-io.h gaim-1.5.0-new/libpurple/purple-io.h --- pidgin-2.0.1/libpurple/purple-io.h
--- gaim-1.5.0-old/libpurple/purple-io.h 1969-12-31 18:00:00.000000000 -0600 +++ pidgin-2.0.1/libpurple/purple-io.h
+++ gaim-1.5.0-new/libpurple/purple-io.h 2005-11-12 21:42:23.000000000 -0600
@@ -0,0 +1,87 @@ @@ -0,0 +1,87 @@
+/** +/**
+ * @file purple-io.h Buffering I/O layer. + * @file purple-io.h Buffering I/O layer.
@ -860,10 +853,9 @@ diff -uprN gaim-1.5.0-old/libpurple/purple-io.h gaim-1.5.0-new/libpurple/purple-
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* _PURPLE_IO_H_ */ +#endif /* _PURPLE_IO_H_ */
diff -uprN gaim-1.5.0-old/libpurple/sslconn.c gaim-1.5.0-new/libpurple/sslconn.c --- pidgin-2.0.1/libpurple/sslconn.c
--- gaim-1.5.0-old/libpurple/sslconn.c 2004-01-09 22:04:56.000000000 -0600 +++ pidgin-2.0.1/libpurple/sslconn.c
+++ gaim-1.5.0-new/libpurple/sslconn.c 2005-11-12 21:42:23.000000000 -0600 @@ -219,6 +219,27 @@
@@ -209,6 +209,27 @@ purple_ssl_read(PurpleSslConnection *gsc, vo
} }
size_t size_t
@ -891,8 +883,8 @@ diff -uprN gaim-1.5.0-old/libpurple/sslconn.c gaim-1.5.0-new/libpurple/sslconn.c
purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len) purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
{ {
PurpleSslOps *ops; PurpleSslOps *ops;
@@ -225,6 +246,27 @@ purple_ssl_write(PurpleSslConnection *gsc, c @@ -231,6 +252,27 @@
return 0; return (ops->write)(gsc, data, len);
} }
+size_t +size_t
@ -919,10 +911,9 @@ diff -uprN gaim-1.5.0-old/libpurple/sslconn.c gaim-1.5.0-new/libpurple/sslconn.c
void void
purple_ssl_set_ops(PurpleSslOps *ops) purple_ssl_set_ops(PurpleSslOps *ops)
{ {
diff -uprN gaim-1.5.0-old/libpurple/sslconn.h gaim-1.5.0-new/libpurple/sslconn.h --- pidgin-2.0.1/libpurple/sslconn.h
--- gaim-1.5.0-old/libpurple/sslconn.h 2004-08-08 00:37:58.000000000 -0500 +++ pidgin-2.0.1/libpurple/sslconn.h
+++ gaim-1.5.0-new/libpurple/sslconn.h 2005-11-12 21:42:23.000000000 -0600 @@ -35,6 +35,12 @@
@@ -35,6 +35,12 @@ typedef enum
PURPLE_SSL_CONNECT_FAILED = 2 PURPLE_SSL_CONNECT_FAILED = 2
} PurpleSslErrorType; } PurpleSslErrorType;
@ -935,17 +926,23 @@ diff -uprN gaim-1.5.0-old/libpurple/sslconn.h gaim-1.5.0-new/libpurple/sslconn.h
typedef struct _PurpleSslConnection PurpleSslConnection; typedef struct _PurpleSslConnection PurpleSslConnection;
typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *, typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *,
@@ -70,7 +76,9 @@ typedef struct @@ -100,6 +106,7 @@
PurpleInputFunction connect_cb; * @return Number of bytes actually written into the buffer, or <0 on error
void (*close)(PurpleSslConnection *gsc); */
size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len); size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
+ size_t (*read_nonblock)(PurpleSslConnection *gsc, void *data, size_t len); + size_t (*read_nonblock)(PurpleSslConnection *gsc, void *data, size_t len);
/** Writes data to a connection (like POSIX send())
* @param gsc Connection context
* @param data Data buffer to send data from
@@ -107,6 +114,7 @@
* @return The number of bytes written (may be less than len) or <0 on error
*/
size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len); size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
+ size_t (*write_nonblock)(PurpleSslConnection *gsc, const void *data, size_t len); + size_t (*write_nonblock)(PurpleSslConnection *gsc, const void *data, size_t len);
} PurpleSslOps; void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void);
@@ -152,6 +160,17 @@ void purple_ssl_close(PurpleSslConnection *g @@ -197,6 +205,17 @@
size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len); size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len);
/** /**
@ -963,7 +960,7 @@ diff -uprN gaim-1.5.0-old/libpurple/sslconn.h gaim-1.5.0-new/libpurple/sslconn.h
* Writes data to an SSL connection. * Writes data to an SSL connection.
* *
* @param gsc The SSL connection handle. * @param gsc The SSL connection handle.
@@ -162,6 +181,17 @@ size_t purple_ssl_read(PurpleSslConnection * @@ -207,6 +226,17 @@
*/ */
size_t purple_ssl_write(PurpleSslConnection *gsc, const void *buffer, size_t len); size_t purple_ssl_write(PurpleSslConnection *gsc, const void *buffer, size_t len);

24
pidgin-undefined-operation.patch
View File

@ -1,24 +0,0 @@
http://developer.pidgin.im/ticket/889
I: Program causes undefined operation
(likely same variable used twiceand post/pre incremented in the same expression).
e.g. x = x++; Split it in two operations.
gntwm.c: In function 'dump_screen':
gntwm.c:610: warning: operation on 'fgp' may be undefined
--- finch/libgnt/gntwm.c
+++ finch/libgnt/gntwm.c
@@ -607,7 +607,11 @@
if (bgp == -1)
bgp = COLOR_WHITE;
if (now & A_REVERSE)
- fgp ^= bgp ^= fgp ^= bgp; /* *wink* */
+ {
+ short tgp = bgp;
+ bgp = fgp;
+ fgp = tgp;
+ }
ret = color_content(fgp, &r, &g, &b);
fg.r = r; fg.b = b; fg.g = g;
ret = color_content(bgp, &r, &g, &b);

6
pidgin.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 31 11:21:27 CEST 2007 - sbrabec@suse.cz
- Updated to version 2.0.1:
* Over 100 bugs fixed.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 28 16:08:27 CEST 2007 - sbrabec@suse.cz Mon May 28 16:08:27 CEST 2007 - sbrabec@suse.cz

27
pidgin.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package pidgin (Version 2.0.0) # spec file for package pidgin (Version 2.0.1)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -12,8 +12,8 @@
Name: pidgin Name: pidgin
Summary: GTK+-Based Multiprotocol Instant Messaging Client Summary: GTK+-Based Multiprotocol Instant Messaging Client
Version: 2.0.0 Version: 2.0.1
Release: 7 Release: 1
License: GNU General Public License (GPL) License: GNU General Public License (GPL)
Group: Productivity/Networking/AOLInstantMessenger Group: Productivity/Networking/AOLInstantMessenger
URL: http://www.pidgin.im/ URL: http://www.pidgin.im/
@ -25,7 +25,6 @@ Patch2: pidgin-nonblock-aim.patch
Patch3: pidgin-nonblock-common.patch Patch3: pidgin-nonblock-common.patch
Patch4: pidgin-nonblock-gwim.patch Patch4: pidgin-nonblock-gwim.patch
Patch5: pidgin-nonblock-common2.patch Patch5: pidgin-nonblock-common2.patch
Patch6: pidgin-undefined-operation.patch
Patch7: pidgin-check.patch Patch7: pidgin-check.patch
# Can use external libzephyr # Can use external libzephyr
BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files BuildRequires: cyrus-sasl-devel dbus-1-devel doxygen evolution-data-server-devel gnome-keyring-devel graphviz gtkspell-devel intltool libao-devel libbonobo-devel libgadu-devel libstdc++-devel libxml2-devel meanwhile-devel mono-devel mozilla-nspr-devel mozilla-nss-devel ncurses-devel perl-XML-Parser python sqlite-devel startup-notification-devel tk-devel update-desktop-files
@ -169,7 +168,7 @@ Obsoletes: gaim-unstable-text
%package -n finch-devel %package -n finch-devel
Summary: Headers etc. for finch Stuffs Summary: Headers etc. for finch Stuffs
Group: Productivity/Networking/AOLInstantMessenger Group: Productivity/Networking/AOLInstantMessenger
Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} Requires: finch = %{version} glib2-devel glibc-devel libpurple-devel = %{version} ncurses-devel
Requires: pkg-config Requires: pkg-config
Obsoletes: gaim-unstable-text-devel Obsoletes: gaim-unstable-text-devel
%package gaim-compat %package gaim-compat
@ -755,7 +754,6 @@ Authors:
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6
%patch7 %patch7
# Change Myanmar/Myanmar to Myanmar: # Change Myanmar/Myanmar to Myanmar:
rename my_MM my po/my_MM.* rename my_MM my po/my_MM.*
@ -786,7 +784,7 @@ ACLOCAL="aclocal -I m4macros" autoreconf -f -i
--with-tclconfig=/usr/%_lib\ --with-tclconfig=/usr/%_lib\
--with-tkconfig=/usr/%_lib --with-tkconfig=/usr/%_lib
make make
# Mono bindings 2.0.0 are not parallel build ready: # Mono bindings 2.0.1 are not parallel build ready:
#make %{?jobs:-j%jobs} #make %{?jobs:-j%jobs}
%install %install
@ -846,6 +844,18 @@ rm -rf $RPM_BUILD_ROOT
%preun -f %{name}.schemas_preun %preun -f %{name}.schemas_preun
%post -n libpurple
%run_ldconfig
%postun -n libpurple
%run_ldconfig
%post -n finch
%run_ldconfig
%postun -n finch
%run_ldconfig
%files -f %{name}.lst %files -f %{name}.lst
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README README.MTN doc/the_penguin.txt %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README README.MTN doc/the_penguin.txt
@ -924,6 +934,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gaim-text %{_bindir}/gaim-text
%changelog %changelog
* Thu May 31 2007 - sbrabec@suse.cz
- Updated to version 2.0.1:
* Over 100 bugs fixed.
* Mon May 28 2007 - sbrabec@suse.cz * Mon May 28 2007 - sbrabec@suse.cz
- Fixed devel dependencies. - Fixed devel dependencies.
* Tue May 15 2007 - sbrabec@suse.cz * Tue May 15 2007 - sbrabec@suse.cz