Hello community, here is the log from the commit of package pidgin for openSUSE:Factory checked in at Mon May 2 16:21:25 CEST 2011.
-------- --- GNOME/pidgin/pidgin.changes 2011-04-04 15:19:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/pidgin/pidgin.changes 2011-04-25 22:00:12.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 22 10:24:15 UTC 2011 - [email protected] + +- Add pidgin-nm09.patch: fix compatibility with NM 0.9. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pidgin-nm09.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pidgin.spec ++++++ --- /var/tmp/diff_new_pack.MrmJ9W/_old 2011-05-02 16:20:36.000000000 +0200 +++ /var/tmp/diff_new_pack.MrmJ9W/_new 2011-05-02 16:20:36.000000000 +0200 @@ -26,7 +26,7 @@ Name: pidgin Summary: GTK+-Based Multiprotocol Instant Messaging Client Version: 2.7.11 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Instant Messenger Url: http://www.pidgin.im/ @@ -41,6 +41,8 @@ Patch14: pidgin-mono-buildfix.patch # PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch [email protected] -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build Patch15: pidgin-fix-perl-build.patch +# PATCH-FIX-UPSTREAM pidgin-nm09.patch [email protected] -- Fix compatibility with NM 0.9 (upstream ticket 13505) +Patch16: pidgin-nm09.patch # Can use external libzephyr BuildRequires: cyrus-sasl-devel BuildRequires: dbus-1-devel @@ -328,6 +330,7 @@ %patch5 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 # Change Myanmar/Myanmar to Myanmar: rename my_MM my po/my_MM.* %{__sed} -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac ++++++ pidgin-nm09.patch ++++++ diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c --- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 +++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 @@ -71,6 +71,10 @@ #include <dbus/dbus-glib.h> #include <NetworkManager.h> +#if !defined(NM_CHECK_VERSION) +#define NM_CHECK_VERSION(x,y,z) 0 +#endif + static DBusGConnection *nm_conn = NULL; static DBusGProxy *nm_proxy = NULL; static DBusGProxy *dbus_proxy = NULL; @@ -863,7 +867,13 @@ nm_update_state(NMState state) switch(state) { +#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 /* Call res_init in case DNS servers have changed */ res_init(); /* update STUN IP in case we it changed (theoretically we could @@ -880,6 +890,9 @@ nm_update_state(NMState state) case NM_STATE_ASLEEP: case NM_STATE_CONNECTING: case NM_STATE_DISCONNECTED: +#if NM_CHECK_VERSION(0,8,992) + case NM_STATE_DISCONNECTING: +#endif if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) break; if (ui_ops != NULL && ui_ops->network_disconnected != NULL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
