Date: Sunday, October 30, 2011 @ 12:50:53
Author: foutrelis
Revision: 141476
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
pidgin/repos/extra-i686/PKGBUILD
(from rev 141475, pidgin/trunk/PKGBUILD)
pidgin/repos/extra-i686/nm09-more.patch
(from rev 141475, pidgin/trunk/nm09-more.patch)
pidgin/repos/extra-i686/pidgin.install
(from rev 141475, pidgin/trunk/pidgin.install)
pidgin/repos/extra-x86_64/PKGBUILD
(from rev 141475, pidgin/trunk/PKGBUILD)
pidgin/repos/extra-x86_64/nm09-more.patch
(from rev 141475, pidgin/trunk/nm09-more.patch)
pidgin/repos/extra-x86_64/pidgin.install
(from rev 141475, pidgin/trunk/pidgin.install)
Deleted:
pidgin/repos/extra-i686/PKGBUILD
pidgin/repos/extra-i686/nm09-more.patch
pidgin/repos/extra-i686/pidgin-2.10.0-silc-remote-crash-fix.diff
pidgin/repos/extra-i686/pidgin.install
pidgin/repos/extra-x86_64/PKGBUILD
pidgin/repos/extra-x86_64/nm09-more.patch
pidgin/repos/extra-x86_64/pidgin-2.10.0-silc-remote-crash-fix.diff
pidgin/repos/extra-x86_64/pidgin.install
-------------------------------------------------------+
extra-i686/PKGBUILD | 224 +++++++---------
extra-i686/nm09-more.patch | 98 +++----
extra-i686/pidgin-2.10.0-silc-remote-crash-fix.diff | 21 -
extra-i686/pidgin.install | 22 -
extra-x86_64/PKGBUILD | 224 +++++++---------
extra-x86_64/nm09-more.patch | 98 +++----
extra-x86_64/pidgin-2.10.0-silc-remote-crash-fix.diff | 21 -
extra-x86_64/pidgin.install | 22 -
8 files changed, 338 insertions(+), 392 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-i686/PKGBUILD 2011-10-30 16:50:53 UTC (rev 141476)
@@ -1,115 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
-# Contributor: Ionut Biru <ib...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/";
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
- 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
- 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
- 'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
- nm09-more.patch
- pidgin-2.10.0-silc-remote-crash-fix.diff)
-sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
- '0676b26f092fac3ee4bbea2261042b3f433c7751'
- '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Further fixes for NetworkManager 0.9
- # http://developer.pidgin.im/ticket/13859
- patch -Np1 -i "$srcdir/nm09-more.patch"
-
- # Fix remote crash in SILC plugin
- # http://developer.pidgin.im/ticket/14636
- patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
-
- # Use Python 2
- sed -i 's/env python$/&2/' */plugins/*.py \
- libpurple/purple-{remote,notifications-example,url-handler}
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-schemas-install \
- --disable-meanwhile \
- --disable-gnutls \
- --enable-cyrus-sasl \
- --disable-doxygen \
- --enable-nm \
- --with-python=/usr/bin/python2 \
- --with-system-ssl-certs=/etc/ssl/certs
- make
-}
-
-package_pidgin(){
- pkgdesc="Multi-protocol instant messaging client"
- depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
- 'gstreamer0.10' 'hicolor-icon-theme')
- optdepends=('aspell: for spelling correction'
- 'ca-certificates: SSL CA certificates'
- 'gstreamer0.10-good-plugins: video and voice support'
- 'tk: Tcl/Tk scripting support')
- install=pidgin.install
-
- cd "$srcdir/pidgin-$pkgver"
-
- # For linking
- make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
- make -C pidgin DESTDIR="$pkgdir" install
- make -C doc DESTDIR="$pkgdir" install
-
- # Remove files that are packaged in libpurle
- make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
- install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
- rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
- pkgdesc="IM library extracted from Pidgin"
- depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
- optdepends=('avahi: Bonjour protocol support'
- 'dbus-python: for purple-remote and purple-url-handler')
-
- cd "$srcdir/pidgin-$pkgver"
-
- for _dir in libpurple share/sounds share/ca-certs m4macros po; do
- make -C "$_dir" DESTDIR="$pkgdir" install
- done
-}
-
-package_finch(){
- pkgdesc="A ncurses-based messaging client"
- depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
- optdepends=('avahi: Bonjour protocol support'
- 'ca-certificates: SSL CA certificates'
- 'tk: Tcl/Tk scripting support')
-
- cd "$srcdir/pidgin-$pkgver"
-
- # For linking
- make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
- make -C finch DESTDIR="$pkgdir" install
- make -C doc DESTDIR="$pkgdir" install
-
- # Remove files that are packaged in libpurle
- make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
- rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pidgin/repos/extra-i686/PKGBUILD (from rev 141475,
pidgin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,109 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl>
+
+pkgname=('pidgin' 'libpurple' 'finch')
+pkgver=2.10.0
+pkgrel=3
+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'
+ 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
+ 'networkmanager')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+ nm09-more.patch)
+sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd'
+ '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Further fixes for NetworkManager 0.9
+ # http://developer.pidgin.im/ticket/13859
+ patch -Np1 -i "$srcdir/nm09-more.patch"
+
+ # Use Python 2
+ sed -i 's/env python$/&2/' */plugins/*.py \
+ libpurple/purple-{remote,notifications-example,url-handler}
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-schemas-install \
+ --disable-meanwhile \
+ --disable-gnutls \
+ --enable-cyrus-sasl \
+ --disable-doxygen \
+ --enable-nm \
+ --with-python=/usr/bin/python2 \
+ --with-system-ssl-certs=/etc/ssl/certs
+ make
+}
+
+package_pidgin(){
+ pkgdesc="Multi-protocol instant messaging client"
+ depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+ 'gstreamer0.10' 'hicolor-icon-theme')
+ optdepends=('aspell: for spelling correction'
+ 'ca-certificates: SSL CA certificates'
+ 'gstreamer0.10-good-plugins: video and voice support'
+ 'tk: Tcl/Tk scripting support')
+ install=pidgin.install
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C pidgin DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+ rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple(){
+ pkgdesc="IM library extracted from Pidgin"
+ depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+ optdepends=('avahi: Bonjour protocol support'
+ 'dbus-python: for purple-remote and purple-url-handler')
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+ make -C "$_dir" DESTDIR="$pkgdir" install
+ done
+}
+
+package_finch(){
+ pkgdesc="A ncurses-based messaging client"
+ depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
+ optdepends=('avahi: Bonjour protocol support'
+ 'ca-certificates: SSL CA certificates'
+ 'tk: Tcl/Tk scripting support')
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C finch DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/nm09-more.patch
===================================================================
--- extra-i686/nm09-more.patch 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-i686/nm09-more.patch 2011-10-30 16:50:53 UTC (rev 141476)
@@ -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) {
Copied: pidgin/repos/extra-i686/nm09-more.patch (from rev 141475,
pidgin/trunk/nm09-more.patch)
===================================================================
--- extra-i686/nm09-more.patch (rev 0)
+++ extra-i686/nm09-more.patch 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,49 @@
+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) {
Deleted: extra-i686/pidgin-2.10.0-silc-remote-crash-fix.diff
===================================================================
--- extra-i686/pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30 16:50:29 UTC
(rev 141475)
+++ extra-i686/pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30 16:50:53 UTC
(rev 141476)
@@ -1,21 +0,0 @@
-============================================================
---- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
-+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
-@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
- }
-
- if (flags & SILC_MESSAGE_FLAG_UTF8) {
-- tmp = g_markup_escape_text((const char *)message, -1);
-+ const char *msg = (const char *)message;
-+ char *salvaged = NULL;
-+ if (!g_utf8_validate((const char *)message, -1, NULL)) {
-+ salvaged = purple_utf8_salvage((const char *)message);
-+ msg = salvaged;
-+ }
-+ tmp = g_markup_escape_text(msg, -1);
- /* Send to Purple */
- serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
-+ g_free(salvaged);
- g_free(tmp);
- }
- }
Deleted: extra-i686/pidgin.install
===================================================================
--- extra-i686/pidgin.install 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-i686/pidgin.install 2011-10-30 16:50:53 UTC (rev 141476)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: pidgin/repos/extra-i686/pidgin.install (from rev 141475,
pidgin/trunk/pidgin.install)
===================================================================
--- extra-i686/pidgin.install (rev 0)
+++ extra-i686/pidgin.install 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-x86_64/PKGBUILD 2011-10-30 16:50:53 UTC (rev 141476)
@@ -1,115 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
-# Contributor: Ionut Biru <ib...@archlinux.org>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/";
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
- 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
- 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
- 'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
- nm09-more.patch
- pidgin-2.10.0-silc-remote-crash-fix.diff)
-sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
- '0676b26f092fac3ee4bbea2261042b3f433c7751'
- '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Further fixes for NetworkManager 0.9
- # http://developer.pidgin.im/ticket/13859
- patch -Np1 -i "$srcdir/nm09-more.patch"
-
- # Fix remote crash in SILC plugin
- # http://developer.pidgin.im/ticket/14636
- patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff"
-
- # Use Python 2
- sed -i 's/env python$/&2/' */plugins/*.py \
- libpurple/purple-{remote,notifications-example,url-handler}
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --disable-schemas-install \
- --disable-meanwhile \
- --disable-gnutls \
- --enable-cyrus-sasl \
- --disable-doxygen \
- --enable-nm \
- --with-python=/usr/bin/python2 \
- --with-system-ssl-certs=/etc/ssl/certs
- make
-}
-
-package_pidgin(){
- pkgdesc="Multi-protocol instant messaging client"
- depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
- 'gstreamer0.10' 'hicolor-icon-theme')
- optdepends=('aspell: for spelling correction'
- 'ca-certificates: SSL CA certificates'
- 'gstreamer0.10-good-plugins: video and voice support'
- 'tk: Tcl/Tk scripting support')
- install=pidgin.install
-
- cd "$srcdir/pidgin-$pkgver"
-
- # For linking
- make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
- make -C pidgin DESTDIR="$pkgdir" install
- make -C doc DESTDIR="$pkgdir" install
-
- # Remove files that are packaged in libpurle
- make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
- install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
- rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
- pkgdesc="IM library extracted from Pidgin"
- depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
- optdepends=('avahi: Bonjour protocol support'
- 'dbus-python: for purple-remote and purple-url-handler')
-
- cd "$srcdir/pidgin-$pkgver"
-
- for _dir in libpurple share/sounds share/ca-certs m4macros po; do
- make -C "$_dir" DESTDIR="$pkgdir" install
- done
-}
-
-package_finch(){
- pkgdesc="A ncurses-based messaging client"
- depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
- optdepends=('avahi: Bonjour protocol support'
- 'ca-certificates: SSL CA certificates'
- 'tk: Tcl/Tk scripting support')
-
- cd "$srcdir/pidgin-$pkgver"
-
- # For linking
- make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
- make -C finch DESTDIR="$pkgdir" install
- make -C doc DESTDIR="$pkgdir" install
-
- # Remove files that are packaged in libpurle
- make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
- rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pidgin/repos/extra-x86_64/PKGBUILD (from rev 141475,
pidgin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,109 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evange...@foutrelis.com>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl>
+
+pkgname=('pidgin' 'libpurple' 'finch')
+pkgver=2.10.0
+pkgrel=3
+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'
+ 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
+ 'networkmanager')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
+ nm09-more.patch)
+sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd'
+ '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Further fixes for NetworkManager 0.9
+ # http://developer.pidgin.im/ticket/13859
+ patch -Np1 -i "$srcdir/nm09-more.patch"
+
+ # Use Python 2
+ sed -i 's/env python$/&2/' */plugins/*.py \
+ libpurple/purple-{remote,notifications-example,url-handler}
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-schemas-install \
+ --disable-meanwhile \
+ --disable-gnutls \
+ --enable-cyrus-sasl \
+ --disable-doxygen \
+ --enable-nm \
+ --with-python=/usr/bin/python2 \
+ --with-system-ssl-certs=/etc/ssl/certs
+ make
+}
+
+package_pidgin(){
+ pkgdesc="Multi-protocol instant messaging client"
+ depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+ 'gstreamer0.10' 'hicolor-icon-theme')
+ optdepends=('aspell: for spelling correction'
+ 'ca-certificates: SSL CA certificates'
+ 'gstreamer0.10-good-plugins: video and voice support'
+ 'tk: Tcl/Tk scripting support')
+ install=pidgin.install
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C pidgin DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+ rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple(){
+ pkgdesc="IM library extracted from Pidgin"
+ depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+ optdepends=('avahi: Bonjour protocol support'
+ 'dbus-python: for purple-remote and purple-url-handler')
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+ make -C "$_dir" DESTDIR="$pkgdir" install
+ done
+}
+
+package_finch(){
+ pkgdesc="A ncurses-based messaging client"
+ depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
+ optdepends=('avahi: Bonjour protocol support'
+ 'ca-certificates: SSL CA certificates'
+ 'tk: Tcl/Tk scripting support')
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C finch DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/nm09-more.patch
===================================================================
--- extra-x86_64/nm09-more.patch 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-x86_64/nm09-more.patch 2011-10-30 16:50:53 UTC (rev 141476)
@@ -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) {
Copied: pidgin/repos/extra-x86_64/nm09-more.patch (from rev 141475,
pidgin/trunk/nm09-more.patch)
===================================================================
--- extra-x86_64/nm09-more.patch (rev 0)
+++ extra-x86_64/nm09-more.patch 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,49 @@
+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) {
Deleted: extra-x86_64/pidgin-2.10.0-silc-remote-crash-fix.diff
===================================================================
--- extra-x86_64/pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30
16:50:29 UTC (rev 141475)
+++ extra-x86_64/pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30
16:50:53 UTC (rev 141476)
@@ -1,21 +0,0 @@
-============================================================
---- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78
-+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839
-@@ -408,9 +408,16 @@ silc_private_message(SilcClient client,
- }
-
- if (flags & SILC_MESSAGE_FLAG_UTF8) {
-- tmp = g_markup_escape_text((const char *)message, -1);
-+ const char *msg = (const char *)message;
-+ char *salvaged = NULL;
-+ if (!g_utf8_validate((const char *)message, -1, NULL)) {
-+ salvaged = purple_utf8_salvage((const char *)message);
-+ msg = salvaged;
-+ }
-+ tmp = g_markup_escape_text(msg, -1);
- /* Send to Purple */
- serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
-+ g_free(salvaged);
- g_free(tmp);
- }
- }
Deleted: extra-x86_64/pidgin.install
===================================================================
--- extra-x86_64/pidgin.install 2011-10-30 16:50:29 UTC (rev 141475)
+++ extra-x86_64/pidgin.install 2011-10-30 16:50:53 UTC (rev 141476)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: pidgin/repos/extra-x86_64/pidgin.install (from rev 141475,
pidgin/trunk/pidgin.install)
===================================================================
--- extra-x86_64/pidgin.install (rev 0)
+++ extra-x86_64/pidgin.install 2011-10-30 16:50:53 UTC (rev 141476)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
