Add upstream patch to fix encoding in e-mail headers, kde bug 263761

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 77 insertions, 4 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 913f4e79419b..7eb5e1219c10 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.93 2011/04/06 14:19:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.94 2011/04/18 20:09:32 dilfridge Exp $
+
+*kdepimlibs-4.6.2-r1 (18 Apr 2011)
+
+  18 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepimlibs-4.6.2.ebuild, +kdepimlibs-4.6.2-r1.ebuild,
+  +files/kdepimlibs-4.6.2-encoding.patch:
+  Add upstream patch to fix encoding in e-mail headers, kde bug 263761
 
 *kdepimlibs-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index fd7b12a62100..fb7ef7ab6d99 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,6 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX kdepimlibs-4.6.2-encoding.patch 1554 RMD160 e5420de22c79aeef5fb4c97b6c094fe80fd627b6 SHA1 3b9bf9bed3e552a9da4443d1317de46b376363fa SHA256 9620eb0b72ae0ec325283bc114431e98acb23fdf2c64b3a649d803d88ac7e149
 DIST kdepimlibs-4.4.5.tar.bz2 2432146 RMD160 3ba96ac29e151e7bcebe90394535d82345102346 SHA1 bc4d9a478f80e013ac39710f963ee68961d5f369 SHA256 44480b2a627fe4e6da76f1aa88133a60db05d63c0ea9ce3db989c1ced06b2b1a
 DIST kdepimlibs-4.6.2.tar.bz2 3198990 RMD160 98aa0c690f2d599f8675dc4e2a6f67bea0a8327b SHA1 f3c78688203b90efabdd8961783e8f4d16d9c57c SHA256 fcadf219183658c519cdbd73ec1c7d9d7bc7c7de85afa2302f96555b430a41c4
 EBUILD kdepimlibs-4.4.5.ebuild 1762 RMD160 dd1d92df4402a7f65cd3bffc7bcc147040caa414 SHA1 3e7591d7a411876220da7fe7b12e6d0cdb78a4b4 SHA256 947f7ea43773178a88ef4251c298604b555b2ce0539ce1125333d4d3ad553108
