Backport a RSS parsing fix, https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/47 by cerebrum.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 54 insertions, 9 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 62b696c8dfc4..34f972b18842 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/claws-mail
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.246 2014/11/23 07:27:21 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.247 2015/03/01 19:04:59 mgorny Exp $
+
+*claws-mail-3.11.1-r1 (01 Mar 2015)
+
+  01 Mar 2015; Michał Górny <mgorny@gentoo.org> +claws-mail-3.11.1-r1.ebuild,
+  +files/claws-mail-3.11.1_RSSyl-encodings-fix.patch, -claws-mail-3.11.1.ebuild:
+  Backport a RSS parsing fix, https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/47 by cerebrum.
 
 *claws-mail-3.11.1 (23 Nov 2014)
 
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index b2f3a7855136..ce0cf648fb23 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX claws-3.9.0_fix-search-field_part1.patch 4478 SHA256 58f1e00a45de6ee51f375d504da4f5b4a0843685d4e19667b0d19fcafe1c25ea SHA512 2c206a8375e42d631007cb9b431505fa86db27831debdb8bc3de764bcae0f1a56c6b3ea9eb8c30bd087099a3685ecf24074f3112bf78e50511f9c5c4ac7a0d40 WHIRLPOOL ad3a518718e5d64a809d27ce7781331fdb0d54fe4e9c542f1dd7d6ee16c449fdab83ad5f2b0ec2d18c193f10fe82f7ef168667c7b11b1fef0a4f3782f2a6269f
 AUX claws-3.9.0_fix-search-field_part2.patch 533 SHA256 5914ee2b2f582523311e8eafa8e8aa58a752b81b85f27d1b84650009896769ad SHA512 20b70e8a06df38fb6ca8c98c67ebccf7db58c5ab31804e879741f23c7f0b1f62b3340474d9090c0938322fc6975e66301929d781c3490ae0ea5ab74de74336b8 WHIRLPOOL 7acd4b78c90e2c7bbd5d4a587d1a0586b5d7d69a84ae91841178bccb3824d1f5540b8b5c2ade5d790896b06872a2545639266e09397f4ad5e5a7e82152df2ef5
+AUX claws-mail-3.11.1_RSSyl-encodings-fix.patch 917 SHA256 d61cc67f6e4018a74da31b3861511c5fbf606f25d1d5cba672353ded363ff800 SHA512 e4ae4a1972007c9a72fa4a34cee63ab62142615fa9c79b18ef3ee110ceeb6e750261d5de929f8a55e7fca3662db8ba37ae73797447b373f1214038b0d005b4d9 WHIRLPOOL 4b7c710812b3cf83ab56e3e266bc8b2375897a9f6c5f77df30a2a455756ec44ac0ff3f487f0e902759cc4343e9ea38e2ed675d1f47c49a79d22fe7daedd605f5
 AUX claws-mail-3.9.1_fix-nntp-segfault.patch 1368 SHA256 9982127c126f9dd94928e88da507343c041d8e9e0e71ef7611daa2f2d523fe2c SHA512 c4b7529182b585e56311f37fe7d4af323da56985266f6c0dccce21d08d059604116e4bac660d09b00d80a94e7345cc78dfd8cb159bfccc8a0f8cb5166cbe38a2 WHIRLPOOL 38cc34d9816cbedd081f9757091c0d484b51a93a9cea2a46feb053485602a7a81bf669eca802601b0b85ba1d7f5d104f3722b5bb9df5cec25acf888333aa6b87
 AUX claws-mail-3.9.1_libsoup-check-fix.patch 1162 SHA256 d69a0670d078568ff5a05d013b42b6ea9285205062ba619294b8c1c973179e5f SHA512 7197792ce9def1b2d551b284aea63a083982b46b01516c0a363bcd48bc9d4f4ec6763b20538483bc6f60082156c15de88436318aeb14e9edaa54828a30f0e348 WHIRLPOOL 1acd635033a05e7e9e8220bce79621dcc517996f642d9d76c70ad704ba904d6ba44451f50c3527260c6f74654b81da81368697acf6c0779c2650903ef557d877
 DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
@@ -12,19 +13,31 @@ DIST claws-mail-3.9.1.tar.bz2 9367489 SHA256 376e535aac746dccbd8871c6f3ff6ced301
 DIST claws-mail-3.9.2.tar.bz2 9413758 SHA256 e396cb67e8ecdae926dfcd59da4b3f26a633aabc0f4f00b1f24cb207f3ff2330 SHA512 8703c170b7e66fb42e8fe41ec86997edc56c9c0da92ac5482d6432159ea46d53aec414097f0c796abee5cb4402bfaa55b194f36c21d5453ab97ea140a2093240 WHIRLPOOL 0c56081cbd073e532725afc3c3714f28b6f1a9adcc835e421deb7db6814b634f26e8e95d42a832d0fdcd7b7b3824a03b66cb7d6951ffe9bf4ef10bb777bb4777
 DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
 EBUILD claws-mail-3.10.1.ebuild 6435 SHA256 400e4c9a3121e8cd39e7b363382891901a80743c0e76b59ee03acf2f7d1db1bd SHA512 626bb0fb2fadc47ad0b18a015939fdb131a458521bab11050cfb9e6133753ff83f89f1c1eea43ecc3b478a593b3b5f70c5dea84489064949cd17f340081dacb0 WHIRLPOOL 297f1c38a995c8a0e280ff1c6aa5822dbf8fa733fc376cf1f672f327fdf6ccf716ac185aee0eb136484f2204da0ee82f7aa36ee8b497a4767f114bdbd77f2b5a
