diff options
| -rw-r--r-- | net-im/pidgin/ChangeLog | 11 | ||||
| -rw-r--r-- | net-im/pidgin/Manifest | 9 | ||||
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch | 23 | ||||
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch | 79 | ||||
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch | 21 | ||||
| -rw-r--r-- | net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch | 22 | ||||
| -rw-r--r-- | net-im/pidgin/pidgin-2.7.5.ebuild (renamed from net-im/pidgin/pidgin-2.7.4-r1.ebuild) | 6 |
7 files changed, 14 insertions, 157 deletions
diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog index e9ff630ada0f..aa08afa2d76a 100644 --- a/net-im/pidgin/ChangeLog +++ b/net-im/pidgin/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-im/pidgin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.200 2010/10/30 17:55:29 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.201 2010/11/02 13:02:02 pva Exp $ + +*pidgin-2.7.5 (02 Nov 2010) + + 02 Nov 2010; Peter Volkov <pva@gentoo.org> -pidgin-2.7.4-r1.ebuild, + -files/pidgin-2.7.4-bonjour-crash.patch, + -files/pidgin-2.7.4-icq-authorization-empty-nick.patch, + -files/pidgin-2.7.4-icq-html-regression.patch, + -files/pidgin-2.7.4-missing-break-bug-12810.patch, +pidgin-2.7.5.ebuild: + Version bump, bug #343653, thank tman for report. 30 Oct 2010; Raúl Porcel <armin76@gentoo.org> pidgin-2.7.4.ebuild: alpha/ia64/sparc stable wrt #342059 diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 454d1c1c5c7d..0e0b99ed0220 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,13 +1,10 @@ AUX pidgin-2.7.2-ldflags.patch 1593 RMD160 ade438f25d0af927485523e561ce728762645948 SHA1 6ac16bd019ad048109643af5e3525987c994dbb0 SHA256 64d78b48111345b49216e9678c114f321963393b4fd0aa6046de8aec6f03cb44 AUX pidgin-2.7.3-ldflags.patch 1332 RMD160 0dd11485e9c990dab1230629faac704835a91ae4 SHA1 7bbb420a206bf6cb366bf501b90c893e896a1f65 SHA256 1f8574a9c2f056ba8c07559623da8c9ce241928f060898752eef5770dd1d081a -AUX pidgin-2.7.4-bonjour-crash.patch 772 RMD160 b6c0bc8e388e12e981be18eb24579794017d43fb SHA1 2b91ea8d399408447e228bdd252dcacf5a2453be SHA256 b66ee60cf9563065281387ce40362256638fc933ab00dc5324e3a5b52cd39820 -AUX pidgin-2.7.4-icq-authorization-empty-nick.patch 2807 RMD160 5b4a74d6cbc61cebdd01f365a2560fdf7636dec7 SHA1 ace96484719943622f980677ecf9e7d7eeeb5959 SHA256 845d83a560223900bd98e0e43fea842cfff36a77d30592d9588b18462718a241 -AUX pidgin-2.7.4-icq-html-regression.patch 681 RMD160 cd7729c4826ace165691e53c9ce70a531094328f SHA1 dc76928b8840f62511fa12b0b7c20040033bd40f SHA256 fdf29d6e42989b2a254508420841c15bce179f1f8f4ce423d9a2866d4a713d7a -AUX pidgin-2.7.4-missing-break-bug-12810.patch 788 RMD160 92239702190c9258940f0c0d73cf98e1404c73f1 SHA1 04a3f094a2b97785a8d1d4d5c70655f57f5d1435 SHA256 f9a6815b079711b3c02f4d8cf570ba6261d1ac660a3a8092641d6d5c97d122f4 DIST pidgin-2.7.3.tar.bz2 9746117 RMD160 276fb19abf6505f9d56120c7412987002511fcb3 SHA1 81b9b5591ddbdf36aa656ddd90ff935ae090e940 SHA256 8b5788aa7b8c3fa372e6c5f671592731c86e41322bcc09facb6bbe6127e323f2 DIST pidgin-2.7.4.tar.bz2 9799804 RMD160 900cdcffa34bfc43da803abf5427fdde8bb00b4e SHA1 f7d8d0fcecddda636db642e403280e85b76ea5f2 SHA256 7c6fa2811082bde2dbd0897414f9f8f18e7c3e51159288571af1f1f2ce81f856 +DIST pidgin-2.7.5.tar.bz2 9811543 RMD160 0e01cfe8e6d2557f0000724d291a66a710d0ea8e SHA1 f8ac5bef7d2bde898d43a5d97c967bc915c22b40 SHA256 f3f5ee7a7f968a590874b4c40019ae1f9f9889b5723b1417ba691e90fafbd878 EBUILD pidgin-2.7.3.ebuild 6091 RMD160 1868ed5daea32ceedb25193db0a764c87bbcb0d3 SHA1 83f5bc5375536f1b3ec29a76a84a764af1976d45 SHA256 6b9188507315dc07f84e1665c7c2f2d8053c09300965899fb404bbdf1af87680 -EBUILD pidgin-2.7.4-r1.ebuild 6657 RMD160 340dcbb07ef958a13dccf20c07e10c922ef3179d SHA1 5d9bbd1fbf099c45c01f25064e706e09c3e5ee00 SHA256 111508b91666033bbf154d7b3145cab13b23e3e1c802c74b1646cd3f36ea897a EBUILD pidgin-2.7.4.ebuild 6431 RMD160 58310e63fe2abebb4a4e3e644e655b9ca79b1141 SHA1 990ba4e646e2f5a366c17598e23194ea29f28cac SHA256 4dd02dc2b0b83e1fe582649ba9ded016b835814d608078fcbdcd230d2abe7854 -MISC ChangeLog 28303 RMD160 a0a522fc8a6c3e3733e02fe037ac6e609447dcd1 SHA1 5f7b68eb7cb2906bca6e77a11b7dc3972b9db09f SHA256 855a8ae7b7e95b1b8fef674ea6b68185849d5a79b62cd1ff69cbd7b4b79fd80e +EBUILD pidgin-2.7.5.ebuild 6435 RMD160 a20cca7c5a6ba7386ac95c3c8d6e243c72fcd9b5 SHA1 f1f918a509535d717564646157f0f5b072edaee5 SHA256 17ea028a12b11d6ad743438129214b9e7a4bbb9740f9a95e7d0d4a9f36fc3b29 +MISC ChangeLog 28676 RMD160 7847fdee223f61641d86cd786946e6573b8f9ef5 SHA1 c3a89c5db80f08fa4482c0ae0757912f82ead32d SHA256 c4ad590003c8f6c1f41973a1b6de84ff6ac1f8d2e5da4d7fb79d329cb3c9d6a5 MISC metadata.xml 1347 RMD160 ab118b33da598ea43ea4adb8cd07d269faf19528 SHA1 d68aea7e02d1fa45f1a71eb34c98259d61c935ca SHA256 b1b9067810378483188a403fb85f8ff76bc5260cb4bb811179eed1088dd6f5ba diff --git a/net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch b/net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch deleted file mode 100644 index ed43e5a211c6..000000000000 --- a/net-im/pidgin/files/pidgin-2.7.4-bonjour-crash.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/82e935b340047646fa99de444cd143a4523928cc - -Fix crash when attempting to log into a bonjour account and init failed - -# -# -# patch "libpurple/protocols/bonjour/bonjour.c" -# from [9f373f1963c40837750948ec0b072e6eb1abb608] -# to [e0955c7f0b8020ffa9848c290b42f88f981a3572] -# -============================================================ ---- libpurple/protocols/bonjour/bonjour.c 9f373f1963c40837750948ec0b072e6eb1abb608 -+++ libpurple/protocols/bonjour/bonjour.c e0955c7f0b8020ffa9848c290b42f88f981a3572 -@@ -189,7 +189,8 @@ bonjour_close(PurpleConnection *connecti - purple_xfer_cancel_local(bd->xfer_lists->data); - } - -- g_free(bd->jid); -+ if (bd != NULL) -+ g_free(bd->jid); - g_free(bd); - connection->proto_data = NULL; - } diff --git a/net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch b/net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch deleted file mode 100644 index 9b14852566ed..000000000000 --- a/net-im/pidgin/files/pidgin-2.7.4-icq-authorization-empty-nick.patch +++ /dev/null @@ -1,79 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/b4c65c273f2934560d9e643a124b31ac2d2328f2 - -We should always display the "Authorize buddy?" mini-dialog, even -if the buddy doesn't have a non-empty nickname. Fixes #12810. -Also, why the hell did gotalias() return int? That should be void. - -# -# -# patch "libpurple/protocols/oscar/family_icq.c" -# from [6e79de6d0d602cb32962d5a6eb9884d41ecf4d2a] -# to [da2f91e3871e683861698a416bb17e6f4fc7eca1] -# -# patch "pidgin/gtkaccount.c" -# from [67355ddf08aa04ea8bc82450a9b0276a03937981] -# to [c6c6f42af0d54071a143aeab36b4165866907064] -# -============================================================ ---- libpurple/protocols/oscar/family_icq.c 6e79de6d0d602cb32962d5a6eb9884d41ecf4d2a -+++ libpurple/protocols/oscar/family_icq.c da2f91e3871e683861698a416bb17e6f4fc7eca1 -@@ -408,27 +408,27 @@ int aim_icq_sendsms(OscarData *od, const - return 0; - } - --static int -+static void - gotalias(OscarData *od, struct aim_icq_info *info) - { - PurpleConnection *gc = od->gc; - PurpleAccount *account = purple_connection_get_account(gc); -- gchar who[16], *utf8; - PurpleBuddy *b; -+ gchar *utf8 = oscar_utf8_try_convert(account, od, info->nick); - -- if (info->nick[0] && (utf8 = oscar_utf8_try_convert(account, od, info->nick))) { -- if (info->for_auth_request) { -- oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason); -- } else { -+ if (info->for_auth_request) { -+ oscar_auth_recvrequest(gc, g_strdup_printf("%u", info->uin), utf8, info->auth_request_reason); -+ } else { -+ if (utf8 && *utf8) { -+ gchar who[16]; - g_snprintf(who, sizeof(who), "%u", info->uin); - serv_got_alias(gc, who, utf8); - if ((b = purple_find_buddy(account, who))) { - purple_blist_node_set_string((PurpleBlistNode*)b, "servernick", utf8); - } -- g_free(utf8); - } -+ g_free(utf8); - } -- return 1; - } - - /** -============================================================ ---- pidgin/gtkaccount.c 67355ddf08aa04ea8bc82450a9b0276a03937981 -+++ pidgin/gtkaccount.c c6c6f42af0d54071a143aeab36b4165866907064 -@@ -2468,6 +2468,7 @@ pidgin_accounts_request_authorization(Pu - GtkWidget *alert; - GdkPixbuf *prpl_icon; - struct auth_request *aa; -+ gboolean have_valid_alias = alias && *alias; - - gc = purple_account_get_connection(account); - if (message != NULL && *message == '\0') -@@ -2475,9 +2476,9 @@ pidgin_accounts_request_authorization(Pu - - buffer = g_strdup_printf(_("%s%s%s%s wants to add you (%s) to his or her buddy list%s%s"), - remote_user, -- (alias != NULL ? " (" : ""), -- (alias != NULL ? alias : ""), -- (alias != NULL ? ")" : ""), -+ (have_valid_alias ? " (" : ""), -+ (have_valid_alias ? alias : ""), -+ (have_valid_alias ? ")" : ""), - (id != NULL - ? id - : (purple_connection_get_display_name(gc) != NULL diff --git a/net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch b/net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch deleted file mode 100644 index 68a9a9932b5a..000000000000 --- a/net-im/pidgin/files/pidgin-2.7.4-icq-html-regression.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://theflamingbanker.blogspot.com/2010/10/death-of-thousand-tickets.html -http://bugs.gentoo.org/show_bug.cgi?id=342779 - -# -# -# patch "libpurple/protocols/oscar/family_chat.c" -# from [9b3ad3b5c68ab5d3f33b0b856fdeaf898a5ed9a9] -# to [397a3d8572c9863216cc7b37d26858f34a1583ab] -# -============================================================ ---- libpurple/protocols/oscar/family_chat.c 9b3ad3b5c68ab5d3f33b0b856fdeaf898a5ed9a9 -+++ libpurple/protocols/oscar/family_chat.c 397a3d8572c9863216cc7b37d26858f34a1583ab -@@ -88,6 +88,8 @@ infoupdate(OscarData *od, FlapConnection - return 1; - } - -+ byte_stream_get16(bs); // skip the TLV count -+ - /* - * Everything else are TLVs. - */ diff --git a/net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch b/net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch deleted file mode 100644 index 8faf759f093a..000000000000 --- a/net-im/pidgin/files/pidgin-2.7.4-missing-break-bug-12810.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://developer.pidgin.im/viewmtn/revision/info/7d1c9a75673aed36deaeca9e96975462a68e2dcd - -There seems to be a missing break here. I noticed it in the log, but -probably not related. Refs #12810. - -# -# -# patch "pidgin/minidialog.c" -# from [0ff3f39351172aebcd5504f3915242777b6d05cd] -# to [2e29d56ddb428c86d1e4ee9854fd56b0925b948c] -# -============================================================ ---- pidgin/minidialog.c 0ff3f39351172aebcd5504f3915242777b6d05cd -+++ pidgin/minidialog.c 2e29d56ddb428c86d1e4ee9854fd56b0925b948c -@@ -332,6 +332,7 @@ pidgin_mini_dialog_set_property(GObject - break; - case PROP_CUSTOM_ICON: - gtk_image_set_from_pixbuf(priv->icon, g_value_get_object(value)); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } diff --git a/net-im/pidgin/pidgin-2.7.4-r1.ebuild b/net-im/pidgin/pidgin-2.7.5.ebuild index bf7876ae8368..8a4f79a7a559 100644 --- a/net-im/pidgin/pidgin-2.7.4-r1.ebuild +++ b/net-im/pidgin/pidgin-2.7.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.4-r1.ebuild,v 1.1 2010/10/29 09:59:46 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.7.5.ebuild,v 1.1 2010/11/02 13:02:02 pva Exp $ EAPI=2 @@ -121,10 +121,6 @@ pkg_setup() { src_prepare() { gnome2_src_prepare epatch "${FILESDIR}"/${PN}-2.7.3-ldflags.patch - epatch "${FILESDIR}"/${P}-icq-html-regression.patch - epatch "${FILESDIR}"/${P}-bonjour-crash.patch - epatch "${FILESDIR}"/${P}-missing-break-bug-12810.patch - epatch "${FILESDIR}"/${P}-icq-authorization-empty-nick.patch eautoreconf } |