Mailinglist Archive: opensuse-commit (762 mails)
| < Previous | Next > |
commit pidgin for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 27 Aug 2010 14:55:51 +0200
- Message-id: <20100827125551.BC7D3202B1@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package pidgin for openSUSE:Factory
checked in at Fri Aug 27 14:55:51 CEST 2010.
--------
--- GNOME/pidgin/pidgin.changes 2010-03-31 00:04:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/pidgin/pidgin.changes 2010-08-26
00:16:41.000000000 +0200
@@ -1,0 +2,74 @@
+Sun Aug 15 18:49:24 CEST 2010 - dimstar@xxxxxxxxxxxx
+
+- Update to version 2.7.3:
+ + For a complete overview of changes, see NEWS file. Here are
+ some highlights (excluding many bug fixes).
+ + Pidgin:
+ - Re-arrange media window to make it more netbook-friendly.
+ + Finch:
+ - Rebindable 'suggest-next-page' and 'suggest-prev-page'
+ actions for textboxes.
+ - Rebindable 'dropdown' action for comboboxes.
+ + MSN:
+ - Support for web-based buddy icons.
+ + MXit:
+ - Many improvements.
+ + Yahoo/Yahoo JAPAN:
+ - Proxy handling improvements.
+ - Fix file transfers that get stuck with "Waiting for transfer
+ to begin".
+- Changes from version 2.7.2:
+ + Fix crashes, including CVE-2010-2528.
+- Changes from version 2.7.1:
+ + Pidgin:
+ - Restore the tray icon's blinking functionality.
+ + MSN:
+ - Support for direct connections, enabling faster file
+ transfers, smiley and buddy icon loading.
+ + MXit:
+ - Add the standard MXit emoticons.
+ - Increment protocol version to v6.0.
+- Changes from version 2.7.0:
+ + Pidgin:
+ - Add UI for sending attentions (buzz, nudge) on supporting
+ protocols.
+ - Make the search dialog unobtrusive in the conversation
+ window.
+ - The Recent Log Activity sort method for the Buddy List now
+ distinguishes between no activity and a small amount of
+ activity in the distant past.
+ - Add a menu set mood globally for all mood-supporting
+ accounts.
+ - Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in
+ conversation windows.
+ - The 'Message Timestamp Formats' plugin allows changing the
+ timestamp format from the timestamps' context menu in
+ conversation log, and allows forcing 12-hour timestamps.
+ - Show file transfer thumbnails for images on supporting
+ protocols (MSN).
+ + Bonjour: Add support for IPv6.
+ + AIM and ICQ:
+ - X-Status (Custom ICQ status icon) support.
+ - Support sending and receiving HTML-formatted messages for
+ ICQ.
+ + MSN:
+ - Support for version 9 of the MSN protocol has been removed.
+ - Support file transfer thumbnails (previews) for images.
+ - Fix CVE-2010-1624.
+ + Finch:
+ - New action 'history-search', with default binding ctrl+r, to
+ search the entered string in the input history.
+- Drop upstream included patches:
+ + pidgin-directconn-argfix.patch
+ + pidgin-oscar-clientlogin.patch
+ + pidgin-oscar-portability.patch
+ + pidgin-bnc550170-qq-2008only.patch (bnc#569271)
+ + includes.patch (bnc#569271#6)
+- Add pidgin-mono-buildfix.patch: fix build of mono plugin loader.
+- Remove the conditional checks for openSUSE 10.2 and 10.3,
+ simplifying the spec file a lot.
+- Pass --enable-gevolution to configure to actually activate the
+ plugin
+- Split out pidgin-evolution package containing the evo plugin.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
includes.patch
pidgin-2.6.6.tar.bz2
pidgin-bnc550170-qq-2008only.patch
pidgin-directconn-argfix.patch
pidgin-oscar-clientlogin.patch
pidgin-oscar-portability.patch
New:
----
pidgin-2.7.3.tar.bz2
pidgin-mono-buildfix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pidgin.spec ++++++
--- /var/tmp/diff_new_pack.eqpmdP/_old 2010-08-27 14:50:46.000000000 +0200
+++ /var/tmp/diff_new_pack.eqpmdP/_new 2010-08-27 14:50:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package pidgin (Version 2.6.6)
+# spec file for package pidgin (Version 2.7.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,8 +20,8 @@
Name: pidgin
Summary: GTK+-Based Multiprotocol Instant Messaging Client
-Version: 2.6.6
-Release: 2
+Version: 2.7.3
+Release: 1
License: GPLv2+
Group: Productivity/Networking/Instant Messenger
Url: http://www.pidgin.im/
@@ -34,23 +34,17 @@
Patch3: pidgin-nonblock-common.patch
Patch4: pidgin-nonblock-gwim.patch
Patch5: pidgin-nonblock-common2.patch
-Patch9: includes.patch
-# PATCH-FIX-UPSTREAM: pidgin-directconn-argfix.patch
-Patch11: pidgin-directconn-argfix.patch
Patch12: pidgin-dbus-invalid-gpointer.patch
# PATCH-FIX-OPENSUSE pidgin-browser-default.patch bnc472219 sbrabec@xxxxxxx -
Use xdg-open as default browser.
Patch13: pidgin-browser-default.patch
-Patch15: pidgin-bnc550170-qq-2008only.patch
-# PATCH-FIX-UPSTREAM pidgin-oscar-portability.patch dimstar@xxxxxxxxxxxx --
Fix portability issue to x86_64
-Patch16: pidgin-oscar-portability.patch
-# PATCH-FIX-UPSTREAM pidgin-oscar-clientlogin.patch deb#571413 -- Fix
connections to Oscar network.
-Patch17: pidgin-oscar-clientlogin.patch
+# PATCH-FIX-UPSTREAM pidgin-mono-buildfix.patch
http://developer.pidgin.im/ticket/12506 dimstar@xxxxxxxxxxxx -- Fix build with
mono plugin loader; missing include statements.
+Patch14: pidgin-mono-buildfix.patch
# Can use external libzephyr
BuildRequires: cyrus-sasl-devel
BuildRequires: dbus-1-devel
BuildRequires: doxygen
BuildRequires: evolution-data-server-devel
-%if %suse_version > 1110 || 0%{?opensuse_bs_prj_GNOME_Factory}
+%if %suse_version > 1110
BuildRequires: farsight2-devel
%endif
%if %suse_version < 1020
@@ -61,7 +55,7 @@
BuildRequires: gtkspell-devel
BuildRequires: intltool
BuildRequires: libidn-devel
-%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory}
+%if %{suse_version} > 1030
BuildRequires: libgadu-devel
%endif
# There is no way to discriminate openSUSE 11.1 and SLE11. That is why we
recognize openSUSE 11.1 as SLE.
@@ -73,7 +67,7 @@
%endif
# gnome-keyring support summary (bnc#566286):
# SLE10, 11.0, 11.1: patch present and broken (does nothing)
-# SLE11: patch present and active (bnc#569025)
+# SLE11: patch present and active (bnc#569025)
# 11.2: patch was present and active removed by an opdate
# 11.3 and above: patch not applied
# For openSUSE, it's better to avoid this patch:
@@ -116,7 +110,7 @@
%endif
BuildRequires: update-desktop-files
BuildRequires: NetworkManager-devel
-%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory}
+%if %suse_version > 1030
BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%else
@@ -133,7 +127,7 @@
BuildRequires: fdupes
%endif
BuildRequires: libnotify-devel
-%if %suse_version > 1030 || 0%{?opensuse_bs_prj_GNOME_Factory}
+%if %suse_version > 1030
BuildRequires: libavahi-glib-devel
%else
BuildRequires: avahi-devel avahi-glib
@@ -217,6 +211,7 @@
Obsoletes: gaim-devel <= 1.5.0
Provides: gaim-unstable-devel = %{version}
Obsoletes: gaim-unstable-devel < 2.0.0
+
%if %suse_version >= 1030
%package -n libpurple-meanwhile
@@ -226,6 +221,13 @@
Requires: libpurple = %{version}
%endif
+%package evolution
+License: GPLv2+
+Summary: Evolution integration plugin for Pidgin
+Group: Productivity/Networking/Instant Messenger
+Requires: %{name} = %{version}
+Supplements: packageand(%{name}:evolution-data-server)
+
%package -n libpurple-mono
License: GPLv2+
Summary: Mono .NET Plugin Support for Pidgin
@@ -280,6 +282,9 @@
Lotus Sametime plugin for Pidgin using the Meanwhile library.
%endif
+%description evolution
+Evolution integration plugin for Pidgin
+
%description -n libpurple-mono
Mono plugin loader for Pidgin. This package will allow you to write or
use Pidgin plugins written in the .NET programming language.
@@ -315,24 +320,19 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch9 -p1
-%patch11 -p1
%patch12
%patch13
-%patch15 -p0
-%patch16 -p1
-%patch17 -p1
+%patch14 -p1
# Change Myanmar/Myanmar to Myanmar:
rename my_MM my po/my_MM.*
-%{__sed} -i "/^ALL_LINGUAS/s/ my_MM / my /" configure.ac
+%{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac
%build
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC"
export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC"
export FFLAGS="$RPM_OPT_FLAGS -fstack-protector -fPIC"
export LDFLAGS="-pie"
-ACLOCAL="aclocal -I m4macros" autoreconf -f -i
-intltoolize --force
+autoreconf -fi
%configure\
--disable-static\
%if %suse_version < 1120
@@ -346,6 +346,7 @@
%else
--disable-mono\
%endif
+ --enable-gevolution\
--enable-gstreamer\
%if 0%{?building_for_sle_ge_11}
--enable-gnome-keyring\
@@ -354,7 +355,7 @@
--enable-dbus\
--enable-devhelp\
%if %suse_version < 1030
- --disable-meanwhile \
+ --disable-meanwhile\
%endif
--with-tclconfig=%{_libdir}\
--with-tkconfig=%{_libdir}\
@@ -389,7 +390,8 @@
%{__grep} -v /tcl.so | \
%{__grep} -v ".dll$" > %{name}-%{version}-purpleplugins
find $RPM_BUILD_ROOT%{_libdir}/pidgin -maxdepth 1 -xtype f -print | \
- %{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins
+ %{__sed} "s@^$RPM_BUILD_ROOT@@g" | \
+ %{__grep} -v /gevolution.so > %{name}-%{version}-pidginplugins
find $RPM_BUILD_ROOT%{_libdir}/finch -maxdepth 1 -xtype f -print | \
%{__sed} "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins
%find_gconf_schemas
@@ -441,6 +443,10 @@
%{_libdir}/pkgconfig/pidgin.pc
%doc %{_mandir}/man3/Pidgin.*
+%files evolution
+%defattr(-, root, root)
+%{_libdir}/pidgin/gevolution.so
+
%files -n libpurple -f %{name}-%{version}-purpleplugins
%defattr(-, root, root)
%doc libpurple/purple-notifications-example
@@ -454,6 +460,7 @@
%{_libdir}/libpurple-client.so.*
%dir %{_libdir}/purple-2
%{_libdir}/purple-2/perl
+
%if %suse_version > 1030
%files -n libpurple-lang -f %{name}.lang
@@ -486,13 +493,16 @@
%dir %{_datadir}/locale/ur
%dir %{_datadir}/locale/ur/LC_MESSAGES
%endif
+
%if %suse_version >= 1030
%files -n libpurple-meanwhile
%defattr(-, root, root)
%{_libdir}/purple-2/libsametime.*
%endif
+
%ifnarch ppc64
+
%if %suse_version > 1010
%files -n libpurple-mono
++++++ pidgin-2.6.6.tar.bz2 -> pidgin-2.7.3.tar.bz2 ++++++
GNOME/pidgin/pidgin-2.6.6.tar.bz2
/mounts/work_src_done/STABLE/pidgin/pidgin-2.7.3.tar.bz2 differ: byte 11, line 1
++++++ pidgin-mono-buildfix.patch ++++++
Index: pidgin-2.7.3/libpurple/plugins/mono/loader/status-glue.c
===================================================================
--- pidgin-2.7.3.orig/libpurple/plugins/mono/loader/status-glue.c
+++ pidgin-2.7.3/libpurple/plugins/mono/loader/status-glue.c
@@ -1,3 +1,4 @@
+#include <glib.h>
#include "status.h"
#include "mono-helper.h"
#include "mono-glue.h"
++++++ pidgin-nonblock-common.patch ++++++
--- /var/tmp/diff_new_pack.eqpmdP/_old 2010-08-27 14:50:46.000000000 +0200
+++ /var/tmp/diff_new_pack.eqpmdP/_new 2010-08-27 14:50:46.000000000 +0200
@@ -1,17 +1,17 @@
-Index: pidgin-2.2.2/libpurple/plugins/ssl/ssl-gnutls.c
-================================================================================
---- pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c
-+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-gnutls.c
-@@ -303,8 +303,6 @@
- if(gnutls_data->handshake_handler)
- purple_input_remove(gnutls_data->handshake_handler);
+Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c
+===================================================================
+--- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-gnutls.c
++++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-gnutls.c
+@@ -453,8 +453,6 @@ ssl_gnutls_close(PurpleSslConnection *gs
+ if (gnutls_data->handshake_timer)
+ purple_timeout_remove(gnutls_data->handshake_timer);
- gnutls_bye(gnutls_data->session, GNUTLS_SHUT_RDWR);
-
gnutls_deinit(gnutls_data->session);
g_free(gnutls_data);
-@@ -339,6 +337,22 @@
+@@ -489,6 +487,22 @@ ssl_gnutls_read(PurpleSslConnection *gsc
}
static size_t
@@ -34,7 +34,7 @@
ssl_gnutls_write(PurpleSslConnection *gsc, const void *data, size_t len)
{
PurpleSslGnutlsData *gnutls_data = PURPLE_SSL_GNUTLS_DATA(gsc);
-@@ -931,6 +945,23 @@
+@@ -1148,6 +1162,23 @@ static PurpleCertificateScheme x509_gnut
};
@@ -58,7 +58,7 @@
static PurpleSslOps ssl_ops =
{
ssl_gnutls_init,
-@@ -938,7 +969,9 @@
+@@ -1155,7 +1186,9 @@ static PurpleSslOps ssl_ops =
ssl_gnutls_connect,
ssl_gnutls_close,
ssl_gnutls_read,
@@ -68,9 +68,11 @@
ssl_gnutls_get_peer_certificates,
/* padding */
---- pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c
-+++ pidgin-2.5.5/libpurple/plugins/ssl/ssl-nss.c
-@@ -880,6 +880,8 @@
+Index: pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c
+===================================================================
+--- pidgin-2.7.3.orig/libpurple/plugins/ssl/ssl-nss.c
++++ pidgin-2.7.3/libpurple/plugins/ssl/ssl-nss.c
+@@ -958,6 +958,8 @@ static PurpleSslOps ssl_ops =
ssl_nss_connect,
ssl_nss_close,
ssl_nss_read,
@@ -79,8 +81,10 @@
ssl_nss_write,
ssl_nss_peer_certs,
---- pidgin-2.5.5/libpurple/purple-fifo.c
-+++ pidgin-2.5.5/libpurple/purple-fifo.c
+Index: pidgin-2.7.3/libpurple/purple-fifo.c
+===================================================================
+--- /dev/null
++++ pidgin-2.7.3/libpurple/purple-fifo.c
@@ -0,0 +1,232 @@
+/*
+ * @file purple-fifo.c A FIFO byte queue.
@@ -314,8 +318,10 @@
+
+ return TRUE;
+}
---- pidgin-2.5.5/libpurple/purple-fifo.h
-+++ pidgin-2.5.5/libpurple/purple-fifo.h
+Index: pidgin-2.7.3/libpurple/purple-fifo.h
+===================================================================
+--- /dev/null
++++ pidgin-2.7.3/libpurple/purple-fifo.h
@@ -0,0 +1,54 @@
+/**
+ * @file purple-fifo.h A FIFO byte queue.
@@ -371,8 +377,10 @@
+G_END_DECLS
+
+#endif /* _purple_fifo_H_ */
---- pidgin-2.5.5/libpurple/purple-io.c
-+++ pidgin-2.5.5/libpurple/purple-io.c
+Index: pidgin-2.7.3/libpurple/purple-io.c
+===================================================================
+--- /dev/null
++++ pidgin-2.7.3/libpurple/purple-io.c
@@ -0,0 +1,391 @@
+/*
+ * @file purple-io.c Buffering I/O layer.
@@ -765,8 +773,10 @@
+{
+ return purple_fifo_get_used (io->write_fifo);
+}
---- pidgin-2.5.5/libpurple/purple-io.h
-+++ pidgin-2.5.5/libpurple/purple-io.h
+Index: pidgin-2.7.3/libpurple/purple-io.h
+===================================================================
+--- /dev/null
++++ pidgin-2.7.3/libpurple/purple-io.h
@@ -0,0 +1,87 @@
+/**
+ * @file purple-io.h Buffering I/O layer.
@@ -855,9 +865,11 @@
+G_END_DECLS
+
+#endif /* _PURPLE_IO_H_ */
---- pidgin-2.5.5/libpurple/sslconn.c
-+++ pidgin-2.5.5/libpurple/sslconn.c
-@@ -263,6 +263,27 @@
+Index: pidgin-2.7.3/libpurple/sslconn.c
+===================================================================
+--- pidgin-2.7.3.orig/libpurple/sslconn.c
++++ pidgin-2.7.3/libpurple/sslconn.c
+@@ -272,6 +272,27 @@ purple_ssl_read(PurpleSslConnection *gsc
}
size_t
@@ -885,7 +897,7 @@
purple_ssl_write(PurpleSslConnection *gsc, const void *data, size_t len)
{
PurpleSslOps *ops;
-@@ -286,6 +307,27 @@
+@@ -295,6 +316,27 @@ purple_ssl_get_peer_certificates(PurpleS
return (ops->get_peer_certificates)(gsc);
}
@@ -913,9 +925,11 @@
void
purple_ssl_set_ops(PurpleSslOps *ops)
{
---- pidgin-2.5.5/libpurple/sslconn.h
-+++ pidgin-2.5.5/libpurple/sslconn.h
-@@ -34,6 +34,12 @@
+Index: pidgin-2.7.3/libpurple/sslconn.h
+===================================================================
+--- pidgin-2.7.3.orig/libpurple/sslconn.h
++++ pidgin-2.7.3/libpurple/sslconn.h
+@@ -34,6 +34,12 @@ typedef enum
PURPLE_SSL_CERTIFICATE_INVALID = 3
} PurpleSslErrorType;
@@ -928,7 +942,7 @@
#include "certificate.h"
#include "proxy.h"
-@@ -115,6 +121,7 @@
+@@ -115,6 +121,7 @@ typedef struct
* @see purple_ssl_read
*/
size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
@@ -936,7 +950,7 @@
/** Writes data to a connection (like POSIX send())
* @param gsc Connection context
* @param data Data buffer to send data from
-@@ -124,6 +131,7 @@
+@@ -124,6 +131,7 @@ typedef struct
* @see purple_ssl_write
*/
size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
@@ -944,7 +958,7 @@
/** Obtains the certificate chain provided by the peer
*
* @param gsc Connection context
-@@ -256,6 +264,17 @@
+@@ -281,6 +289,17 @@ void purple_ssl_close(PurpleSslConnectio
size_t purple_ssl_read(PurpleSslConnection *gsc, void *buffer, size_t len);
/**
@@ -962,7 +976,7 @@
* Writes data to an SSL connection.
*
* @param gsc The SSL connection handle.
-@@ -278,6 +297,17 @@
+@@ -303,6 +322,17 @@ size_t purple_ssl_write(PurpleSslConnect
*/
GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |