[arch-commits] Commit in pidgin/trunk (PKGBUILD icq_fix.patch msn_fix.patch)

[Ionut Biru]

    Date: Monday, May 31, 2010 @ 14:47:25
  Author: ibiru
Revision: 81547

upgpkg: pidgin 2.7.1-1
update to 2.7.1

Added:
  pidgin/trunk/icq_fix.patch
Modified:
  pidgin/trunk/PKGBUILD
Deleted:
  pidgin/trunk/msn_fix.patch

---------------+
 PKGBUILD      |   43 ++++++++++++++++++++++---------------------
 icq_fix.patch |   19 +++++++++++++++++++
 msn_fix.patch |   28 ----------------------------
 3 files changed, 41 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-31 17:46:02 UTC (rev 81546)
+++ PKGBUILD	2010-05-31 18:47:25 UTC (rev 81547)
@@ -6,7 +6,7 @@
 
 pkgbase=('pidgin')
 pkgname=('libpurple' 'pidgin' 'finch')
-pkgver=2.7.0
+pkgver=2.7.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
@@ -16,14 +16,15 @@
 	'tk' 'ca-certificates' 'intltool' 'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
-	msn_fix.patch)
-sha256sums=('dc59cbae75db8ecf2850c35e82fc11ac33bbf2542e901e6e1e4525688635783d'
-	    '1910ea7dd816d3e9b123fa9dc204ad586396a820ae3c870a6aa15dd1eff0ad49')
+	icq_fix.patch)
+sha256sums=('f412a5a7389ad553229743b49399f968278095c8258dc0f89f766a6cd0ba95d1'
+            '9f5de2d1441f8369f3f13733dc4ffe14e1be9395507b79703b1c849c02602f93')
 
 build() {
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
 
-    patch -Np0 -i "${srcdir}/msn_fix.patch" || return 1
+    patch -Np0 -i "${srcdir}/icq_fix.patch" || return 1
+
     ./configure --prefix=/usr \
                 --sysconfdir=/etc \
                 --disable-schemas-install \
@@ -39,11 +40,11 @@
 package_libpurple(){
     pkgdesc="IM library extracted from Pidgin"
     depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plugins')
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
 
     for dir in libpurple share/sounds share/ca-certs m4macros po
     do
-	make -C "$dir" DESTDIR="$pkgdir" install || return 1
+	make -C "${dir}" DESTDIR="${pkgdir}" install || return 1
     done
 #    rm -rf "$pkgdir/etc" || return 1
 }
@@ -59,19 +60,19 @@
                 'aspell: for spelling correction')
 
     install=pidgin.install
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
     #for linking
-    make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES || return 1
+    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
 
-    make -C pidgin DESTDIR="$pkgdir" install || return 1
-    make -C doc DESTDIR="$pkgdir" install || return 1
+    make -C pidgin DESTDIR="${pkgdir}" install || return 1
+    make -C doc DESTDIR="${pkgdir}" install || return 1
 
     #clean up libpurple
-    make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES || return 1
+    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES || return 1
 
-    install -D -m 0644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop || return 1
+    install -D -m 0644 pidgin.desktop "${pkgdir}"/usr/share/applications/pidgin.desktop || return 1
 
-    rm -f "$pkgdir"/usr/share/man/man1/finch.1 || return 1
+    rm -f "${pkgdir}"/usr/share/man/man1/finch.1 || return 1
 }
 package_finch(){
     pkgdesc="A ncurses-based messaging client"
@@ -80,14 +81,14 @@
     		'tk: Tcl/Tk scripting support'
 		'ca-certificates: SSL CA certificates')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd "${srcdir}/${pkgbase}-${pkgver}"
     #for linking
-    make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES || return 1
+    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES || return 1
 
-    make -C finch DESTDIR="$pkgdir" install || return 1
-    make -C doc DESTDIR="$pkgdir" install || return 1
+    make -C finch DESTDIR="${pkgdir}" install || return 1
+    make -C doc DESTDIR="${pkgdir}" install || return 1
 
     #clean up libpurple
-    make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES || return 1
-    rm -f "$pkgdir"/usr/share/man/man1/pidgin.1 || return 1
+    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES || return 1
+    rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1 || return 1
 }

Added: icq_fix.patch
===================================================================
--- icq_fix.patch	                        (rev 0)
+++ icq_fix.patch	2010-05-31 18:47:25 UTC (rev 81547)
@@ -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);

Deleted: msn_fix.patch
===================================================================
--- msn_fix.patch	2010-05-31 17:46:02 UTC (rev 81546)
+++ msn_fix.patch	2010-05-31 18:47:25 UTC (rev 81547)
@@ -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;
-