-EBUILD kdepimlibs-4.6.2.ebuild 2174 RMD160 9028738f2e2626841036490f268826a5ef485e48 SHA1 d2bba91accc4995038cfd3c99fdaba89820de1d5 SHA256 8bee21d8ec68e783b81210bf4095a45859e0866b713314e1578dc157c8fc450c
-MISC ChangeLog 12092 RMD160 322b0cd57382debee3135d40516c65d28e7cff9d SHA1 5ffa05120c722ea418ce60d5b2354cbd02c948e9 SHA256 49198ff4b43eb89b3896587b46b4e7f145be734b0ae94953aefd00a718673566
+EBUILD kdepimlibs-4.6.2-r1.ebuild 2233 RMD160 0992488bc077e5a81470bd250715ce9dfb4962cd SHA1 ce997f3e2e1e0cb34bf62f89b4ed7bee824622f8 SHA256 af7feb203d9576ffe73b3667ec6e7883f199f6811cfb2ba7d5d1cc7ad3df6036
+MISC ChangeLog 12356 RMD160 d9353164263dac91b793fa8d840304abaa453314 SHA1 56d83ed07dfc20cbe41b0b73750f1ebe4ac78845 SHA256 af5413f11076f1d1ec8846c7912d36b021e378296aa2e44b218cd2c6294de00d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNrJsvAAoJENwGBM22xffeiWwQAIGsqmXOBYPQ2kv86uAXY2TP
+fmgA32U9909G030q+oUlBLDOX6znlsCdoWhVeoF9GUXBiFxAuBNGxEs/t2WpjUku
+Mn0jG3dnMdPVoBeWKp0bQWw12ps+lCWyOs62cWhNyN6Kk2RiC4c918oh6r/u3kMx
+rPu5yzYL1qWycO/+lM/YVWQTd9eWjITQOYBMmz4yHwSk9jMX0a2PxelP7ieWNmAc
+x+P8qYhwNh8E92HBFoR2UhWJjkUsITQnQm2wgIc0qX6AyWXRPw9oDac8mElTgJKG
+QARYrxJaGi9/DjfJakeeL7Fo868ulgUi1rxcBBL68pANBkH19qlex/JQZLdU7IAU
+7c5Cpqhjm06eyGFwBQa5dtFCL+wzBTSnCcBreRaoVFprDAwgQOXYhG4SrKDdRwl8
+eiLAdid9HGdbOZrdDdo2TvaB1ysPN71QCx14twDI8q7rq7A/+ab8Q5cx09moUWAY
+YHm9ijQM1YxXDNhfvgcf6q3fiX41LNKmtTpxJfHfhHn+cnKVTB6um/l4m9dOBfh4
+Sn9+soKsxwXGls8yS6/NEexAkYxAx2hrYKLSnoX0SjN8+tRYmNxMgabnxRCM01BC
+AFBmO33c2Y6JtAzGt9PHJDM0hLwubff/8uW02FyAF/v7RBjEKUg3p4fbPx9K42gc
+2KylaMzl3uTcEv8rVRK8
+=61yl
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.6.2-encoding.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.6.2-encoding.patch
new file mode 100644
index 000000000000..7630a8c119fe
--- /dev/null
+++ b/kde-base/kdepimlibs/files/kdepimlibs-4.6.2-encoding.patch
@@ -0,0 +1,41 @@
+commit 6d80788587894ee0cf3e087f959226a3d764af95
+Author: Thomas McGuire <mcguire@kde.org>
+Date:   Sat Apr 16 21:56:01 2011 +0100
+
+    Use UTF-8 if the charset can't encode the string.
+    
+    Hopefully the call to canEncode() won't affect the performance too
+    much...
+    
+    BUG: 263761
+    (cherry picked from commit 7b75f8a769ef0e40e59dedb1327ff0ed51e63ba9)
+
+diff --git a/kmime/kmime_util.cpp b/kmime/kmime_util.cpp
+index 29ea676..ab1906c 100644
+--- a/kmime/kmime_util.cpp
++++ b/kmime/kmime_util.cpp
+@@ -287,6 +287,11 @@ QByteArray encodeRFC2047String( const QString &src, const QByteArray &charset,
+       usedCS = charset;
+   }
+ 
++  if ( !codec->canEncode( src ) ) {
++    usedCS = "utf-8";
++    codec = QTextCodec::codecForName( usedCS );
++  }
++
+   if ( usedCS.contains( "8859-" ) ) { // use "B"-Encoding for non iso-8859-x charsets
+     useQEncoding = true;
+   }
+diff --git a/kmime/kmime_util.h b/kmime/kmime_util.h
+index 84c061e..ebe2a38 100644
+--- a/kmime/kmime_util.h
++++ b/kmime/kmime_util.h
+@@ -165,7 +165,7 @@ KMIME_EXPORT extern QString decodeRFC2047String( const QByteArray &src );
+   Encodes string @p src according to RFC2047 using charset @p charset.
+ 
+   @param src           source string.
+-  @param charset       charset to use.
++  @param charset       charset to use. If it can't encode the string, UTF-8 will be used instead.
+   @param addressHeader if this flag is true, all special chars
+                        like <,>,[,],... will be encoded, too.
+   @param allow8bitHeaders if this flag is true, 8Bit headers are allowed.
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.6.2-r1.ebuild
index d26cdb468ecd..4f39f3d51408 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.6.2.ebuild,v 1.1 2011/04/06 14:19:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.6.2-r1.ebuild,v 1.1 2011/04/18 20:09:32 dilfridge Exp $
 
 EAPI=3
 
@@ -42,6 +42,10 @@ add_blocker libkholidays
 # @since 4.4 - kontactinterfaces is in kdepimlibs now
 add_blocker kontactinterfaces
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.2-encoding.patch"
+	)
+
 src_prepare() {
 	kde4-base_src_prepare