diff options
author | 2011-10-02 23:47:07 -0400 | |
---|---|---|
committer | 2011-10-02 23:47:07 -0400 | |
commit | 785c2ab423c444564a671621733885812ab51f68 (patch) | |
tree | 92dfade6d416814e90998c94ba17bf59ff59b7ca | |
parent | inherit autotools for eautoreconf and die if eautoreconf fails (diff) | |
download | chutzpah-785c2ab423c444564a671621733885812ab51f68.tar.gz chutzpah-785c2ab423c444564a671621733885812ab51f68.tar.bz2 chutzpah-785c2ab423c444564a671621733885812ab51f68.zip |
pidgin revision bump
-rw-r--r-- | net-im/pidgin/Manifest | 25 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch | 27 | ||||
-rw-r--r-- | net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 | ||||
-rw-r--r-- | net-im/pidgin/pidgin-2.10.0-r1.ebuild (renamed from net-im/pidgin/pidgin-2.9.0-r1.ebuild) | 9 |
4 files changed, 54 insertions, 24 deletions
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest index 482fbed..00aacc1 100644 --- a/net-im/pidgin/Manifest +++ b/net-im/pidgin/Manifest @@ -1,6 +1,25 @@ -AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd -DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7 +EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c -EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1bfbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8ed962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCAAGBQJOiS/kAAoJEHy/RO9cNQiDjpoP/juj0ibdg3AotfwGS23Q3zSX +9PyywtP99odsHZf9ryzx5fjf0M4J99Tc8wgt1cwwLYUzfCTFhZYJVE7bMmaFI6GG +x0P+FeD8YWmNC3vxkyQt1/mPnju06LKFIo9dSAezlC4mLOJNdZDtPOu9Rdgkxt3G +4mwRSCMVFjGE6Pe0I7VltlH84c7zxe5bcbkA9z4ewSLR2s6mfa8hb0UzgODJBMGv +baCVKF1GKL91popPSQiOvU+mnLkkbLPGrhKiCkr7Bc2fvLHKGi+swrT+SgcGs3Qw +k+7tv4zXnRdbARNe4dB19rjRkIkDNMl+08PwJkX0Vkz3ghLcD762ACg4RtdBm6yC +80bjXe1O1UNulXaQAAR4y4o36cUarHuqqSG1FMRJGhSLkuKgVligJpnZaieuTdTT +XEmX1QmhlIvWI2ru6L+hXQvw/1W7ac6aZgKxRdJ/Q8xRkyGxLIXy4MdPMvMKCJo/ +81u0B8j+/BwtwBYzkwcTlq7m54Unrlk3Uyvz9tKcWg4gMV8uFCpK0hJ6C9Q9DKbQ +tFvIGqLjIg6PPRiM2WL5IG7oM+apc6gCTNhMFPlyX0VXjd8A2N48i369XU6230vM +ctQ3l8yTJN9QIboC+a9hwzUT8UiOq8DBv/2FUHijqonjEBtYSc536yFiKCgpaROU +VdKdL5c9WLLfmfxl2GbN +=gMM7 +-----END PGP SIGNATURE----- diff --git a/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch b/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch new file mode 100644 index 0000000..26ee178 --- /dev/null +++ b/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch @@ -0,0 +1,27 @@ +# +# +# patch "libpurple/protocols/silc/ops.c" +# from [30ab18780af11a53b6564a44c4e8ebfc1a296d78] +# to [80bd9a7d3faf9e5ef28438647159fe19847e9839] +# +============================================================ +--- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78 ++++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839 +@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, + } + + if (flags & SILC_MESSAGE_FLAG_UTF8) { +- tmp = g_markup_escape_text((const char *)message, -1); ++ const char *msg = (const char *)message; ++ char *salvaged = NULL; ++ if (!g_utf8_validate((const char *)message, -1, NULL)) { ++ salvaged = purple_utf8_salvage((const char *)message); ++ msg = salvaged; ++ } ++ tmp = g_markup_escape_text(msg, -1); + /* Send to Purple */ + serv_got_im(gc, sender->nickname, tmp, 0, time(NULL)); ++ g_free(salvaged); + g_free(tmp); + } + } diff --git a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch b/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch deleted file mode 100644 index bf09668..0000000 --- a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch +++ /dev/null @@ -1,17 +0,0 @@ -# -# -# patch "libpurple/conversation.c" -# from [cd6817f4863abafef969359f65cc025f9483b401] -# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] -# -============================================================ ---- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 -+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 -@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC - } - - g_hash_table_remove_all(chat->users); -- chat->users = NULL; - - g_list_free(users); - chat->in_room = NULL; diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.10.0-r1.ebuild index 5ac3889..b50ad5d 100644 --- a/net-im/pidgin/pidgin-2.9.0-r1.ebuild +++ b/net-im/pidgin/pidgin-2.10.0-r1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.9.0-r1.ebuild,v 1.1 2011/07/27 07:01:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.0-r1.ebuild,v 1.1 2011/10/02 18:13:16 pva Exp $ EAPI=3 GENTOO_DEPEND_ON_PERL=no -inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools +inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python +inherit autotools DESCRIPTION="GTK Instant Messenger client" HOMEPAGE="http://pidgin.im/" @@ -128,9 +129,9 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}/pidgin-2.9.0-conversation.c.patch" + epatch "${FILESDIR}/${P}-utf8-validation.patch" epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch - eautoreconf + eautoreconf || die "eautoreconf failed" } src_configure() { |