Date: Wednesday, March 14, 2012 @ 08:01:37 Author: foutrelis Revision: 153443
upgpkg: pidgin 2.10.2-1 New upstream release. Modified: pidgin/trunk/PKGBUILD Deleted: pidgin/trunk/nm09-more.patch -----------------+ PKGBUILD | 23 +++++++---------------- nm09-more.patch | 49 ------------------------------------------------- 2 files changed, 7 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-14 06:47:26 UTC (rev 153442) +++ PKGBUILD 2012-03-14 12:01:37 UTC (rev 153443) @@ -6,44 +6,35 @@ # Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.1 -pkgrel=3 +pkgver=2.10.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch port-to-farstream-v2.patch) -sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8' - '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e' +sha256sums=('e5cdd29056d36677cb81225c3b36b1bcde64605e201492f6e2fdf27ff24d32b8' '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482') build() { cd "$srcdir/$pkgname-$pkgver" - # Further fixes for NetworkManager 0.9 - # http://developer.pidgin.im/ticket/13859 - patch -Np1 -i "$srcdir/nm09-more.patch" - # Apply patch for farsight -> farstream transition # http://developer.pidgin.im/ticket/14936 - patch -Np1 -i "$srcdir/port-to-farstream-v2.patch" + #patch -Np1 -i "$srcdir/port-to-farstream-v2.patch" # The farstream patch changes configure.ac - autoreconf -vi + #autoreconf -vi # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} - # Pidgin doesn't explicitly link to libm - LDFLAGS+=' -Wl,--copy-dt-needed-entries' - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -86,7 +77,7 @@ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') + depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') Deleted: nm09-more.patch =================================================================== --- nm09-more.patch 2012-03-14 06:47:26 UTC (rev 153442) +++ nm09-more.patch 2012-03-14 12:01:37 UTC (rev 153443) @@ -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) {