Date: Wednesday, July 21, 2010 @ 17:41:00
Author: ibiru
Revision: 85889
upgpkg: pidgin 2.7.2-1 update to 2.7.2
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/icq_fix.patch
pidgin/trunk/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
--------------------------------------------------------+
PKGBUILD | 14 --
icq_fix.patch | 19 ---
oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff | 84 ---------------
3 files changed, 4 insertions(+), 113 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-21 14:31:18 UTC (rev 85888)
+++ PKGBUILD 2010-07-21 21:41:00 UTC (rev 85889)
@@ -6,8 +6,8 @@
pkgbase=('pidgin')
pkgname=('libpurple' 'pidgin' 'finch')
-pkgver=2.7.1
-pkgrel=2
+pkgver=2.7.2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://pidgin.im/";
license=('GPL')
@@ -15,18 +15,12 @@
'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10-base'
'farsight2' 'avahi'
'tk' 'ca-certificates' 'intltool' 'networkmanager')
options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
- icq_fix.patch oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff)
-md5sums=('0dd2adb9e8214ac960f956823c84e7e2'
- '2ce887cf36e698282b9241832850defd'
- '29cb9bb0e74db8bf6c18c048e935a60a')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('c23d85bb6a197dd841d1b5585148327d')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- patch -Np0 -i "${srcdir}/icq_fix.patch"
- patch -Np0 -i
"${srcdir}/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff"
-
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-schemas-install \
Deleted: icq_fix.patch
===================================================================
--- icq_fix.patch 2010-07-21 14:31:18 UTC (rev 85888)
+++ icq_fix.patch 2010-07-21 21:41:00 UTC (rev 85889)
@@ -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);
Deleted: oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
===================================================================
--- oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff 2010-07-21
14:31:18 UTC (rev 85888)
+++ oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff 2010-07-21
21:41:00 UTC (rev 85889)
@@ -1,84 +0,0 @@
-#
-# old_revision [915eb72db575b96b63275f0f1d857378adbf3420]
-#
-# patch "libpurple/protocols/oscar/family_icbm.c"
-# from [52688bc864209fd4471193bfce81c4547ba8ae51]
-# to [2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb]
-#
-============================================================
---- libpurple/protocols/oscar/family_icbm.c
52688bc864209fd4471193bfce81c4547ba8ae51
-+++ libpurple/protocols/oscar/family_icbm.c
2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb
-@@ -2687,7 +2687,6 @@ static int clientautoresp(OscarData *od,
- int hdrlen;
- int curpos;
- int num1,num2;
-- char *desc, *title, *temp;
- PurpleAccount *account;
- PurpleBuddy *buddy;
- PurplePresence *presence;
-@@ -2714,31 +2713,41 @@ static int clientautoresp(OscarData *od,
- xml = byte_stream_getstr(bs, bs->len - curpos);
- purple_debug_misc("oscar", "X-Status: Received
XML reply\n");
- if(xml) {
-- /* purple_debug_misc("oscar", "X-Status: XML
reply: %s\n", (const char*) xml); */
-- if ((desc=strstr(xml,"<desc>"))
!= NULL) {
--
temp=strstr(xml,"</desc>");
-- temp[0]=0;
-- desc=desc+12;
-- }
-- if ((title=strstr(xml,"<title>"))
!= NULL) {
--
temp=strstr(xml,"</title>");
-- temp[0]=0;
-- title=title+13;
-- } else {
-- title="";
-- }
-- strcpy(xml,title);
-- if (desc) {
-- strcat(xml, " - ");
-- strcat(xml, desc);
-+ GString *xstatus;
-+ char *tmp1, *tmp2;
-+
-+ /* purple_debug_misc("oscar",
"X-Status: XML reply: %s\n", xml); */
-+
-+ xstatus = g_string_new(NULL);
-+
-+ tmp1 = strstr(xml, "<title>");
-+ if (tmp1 != NULL) {
-+ tmp1 += 13;
-+ tmp2 = strstr(tmp1,
"</title>");
-+ if (tmp2 != NULL)
-+
g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
- }
-- purple_debug_misc("oscar", "X-Status
reply: %s\n", (const char*)xml);
-- account =
purple_connection_get_account(od->gc);
-- buddy = purple_find_buddy(account, bn);
-- presence =
purple_buddy_get_presence(buddy);
-- status =
purple_presence_get_active_status(presence);
-- purple_prpl_got_user_status(account, bn,
-- purple_status_get_id(status),
"message", xml, NULL);
-+ tmp1 = strstr(xml, "<desc>");
-+ if (tmp1 != NULL) {
-+ tmp1 += 12;
-+ tmp2 = strstr(tmp1,
"</desc>");
-+ if (tmp2 != NULL) {
-+ if (xstatus->len > 0)
-+
g_string_append(xstatus, " - ");
-+
g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
-+ }
-+ }
-+ if (xstatus->len > 0) {
-+ purple_debug_misc("oscar",
"X-Status reply: %s\n", xstatus->str);
-+ account =
purple_connection_get_account(od->gc);
-+ buddy =
purple_find_buddy(account, bn);
-+ presence =
purple_buddy_get_presence(buddy);
-+ status =
purple_presence_get_active_status(presence);
-+
purple_prpl_got_user_status(account, bn,
-+
purple_status_get_id(status),
-+ "message",
xstatus->str, NULL);
-+ }
-+ g_string_free(xstatus, TRUE);
- } else {
- purple_debug_misc("oscar", "X-Status:
Can't get XML reply string\n");
- }
