summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/pidgin/APKBUILD12
-rw-r--r--main/pidgin/icq_fix.patch19
-rw-r--r--main/pidgin/msn_fix.patch28
3 files changed, 25 insertions, 34 deletions
diff --git a/main/pidgin/APKBUILD b/main/pidgin/APKBUILD
index bff483fc0..bccd793c1 100644
--- a/main/pidgin/APKBUILD
+++ b/main/pidgin/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=pidgin
-pkgver=2.7.0
-pkgrel=1
+pkgver=2.7.1
+pkgrel=0
pkgdesc="graphical multi-protocol instant messaging client for X"
url="http://pidgin.im/"
license="GPL"
@@ -11,12 +11,12 @@ 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
- msn_fix.patch"
+ icq_fix.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- patch -Np0 -i ""$srcdir"/msn_fix.patch" || return 1
+ patch -p0 -i "$srcdir"/icq_fix.patch || return 1
}
build() {
@@ -60,5 +60,5 @@ libpurple() {
mv "$pkgdir"/usr/share/purple "$pkgdir"/usr/share/sounds \
"$subpkgdir"/usr/share/
}
-md5sums="63a36f91d29f5ac5a402ffd2d7dbbb72 pidgin-2.7.0.tar.bz2
-bbf9d6f6fc19342af7e059dc13432d27 msn_fix.patch"
+md5sums="0dd2adb9e8214ac960f956823c84e7e2 pidgin-2.7.1.tar.bz2
+2ce887cf36e698282b9241832850defd icq_fix.patch"
diff --git a/main/pidgin/icq_fix.patch b/main/pidgin/icq_fix.patch
new file mode 100644
index 000000000..8bb87ef86
--- /dev/null
+++ b/main/pidgin/icq_fix.patch
@@ -0,0 +1,19 @@
+#
+#
+# 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);
diff --git a/main/pidgin/msn_fix.patch b/main/pidgin/msn_fix.patch
deleted file mode 100644
index f93fef8a4..000000000
--- a/main/pidgin/msn_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# patch "libpurple/protocols/msn/slplink.c"
-# from [a96a53635871463de0177e5a99fe4ebdc2c7d577]
-# to [87ada76abf90c44e615679efc5f8128bb941bba1]
-#
-============================================================
---- libpurple/protocols/msn/slplink.c a96a53635871463de0177e5a99fe4ebdc2c7d577
-+++ libpurple/protocols/msn/slplink.c 87ada76abf90c44e615679efc5f8128bb941bba1
-@@ -383,6 +383,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
- msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
- {
- MsnMessage *msg;
-+ const char *passport;
-
- slpmsg->msg = msg = msn_message_new_msnslp();
-
-@@ -421,7 +422,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
-
- msg->msnslp_header.total_size = slpmsg->size;
-
-- msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user);
-+ passport = purple_normalize(slplink->session->account, slplink->remote_user);
-+ msn_message_set_attr(msg, "P2P-Dest", passport);
-
- msg->ack_cb = msg_ack;
- msg->nak_cb = msg_nak;
-