1 |
commit: 785c2ab423c444564a671621733885812ab51f68 |
2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 3 03:47:07 2011 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 3 03:47:07 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/chutzpah.git;a=commit;h=785c2ab4 |
7 |
|
8 |
pidgin revision bump |
9 |
|
10 |
--- |
11 |
net-im/pidgin/Manifest | 25 ++++++++++++++++-- |
12 |
.../files/pidgin-2.10.0-utf8-validation.patch | 27 ++++++++++++++++++++ |
13 |
.../pidgin/files/pidgin-2.9.0-conversation.c.patch | 17 ------------ |
14 |
...gin-2.9.0-r1.ebuild => pidgin-2.10.0-r1.ebuild} | 9 +++--- |
15 |
4 files changed, 54 insertions(+), 24 deletions(-) |
16 |
|
17 |
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest |
18 |
index 482fbed..00aacc1 100644 |
19 |
--- a/net-im/pidgin/Manifest |
20 |
+++ b/net-im/pidgin/Manifest |
21 |
@@ -1,6 +1,25 @@ |
22 |
-AUX pidgin-2.9.0-conversation.c.patch 523 RMD160 61922053efdaf25e9580dc4199df75b60c0c976d SHA1 e185accd3dde589b93baf53086790f88b2162f61 SHA256 43efe68ca8451c993ed46e9523e5eaf419f099d60c3499ab6e451d322c87d63f |
23 |
+-----BEGIN PGP SIGNED MESSAGE----- |
24 |
+Hash: SHA256 |
25 |
+ |
26 |
+AUX pidgin-2.10.0-utf8-validation.patch 908 RMD160 0f98c6dd6cd9c63b3d61c85a9f18a07a38616115 SHA1 9876a7d8902d85e759c1dff1d8ea55cedaccd293 SHA256 288acd1f638fa1e21e216d48f308ef5f0397ddea2c1309e767391411ab02fbf4 |
27 |
AUX pidgin-gnome-keyring-2.patch 7680 RMD160 e9f14a4b46aad4e7361113a33fd5e07085bbd978 SHA1 edeca69cb6980f7b5b9ce61a83f7e0ac227c779a SHA256 aae63e57a7dc50b1232a606f7824dc655f561ed5ff7ef36607e18a18c98aa221 |
28 |
DIST pidgin-2.10.0.tar.bz2 9941288 RMD160 316e948bc4db03b160962b4ee2b1df64d35be335 SHA1 859c6d9c9795c1adcf762b73e072e04a3a85a78d SHA256 f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd |
29 |
-DIST pidgin-2.9.0.tar.bz2 9925589 RMD160 c093adadd3362ed7d266dfb07df5b75974605d5a SHA1 632c681030304443a911c9eeca6d582df0a24fbb SHA256 28ee8ece47d94ee1b708a78d613832ea88b56d879a93fa934d532d76ae52cfd7 |
30 |
+EBUILD pidgin-2.10.0-r1.ebuild 6846 RMD160 3730cf5157689819bb12218b6e4d285f47673c6c SHA1 a9ccf72415e693bfecddf99b513b29972114f78e SHA256 0c961930ae7c7687a2b560439e69592a641d6a6cb9d89dc33d7675490f0491da |
31 |
EBUILD pidgin-2.10.0.ebuild 6792 RMD160 8b13f7034c9f10d2ac7d609b70eeb7ed68d35346 SHA1 a8155168a17cfc7be2d367a604cffe95f5290689 SHA256 783b63b13dfd0a8465f554900a162552c085575364e99af1402247336e51d46c |
32 |
-EBUILD pidgin-2.9.0-r1.ebuild 6816 RMD160 4d7592875919a0aed8b435647e1a1bfbc2b3a99f SHA1 f1a3319b6c1517799df3e41a95fb03dae01fc6bc SHA256 9c4748d8ed962ecfe7f4888121cf17c239a2140f817f3b199d739b83806ad7d2 |
33 |
+-----BEGIN PGP SIGNATURE----- |
34 |
+Version: GnuPG v2.0.18 (GNU/Linux) |
35 |
+ |
36 |
+iQIcBAEBCAAGBQJOiS/kAAoJEHy/RO9cNQiDjpoP/juj0ibdg3AotfwGS23Q3zSX |
37 |
+9PyywtP99odsHZf9ryzx5fjf0M4J99Tc8wgt1cwwLYUzfCTFhZYJVE7bMmaFI6GG |
38 |
+x0P+FeD8YWmNC3vxkyQt1/mPnju06LKFIo9dSAezlC4mLOJNdZDtPOu9Rdgkxt3G |
39 |
+4mwRSCMVFjGE6Pe0I7VltlH84c7zxe5bcbkA9z4ewSLR2s6mfa8hb0UzgODJBMGv |
40 |
+baCVKF1GKL91popPSQiOvU+mnLkkbLPGrhKiCkr7Bc2fvLHKGi+swrT+SgcGs3Qw |
41 |
+k+7tv4zXnRdbARNe4dB19rjRkIkDNMl+08PwJkX0Vkz3ghLcD762ACg4RtdBm6yC |
42 |
+80bjXe1O1UNulXaQAAR4y4o36cUarHuqqSG1FMRJGhSLkuKgVligJpnZaieuTdTT |
43 |
+XEmX1QmhlIvWI2ru6L+hXQvw/1W7ac6aZgKxRdJ/Q8xRkyGxLIXy4MdPMvMKCJo/ |
44 |
+81u0B8j+/BwtwBYzkwcTlq7m54Unrlk3Uyvz9tKcWg4gMV8uFCpK0hJ6C9Q9DKbQ |
45 |
+tFvIGqLjIg6PPRiM2WL5IG7oM+apc6gCTNhMFPlyX0VXjd8A2N48i369XU6230vM |
46 |
+ctQ3l8yTJN9QIboC+a9hwzUT8UiOq8DBv/2FUHijqonjEBtYSc536yFiKCgpaROU |
47 |
+VdKdL5c9WLLfmfxl2GbN |
48 |
+=gMM7 |
49 |
+-----END PGP SIGNATURE----- |
50 |
|
51 |
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 |
52 |
new file mode 100644 |
53 |
index 0000000..26ee178 |
54 |
--- /dev/null |
55 |
+++ b/net-im/pidgin/files/pidgin-2.10.0-utf8-validation.patch |
56 |
@@ -0,0 +1,27 @@ |
57 |
+# |
58 |
+# |
59 |
+# patch "libpurple/protocols/silc/ops.c" |
60 |
+# from [30ab18780af11a53b6564a44c4e8ebfc1a296d78] |
61 |
+# to [80bd9a7d3faf9e5ef28438647159fe19847e9839] |
62 |
+# |
63 |
+============================================================ |
64 |
+--- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78 |
65 |
++++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839 |
66 |
+@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, |
67 |
+ } |
68 |
+ |
69 |
+ if (flags & SILC_MESSAGE_FLAG_UTF8) { |
70 |
+- tmp = g_markup_escape_text((const char *)message, -1); |
71 |
++ const char *msg = (const char *)message; |
72 |
++ char *salvaged = NULL; |
73 |
++ if (!g_utf8_validate((const char *)message, -1, NULL)) { |
74 |
++ salvaged = purple_utf8_salvage((const char *)message); |
75 |
++ msg = salvaged; |
76 |
++ } |
77 |
++ tmp = g_markup_escape_text(msg, -1); |
78 |
+ /* Send to Purple */ |
79 |
+ serv_got_im(gc, sender->nickname, tmp, 0, time(NULL)); |
80 |
++ g_free(salvaged); |
81 |
+ g_free(tmp); |
82 |
+ } |
83 |
+ } |
84 |
|
85 |
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 |
86 |
deleted file mode 100644 |
87 |
index bf09668..0000000 |
88 |
--- a/net-im/pidgin/files/pidgin-2.9.0-conversation.c.patch |
89 |
+++ /dev/null |
90 |
@@ -1,17 +0,0 @@ |
91 |
-# |
92 |
-# |
93 |
-# patch "libpurple/conversation.c" |
94 |
-# from [cd6817f4863abafef969359f65cc025f9483b401] |
95 |
-# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] |
96 |
-# |
97 |
-============================================================ |
98 |
---- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 |
99 |
-+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 |
100 |
-@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC |
101 |
- } |
102 |
- |
103 |
- g_hash_table_remove_all(chat->users); |
104 |
-- chat->users = NULL; |
105 |
- |
106 |
- g_list_free(users); |
107 |
- chat->in_room = NULL; |
108 |
|
109 |
diff --git a/net-im/pidgin/pidgin-2.9.0-r1.ebuild b/net-im/pidgin/pidgin-2.10.0-r1.ebuild |
110 |
similarity index 96% |
111 |
rename from net-im/pidgin/pidgin-2.9.0-r1.ebuild |
112 |
rename to net-im/pidgin/pidgin-2.10.0-r1.ebuild |
113 |
index 5ac3889..b50ad5d 100644 |
114 |
--- a/net-im/pidgin/pidgin-2.9.0-r1.ebuild |
115 |
+++ b/net-im/pidgin/pidgin-2.10.0-r1.ebuild |
116 |
@@ -1,11 +1,12 @@ |
117 |
# Copyright 1999-2011 Gentoo Foundation |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
-# $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 $ |
120 |
+# $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 $ |
121 |
|
122 |
EAPI=3 |
123 |
|
124 |
GENTOO_DEPEND_ON_PERL=no |
125 |
-inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python autotools |
126 |
+inherit flag-o-matic eutils toolchain-funcs multilib perl-app gnome2 python |
127 |
+inherit autotools |
128 |
|
129 |
DESCRIPTION="GTK Instant Messenger client" |
130 |
HOMEPAGE="http://pidgin.im/" |
131 |
@@ -128,9 +129,9 @@ pkg_setup() { |
132 |
} |
133 |
|
134 |
src_prepare() { |
135 |
- epatch "${FILESDIR}/pidgin-2.9.0-conversation.c.patch" |
136 |
+ epatch "${FILESDIR}/${P}-utf8-validation.patch" |
137 |
epatch "${FILESDIR}"/${PN}-gnome-keyring-2.patch |
138 |
- eautoreconf |
139 |
+ eautoreconf || die "eautoreconf failed" |
140 |
} |
141 |
|
142 |
src_configure() { |