-EBUILD claws-mail-3.11.1.ebuild 6431 SHA256 9cd9efa0a86e019f6a36beeb20e7d742b2324f59f9d786f5c233c4f4a9467f33 SHA512 ba5b461cb9a50c6aafe938af6d403bc93ebcfa871fb674da786fb48e3c26d7d813eaf61602e7f586a8d61343ec773008172f4cc0d7df960b2a22f6c0f5cb016b WHIRLPOOL e19295d82d409adfc01b0ffe6aad8c63211e5fc2b62bc478388ed978b58c69e1f41118fc478cc24b254bb7728290ad41d3d17fa5413b6debb7ed361d1abed951
+EBUILD claws-mail-3.11.1-r1.ebuild 6495 SHA256 d6eca46b50728e2008d2639d9bba80483501d150c774217613f53b77908d026d SHA512 ec4e90b2a374f8e2b7ad943323663acc517b345e521513e1ff518e0e290044f427b2c9dc51a65731a4f9473191e0b2f14a492d25c542a0225ee143c93e4151b1 WHIRLPOOL 7d1e2c286040ace5fbc6cc97cd37141e12d735092de451543a241dfc5fe465589f4381554c35c1b8007d95950983b76165eb40b7c9961cfc07292b38d28276a1
 EBUILD claws-mail-3.9.0-r1.ebuild 3891 SHA256 afbf9936083e3cc38bb16cfc959cbada2a38aa437b4fbc6df2ef1af1cea37fe5 SHA512 161364a5c8f510ecf39538b653763d09a24906bc2a527a10c28cf301b14d6744bf065bc4cf510213489afe41168eadcafd6006e270c338b0f1f8a4e9e4845c7b WHIRLPOOL 98c86442d1d29dd1800a819d6a854207b72f266058b2f024122f73c82a9d219ef9dec34de4a6517194cbeda4d8c1cfccff15dd8b9d00a0b858c7ae8b771c17d8
 EBUILD claws-mail-3.9.0.ebuild 3753 SHA256 da894e3b689fe452e0c9ba8c52153bd84c85163ccb44131c266fd84493336444 SHA512 e20a44a61d6c89552a89d81a43d469627a875aaaea2ced5cefa9a05a1798dde286f7d262a0e5e062a761f71b6d1c5dbd306a9aafbf067e5826acd3ec7962b417 WHIRLPOOL e1f688bf43bebba383d50dc05a57eed41e6ef9e198a4b80e4626ac362c870cb2574fcadd3170f1880f77effb0a99a84177f3a3e5976920e132dd3ff6dc6d60a9
 EBUILD claws-mail-3.9.1-r1.ebuild 6524 SHA256 41451287f355c08dbedee54c37b121fb82a4a2f3b1f5fe064beb6379334f5298 SHA512 bedde9a2c38702a39b8136f7f16b15537ecf8d13f83e62beb0d3e51f3895d2aeed6a359ad432b3f8e3f9bd799a0ec1a459d5a5df40024d1e23098cb0baf9b55e WHIRLPOOL 20e0781c37b82d6ba4c10bfe467fda859e489433bdd9e365acf673c0d9bcbc09e0488c4481361fc12ac8c92b093d6c9e3d9f0d8e95df1fef13d05fe66332a703
 EBUILD claws-mail-3.9.1.ebuild 6481 SHA256 06e97b037274672a0190d962cd44a1f73c5b9c6503a62469dd688bd788b61f4a SHA512 f198c0161db4e5aafe70ba9703aee92ac120d110de7938fc7af52502a899d8dfa04aafb72c39aae79a560a5eb33961d7b6524d525931e25671819c241b6fd84e WHIRLPOOL f7142a0eb69b46dce0f28457e1235c5786ef1c9b9f2d289cea3a738348151530553d90eeb61f4113df3306c86ace877d58dff70691ba4f47ef8210fb10360520
 EBUILD claws-mail-3.9.2.ebuild 6424 SHA256 aef09f1889bd27357cb895b07f22b7f554a504c20f9dba5d48dbe4eae9266138 SHA512 1e76c2958071661ebe61044953ff4b32db23bc0ee2ce90b57aa4abb3ed5d9b3cafeeb1174db7512197cdc88b4752de9e353f0c124cbd40c27b4fb4634d689d53 WHIRLPOOL 0d50a47f31ffe0edcfa40fe50d451025dbfd551d811c8a8e5ec2bbe506a546f93d31225c7ea33c8f54233ad6108434f6986f22b7ecc731260d4a9b4026e6c6f4
 EBUILD claws-mail-3.9.3.ebuild 6406 SHA256 0e19c4e57a97196a6aab42ff515a0a00c1dd765ca43b67c689ba97c980560b74 SHA512 7f9b72624679e8def9b58be5df4a20c5a3980beaec2327060b7f94d7a29fe681700002b4e714d2778017d336ed790cf035f55342d5edced2890520d36a9fa99b WHIRLPOOL 59953ac9727349167d74fa846a0c6249e999c2d59eab08ea60c3cd61caa3e233ba30c6be9326893b8b84ef6bafae1aad88fc1af541daefdfc46d22fd125d804c
-MISC ChangeLog 49986 SHA256 eb5ab84fc8e2a6907401c0a3f2537caf6b801a7918726176263ea417bb48e0fc SHA512 1ea4625e7e99e044247487567fc165aea279a7b2f88c09e529f77fb4c8ff9f1c802e48b034f6ffe36cab57c8db91531eac392d6dd2474cac5c53b4b29db5d95a WHIRLPOOL b4bb60c6bec494f52c8ec354f708295bb80196a2cc1af325130bcdb4045ec3e3c86651ce83514a6bbb93cc6fe707c66dc125ebeaef87b5356c01b7fea0495eab
+MISC ChangeLog 50296 SHA256 0a996861432464f9eb6091d015595718c0a9a10671da823b6e26a2448e99e96e SHA512 b4f7b96e0dc105fb4ed277a822db2531b76dbe6b08793119541ea03204239f00e70787389ca15570ab9ed01ff20b379fa414dc64b3e0f084bae5cb8b3cb1abfd WHIRLPOOL 8887efb7bb75bfd0759cb6d74eff00913cb60c294381a0afc939ea442489a9a29b364c562180069d7d4d523ec01e8e506e234c8a50c35883b885707957113ed3
 MISC metadata.xml 1512 SHA256 9f6506ac3a742abaa867916c37fff4184837799768815a5601a530197a0e7f2a SHA512 51fd0651f330aca6619680f50377f6dab7ad05d3c0530e29ce4149c18ed72b2e4e6839cd5eac87aa3cc21d1a740cbafcd4433c6c4bd369af3acb999a52cda369 WHIRLPOOL 5f301c096c555bbc1292272d91c5ac431d7b591edb6eeefa3ba57bcdbe4307fc7a4b1861731cadd75c3453254b4df0bd4cf2dec45d98e2b6fbf1bd7270d4844c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRxjFoACgkQVWmRsqeSphOirwCePBXANDmEwyhoELy3Vihy+el5
