Date: Sunday, October 30, 2011 @ 12:50:29
Author: foutrelis
Revision: 141475
upgpkg: pidgin 2.10.0-3
Remove SILC support.
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/pidgin-2.10.0-silc-remote-crash-fix.diff
------------------------------------------+
PKGBUILD | 18 ++++++------------
pidgin-2.10.0-silc-remote-crash-fix.diff | 21 ---------------------
2 files changed, 6 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-10-30 15:39:03 UTC (rev 141474)
+++ PKGBUILD 2011-10-30 16:50:29 UTC (rev 141475)
@@ -7,21 +7,19 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.0
-pkgrel=2
+pkgrel=3
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'
+ '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
- pidgin-2.10.0-silc-remote-crash-fix.diff)
-sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d'
- '0676b26f092fac3ee4bbea2261042b3f433c7751'
- '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6')
+ nm09-more.patch)
+sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd'
+ '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -30,10 +28,6 @@
# 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}
@@ -80,7 +74,7 @@
package_libpurple(){
pkgdesc="IM library extracted from Pidgin"
- depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss')
+ depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss')
optdepends=('avahi: Bonjour protocol support'
'dbus-python: for purple-remote and purple-url-handler')
Deleted: pidgin-2.10.0-silc-remote-crash-fix.diff
===================================================================
--- pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30 15:39:03 UTC (rev
141474)
+++ pidgin-2.10.0-silc-remote-crash-fix.diff 2011-10-30 16:50:29 UTC (rev
141475)
@@ -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);
- }
- }
