pool/pidgin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 109368 from GNOME:Apps

Browse Source 
Update to 2.10.2 (forwarded request 109270 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/109368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=85
This commit is contained in:
Stephan Kulow 2012-03-16 12:20:50 +00:00 committed by Git OBS Bridge
parent 3dc4daa13c
commit c0213d79cc
6 changed files with 42 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pidgin-2.10.1.tar.bz2
View File

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

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

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

13
pidgin-glib-2.31.patch
View File

@ -1,13 +0,0 @@
Index: pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
===================================================================
--- pidgin-2.10.0.orig/libpurple/protocols/mxit/formcmds.c
+++ pidgin-2.10.0/libpurple/protocols/mxit/formcmds.c
@@ -25,7 +25,7 @@
#include "internal.h"
-#include <glib/gprintf.h>
+#include <glib.h>
#include "purple.h"

49
pidgin-nm09-more.patch
View File

@ -1,49 +0,0 @@
diff -up pidgin-2.7.11/libpurple/network.c.nm09more pidgin-2.7.11/libpurple/network.c
--- pidgin-2.7.11/libpurple/network.c.nm09more 2011-04-26 12:01:27.700085246 -0500
+++ pidgin-2.7.11/libpurple/network.c 2011-05-24 13:13:28.185165657 -0500
@@ -833,8 +833,20 @@ purple_network_is_available(void)
purple_debug_warning("network", "NetworkManager not active. Assuming connection exists.\n");
}
- if (nm_state == NM_STATE_UNKNOWN || nm_state == NM_STATE_CONNECTED)
- return TRUE;
+ switch (nm_state)
+ {
+ case NM_STATE_UNKNOWN:
+#if NM_CHECK_VERSION(0,8,992)
+ case NM_STATE_CONNECTED_LOCAL:
+ case NM_STATE_CONNECTED_SITE:
+ case NM_STATE_CONNECTED_GLOBAL:
+#else
+ case NM_STATE_CONNECTED:
+#endif
+ return TRUE;
+ default:
+ break;
+ }
return FALSE;
@@ -1170,9 +1182,14 @@ purple_network_init(void)
NM_DBUS_SERVICE,
NM_DBUS_PATH,
NM_DBUS_INTERFACE);
+ /* NM 0.6 signal */
dbus_g_proxy_add_signal(nm_proxy, "StateChange", G_TYPE_UINT, G_TYPE_INVALID);
dbus_g_proxy_connect_signal(nm_proxy, "StateChange",
G_CALLBACK(nm_state_change_cb), NULL, NULL);
+ /* NM 0.7 and later signal */
+ dbus_g_proxy_add_signal(nm_proxy, "StateChanged", G_TYPE_UINT, G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal(nm_proxy, "StateChanged",
+ G_CALLBACK(nm_state_change_cb), NULL, NULL);
dbus_proxy = dbus_g_proxy_new_for_name(nm_conn,
DBUS_SERVICE_DBUS,
@@ -1207,6 +1224,7 @@ purple_network_uninit(void)
#ifdef HAVE_NETWORKMANAGER
if (nm_proxy) {
dbus_g_proxy_disconnect_signal(nm_proxy, "StateChange", G_CALLBACK(nm_state_change_cb), NULL);
+ dbus_g_proxy_disconnect_signal(nm_proxy, "StateChanged", G_CALLBACK(nm_state_change_cb), NULL);
g_object_unref(G_OBJECT(nm_proxy));
}
if (dbus_proxy) {

36
pidgin.changes
View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Wed Mar 14 11:12:34 UTC 2012 - vuntz@opensuse.org
- Update to version 2.10.2:
+ General:
- Fix compilation when using binutils 2.22 and new GDK pixbuf.
- Fix compilation of the MXit protocol plugin with GLib 2.31.
+ Pidgin:
- Add support for the GNOME3 Network dialog.
- Fix rare crash.
- Add support for the GNOME3 Default Application dialog for
configuring the Browser.
+ libpurple:
- Support new connection states and signals for NetworkManager
0.9+.
+ AIM and ICQ:
- Fix a possible crash when receiving an unexpected message
from the server.
- Allow signing on with usernames containing periods and
underscores.
- Allow adding buddies containing periods and underscores.
- Don't try to format ICQ usernames entered as email addresses.
This gets rid of an "Unable to format username" error at
login.
+ MSN:
- Fix possible crashes caused by not validating incoming
messages as UTF-8.
- Support new protocol version MSNP18.
- Fix messages to offline contacts.
+ Plugins:
- The autoaccept plugin will no longer reset the preference for
unknown buddies to "Auto Reject" in certain cases.
+ Windows-Specific Changes.
- Drop pidgin-nm09-more.patch: fixed upstream.
- Drop pidgin-glib-2.31.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 21 10:52:59 UTC 2012 - vuntz@opensuse.org Tue Feb 21 10:52:59 UTC 2012 - vuntz@opensuse.org

12
pidgin.spec
View File

@ -26,10 +26,10 @@ Name: pidgin
Summary: Multiprotocol Instant Messaging Client Summary: Multiprotocol Instant Messaging Client
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Instant Messenger Group: Productivity/Networking/Instant Messenger
Version: 2.10.1 Version: 2.10.2
Release: 0 Release: 0
Url: http://www.pidgin.im/ Url: http://www.pidgin.im/
Source: http://downloads.sourceforge.net/pidgin/%{name}-%{version}.tar.bz2 Source: http://downloads.sourceforge.net/project/pidgin/Pidgin/2.10.2/%{name}-%{version}.tar.bz2
Source1: pidgin-NLD-smiley-theme.tar.bz2 Source1: pidgin-NLD-smiley-theme.tar.bz2
Source2: pidgin-Tango-smiley-theme.tar.bz2 Source2: pidgin-Tango-smiley-theme.tar.bz2
Source3: pidgin-prefs.xml Source3: pidgin-prefs.xml
@ -42,10 +42,6 @@ Patch5: pidgin-nonblock-common2.patch
Patch14: pidgin-mono-buildfix.patch Patch14: pidgin-mono-buildfix.patch
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build
Patch15: pidgin-fix-perl-build.patch Patch15: pidgin-fix-perl-build.patch
# PATCH-FIX-UPSTREAM pidgin-nm09-more.patch vuntz@opensuse.org -- Fix to use new NM signal name http://developer.pidgin.im/ticket/13859
Patch16: pidgin-nm09-more.patch
# PATCH-FIX-UPSTREAM pidgin-glib-2.31.patch http://developer.pidgin.im/ticket/14773 dimstar@opensuse.org -- Fix build with glib 2.31.
Patch17: pidgin-glib-2.31.patch
# PATCH-FIX-UPSTREAM pidgin-port-to-farstream.patch http://developer.pidgin.im/ticket/14936 vuntz@opensuse.org -- Port to farstream # PATCH-FIX-UPSTREAM pidgin-port-to-farstream.patch http://developer.pidgin.im/ticket/14936 vuntz@opensuse.org -- Port to farstream
Patch18: pidgin-port-to-farstream.patch Patch18: pidgin-port-to-farstream.patch
# Can use external libzephyr # Can use external libzephyr
@ -287,8 +283,8 @@ Provides: libpurple-branding = %{version}
Conflicts: otherproviders(libpurple-branding) Conflicts: otherproviders(libpurple-branding)
Supplements: packageand(libpurple:branding-upstream) Supplements: packageand(libpurple:branding-upstream)
# It also provides pidgin branding # It also provides pidgin branding
Provides: pidgin-branding-upstream = %{version}
Provides: pidgin-branding = %{version} Provides: pidgin-branding = %{version}
Provides: pidgin-branding-upstream = %{version}
Conflicts: otherproviders(pidgin-branding) Conflicts: otherproviders(pidgin-branding)
Supplements: packageand(pidgin:branding-upstream) Supplements: packageand(pidgin:branding-upstream)
BuildArch: noarch BuildArch: noarch
@ -379,8 +375,6 @@ translation-update-upstream
%patch5 -p1 %patch5 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1
%patch17 -p1
%if %suse_version > 1210 %if %suse_version > 1210
%patch18 -p0 %patch18 -p0
%endif %endif