diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-22 11:18:09 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-07-22 11:18:09 +0000 |
| commit | f0baedcb992ac0bee96e7209e63c02112a8619b4 (patch) | |
| tree | e559c7aa958c941af97aa0c8cccd3b6a6d040a50 | |
| parent | b7eedc48c89bb8449418cd848560f49dd01e5f59 (diff) | |
| download | aports-f0baedcb992ac0bee96e7209e63c02112a8619b4.tar.bz2 aports-f0baedcb992ac0bee96e7209e63c02112a8619b4.tar.xz | |
main/pidgin: upgrade to 2.7.2
| -rw-r--r-- | main/pidgin/APKBUILD | 8 | ||||
| -rw-r--r-- | main/pidgin/icq_fix.patch | 19 |
2 files changed, 3 insertions, 24 deletions
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD index bccd793c12..4077e8d59b 100644 --- a/main/pidgin/APKBUILD +++ b/main/pidgin/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=pidgin -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=0 pkgdesc="graphical multi-protocol instant messaging client for X" url="http://pidgin.im/" @@ -11,12 +11,11 @@ makedepends="gtk+-dev intltool libsm-dev startup-notification-dev gtkspell-dev cyrus-sasl-dev ncurses-dev nss-dev" subpackages="$pkgname-dev $pkgname-doc finch libpurple" source="http://downloads.sourceforge.net/pidgin/$pkgver/pidgin-$pkgver.tar.bz2 - icq_fix.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - patch -p0 -i "$srcdir"/icq_fix.patch || return 1 } build() { @@ -60,5 +59,4 @@ libpurple() { mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \ "$subpkgdir"/usr/share/ } -md5sums="0dd2adb9e8214ac960f956823c84e7e2 pidgin-2.7.1.tar.bz2 -2ce887cf36e698282b9241832850defd icq_fix.patch" +md5sums="c23d85bb6a197dd841d1b5585148327d pidgin-2.7.2.tar.bz2" diff --git a/main/pidgin/icq_fix.patch b/main/pidgin/icq_fix.patch deleted file mode 100644 index 8bb87ef860..0000000000 --- a/main/pidgin/icq_fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -# -# -# patch "libpurple/protocols/oscar/oscar.c" -# from [b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702] -# to [6b8b45623896204448ac4b212a0c631655822ad1] -# -============================================================ ---- libpurple/protocols/oscar/oscar.c b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702 -+++ libpurple/protocols/oscar/oscar.c 6b8b45623896204448ac4b212a0c631655822ad1 -@@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, cons - tmp2 = purple_markup_strip_html(tmp1); - is_html = FALSE; - } else { -- tmp2 = g_strdup(tmp1); -+ /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ -+ tmp2 = g_strdup_printf("<HTML><BODY>%s</BODY></HTML>", tmp1); - is_html = TRUE; - } - g_free(tmp1); |