-itsAn1wRbQbdjCFpJA1PH/dMfkc83b+P
-=tNIj
+iQJ8BAEBCABmBQJU82LcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqJwP/jSM0gvwQjrBdpgd9GSzCUiF
+lS/+2/53uM6JhC+OdHFrcpsMB5pw/g/8XkESkRjLK3JpGmQHurk4ws8AjkXITEhs
+lHpMMjNxbMWpiyXFx+MimUSaWeZWS/eGD4ylGAVZTv3kL3+P8JyBv+TmNAGdmNDa
+lC2bhyxzsYKVP4cOnZwobTcsOgs9KBB4Ie2Dqmv9olw4qEDPBiWPrhbFecx/yDl3
+8xB37VWqKmqDo2Dwutlfu3rVIPE9acfBKnkOu2eqBBdabBn7OP4mF1pX9pvymgl+
+mHRzd2GtBhd2OrUvX3QsEgljfI/gS+NzzE/DjO196dugi6NtCcaLpjJY88qUQewk
+I72+XGNUV0RCmEQDojLGrL8/hut+alHp9cbizwjbbXrtj662lNqV+DXL2EYGWWMA
+hDS04OKFULJGyVrYT1nsE0sRqEmqUoE0zj3lHLjiBHlYLIYsMfLqLPMn+w1htKRL
+LkBxqNB4msDdRclqK/Q0XI/84kvBSEwAW5EXSE7iBEr9rMaZksXQqQAgaXVyXAQH
+RT3tsXydVIjTYz7OkTGBWqMJOkI9//CRIDhhxhDNxXtjUcK/WHxTuze3QQbJgjIl
+XDl09fXTwiKi/NZU3hHWx2rhrqaToeAwlHpNzAthZ7QFXqkVEEkeBdHhRvYM9lvR
+ftrrlh9KnI1uLRZraK4V
+=vwrA
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.11.1.ebuild b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
index 89300af3fd5c..307e661bbd67 100644
--- a/mail-client/claws-mail/claws-mail-3.11.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.11.1.ebuild,v 1.1 2014/11/23 07:27:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild,v 1.1 2015/03/01 19:04:59 mgorny Exp $
 
 EAPI="5"
 
@@ -99,6 +99,8 @@ RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
 
+PATCHES=( "${FILESDIR}/${P}_RSSyl-encodings-fix.patch" )
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug crash-dialog)
diff --git a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
new file mode 100644
index 000000000000..82e13b25390f
--- /dev/null
+++ b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
@@ -0,0 +1,23 @@
+From: Andrej Kacian <ticho@claws-mail.org>
+Date: Thu, 1 Jan 2015 22:36:36 +0000 (+0100)
+Subject: RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only... 
+X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d05156031070efe6104695acad93aa879bc0f084
+
+RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only thing missing was that HAVE_ICONV macro (from config.h) was not defined in parser.c, so our "unknown encoding" expat handler function did nothing. Fixes bug #3339.
+---
+
+diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
+index bb0bb0d..14f4a36 100644
+--- a/src/plugins/rssyl/libfeed/parser.c
++++ b/src/plugins/rssyl/libfeed/parser.c
+@@ -17,6 +17,10 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <glib.h>
+ #include <curl/curl.h>
+ #include <expat.h>