From 0f78806d775c4d46c649425fcb67964d53531db8 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 1 Oct 2011 23:14:36 +0000 Subject: Sat Oct 1 23:14:36 UTC 2011 --- extra/icedtea-web/PKGBUILD | 8 +++++--- extra/pidgin/PKGBUILD | 22 ++++++++++++++-------- .../pidgin-2.10.0-silc-remote-crash-fix.diff | 21 +++++++++++++++++++++ extra/snd/PKGBUILD | 6 +++--- extra/vim/PKGBUILD | 6 +++--- extra/xscreensaver/PKGBUILD | 6 +++--- 6 files changed, 49 insertions(+), 20 deletions(-) create mode 100644 extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff (limited to 'extra') diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 79d50449a..e1777c791 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 136837 2011-09-02 08:00:13Z andyrtr $ +# $Id: PKGBUILD 139127 2011-09-30 05:42:46Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -md5sums=('564e10820887793b86b04ac9979cb6e5') +md5sums=('0e2e653c7436d81edcbc1d4255571ab6') +sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37') + build() { _javaver=6 diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 59c3a4f31..e4dbbdc8d 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135966 2011-08-21 02:57:32Z foutrelis $ +# $Id: PKGBUILD 139167 2011-09-30 16:27:55Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -17,9 +17,11 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch) -md5sums=('e1453c9093c4f32beec19abd14069a3f' - 'a673659d86c7a65aa710f7c8c7feda82') + nm09-more.patch + pidgin-2.10.0-silc-remote-crash-fix.diff) +sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d' + '0676b26f092fac3ee4bbea2261042b3f433c7751' + '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,8 +30,12 @@ build() { # 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$/\02/' */plugins/*.py \ + sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} ./configure \ @@ -48,8 +54,8 @@ build() { package_pidgin(){ pkgdesc="Multi-protocol instant messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'startup-notification' 'gtkspell' - 'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme') + 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' diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff new file mode 100644 index 000000000..de4b126d0 --- /dev/null +++ b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff @@ -0,0 +1,21 @@ +============================================================ +--- 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); + } + } diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index d147e5e76..ef3574080 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136171 2011-08-23 17:11:36Z schiv $ +# $Id: PKGBUILD 139163 2011-09-30 13:55:54Z schiv $ # Maintainer: Ray Rashif # Contributor: Juergen Hoetzel # Contributor: Tom Newsom # Contributor: dorphell pkgname=snd -pkgver=12.4 +pkgver=12.5 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'libxpm' optdepends=('ladspa' 'wavpack' 'flac' 'speex' 'timidity++' 'mpg123' 'vorbis-tools') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('107e5a4fd5df2d1432d0ec51cb31a88b') +md5sums=('53bed2048fe9287f9a0e6a6d63536729') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 4ee6e3427..3976d4666 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137072 2011-09-05 21:46:27Z eric $ +# $Id: PKGBUILD 139129 2011-09-30 05:59:05Z eric $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -6,9 +6,9 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=294 +_patchlevel=322 pkgver=${_topver}.${_patchlevel} -__hgrev=9c96fb7330b5 +__hgrev=5e84f6567623 pkgrel=1 arch=('i686' 'x86_64') license=('custom:vim') diff --git a/extra/xscreensaver/PKGBUILD b/extra/xscreensaver/PKGBUILD index f95504400..09280bc69 100644 --- a/extra/xscreensaver/PKGBUILD +++ b/extra/xscreensaver/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 139121 2011-09-30 02:29:24Z eric $ +# $Id: PKGBUILD 139172 2011-09-30 22:43:18Z eric $ # Maintainer: Eric Bélanger pkgname=xscreensaver pkgver=5.15 -pkgrel=1 +pkgrel=2 pkgdesc="Screen saver and locker for the X Window System" arch=('i686' 'x86_64') url="http://www.jwz.org/xscreensaver/" license=('BSD') -depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu') +depends=('libxxf86vm' 'libglade' 'mesa' 'pam' 'xorg-appres' 'libxmu' 'perl-libwww') makedepends=('bc') backup=('etc/pam.d/xscreensaver') source=(http://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz \ -- cgit v1.2.3-54-g00ecf