Date: Tuesday, June 7, 2011 @ 11:43:55 Author: foutrelis Revision: 126832
upgpkg: pidgin 2.8.0-1 New upstream release. Modified: pidgin/trunk/PKGBUILD Deleted: pidgin/trunk/nm09-pidgin.patch -------------------+ PKGBUILD | 12 ++++-------- nm09-pidgin.patch | 38 -------------------------------------- 2 files changed, 4 insertions(+), 46 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-07 15:30:55 UTC (rev 126831) +++ PKGBUILD 2011-06-07 15:43:55 UTC (rev 126832) @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.7.11 -pkgrel=6 +pkgver=2.8.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,19 +17,15 @@ 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-pidgin.patch nm09-more.patch) -md5sums=('07c2a2535b4d7436b5ec7685fe063fec' - '744a21b4dbaf949dba7cd3b75b12b4fe' +md5sums=('d1656c443a5d91f4aa0d95915f1f50c3' 'a673659d86c7a65aa710f7c8c7feda82') build() { cd "$srcdir/$pkgname-$pkgver" - # Update for NetworkManager 0.9 connection states - # (http://developer.pidgin.im/ticket/13505) + # Further fixes for NetworkManager 0.9 # (http://developer.pidgin.im/ticket/13859) - patch -Np1 -i "$srcdir/nm09-pidgin.patch" patch -Np1 -i "$srcdir/nm09-more.patch" # Use Python 2 Deleted: nm09-pidgin.patch =================================================================== --- nm09-pidgin.patch 2011-06-07 15:30:55 UTC (rev 126831) +++ nm09-pidgin.patch 2011-06-07 15:43:55 UTC (rev 126832) @@ -1,38 +0,0 @@ -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)