Add upstream patch to fix build with Qt 4.7 wrt #414569. Thanks to upstream maintainer Montel Laurent.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 32 insertions, 11 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 173cff2b1867..34166d22de7d 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.281 2012/05/03 20:08:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.282 2012/05/04 13:33:25 johu Exp $
+
+  04 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/kmail-4.8.3-qt47-compat.patch, kmail-4.8.3.ebuild:
+  Add upstream patch to fix build with Qt 4.7 wrt #414569. Thanks to upstream
+  maintainer Montel Laurent.
 
 *kmail-4.8.3 (03 May 2012)
 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 82abbb66d0b4..1ddf049c27d3 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX kmail-4.4.9-nodbus.patch 3922 RMD160 3bca508b6b8934a1c5f0e84788f7fab5f382b143 SHA1 18e8579fafce9c0685b7285c0acfe40c56834a93 SHA256 c70b1ca83ec89cc66c77e45d68632b412bbdbf0ec6bf989cb7674461ae114e68
 AUX kmail-4.7.4-gcc44.patch 492 RMD160 f71183b405d1ff724fd021fb7133b89e8b184af2 SHA1 67fc6ab3e45db38de8e7fad9c9f83b54ccde3881 SHA256 6407d434616d32194c2b58b357dd11d9b427b62d20dd31671da5b1e0881e51f6
+AUX kmail-4.8.3-qt47-compat.patch 348 RMD160 d35583f30533ba199980f4929cbce916ae2386be SHA1 a31472b8c5705def0e770c4d5ee690f441edb878 SHA256 d14af0b62c1b5b18841422b985269069d22bbc1cbc6740ceddca7a977794261f
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
 DIST kdepim-4.8.1.tar.xz 13952564 RMD160 deecba770ef62ad59ea5239e4f94c388aaefdd0b SHA1 93222d56f9adde015cb202a1ad3b194ac52e6bda SHA256 7569758ebb4120a7120738f5ec9bb1e4ef0dcf3cc16da55e5262869396b27b3b
@@ -13,17 +14,17 @@ EBUILD kmail-4.7.4-r1.ebuild 1694 RMD160 8c68f99b36086d8981832bd21b09c0d029a461c
 EBUILD kmail-4.7.4.ebuild 1643 RMD160 c8533fcad87e9fa387c099f52e66bc6415b268d0 SHA1 961e063882a845f71147c7ad6f3b02312ec7e493 SHA256 dbbc3761496893f1155df4401d5e0bb6fa350796999cdd135feb384e3874f580
 EBUILD kmail-4.8.1.ebuild 1647 RMD160 2548ae6ed380474a07f03b90134f3d97d5301ba9 SHA1 9dcee62d0804c2dc7c9666483108ddaeb47e635d SHA256 d44ae2be2caf7bf45610174d208b1146de8a5e5b880d06d2c33c3edfb2639841
 EBUILD kmail-4.8.2.ebuild 1647 RMD160 32a732391c2c2432ad3336de2ecab03797f76ffd SHA1 1c24458e0150e4623ef56914c2592e614cc5fcf6 SHA256 291297f1dcdb5afce31fb319b3943a8dc5cae4d6b47d1dd4892b1e42bdadf116
-EBUILD kmail-4.8.3.ebuild 1647 RMD160 733d2321e487f653e26e7434577695b681e7b6fd SHA1 e9aacc9bdfaf7fc452d9b713bac342c75a0c5cb8 SHA256 f45f6ef229ec432d38fdaea7de44e039d7ae75dfae3d0928a429047544177166
-MISC ChangeLog 36851 RMD160 4a4b4f90d1bd78dbde3f8c2a3a937af118173309 SHA1 5e026dcc1d72e6320038e05482717392f7cd858e SHA256 dd33da40a14cd442833133c6c4318fde003486d03b8be0ba9aec18c0f2c95764
+EBUILD kmail-4.8.3.ebuild 1697 RMD160 7e31e49aac38ef61976e4fa8eea546605a6ffeb4 SHA1 859322aa8260b7fe296edbd35dbbee2d5bbe3089 SHA256 f0d475b7b3e6fe4b8f1b9bc07cd8e71a8f97695d75f746f38b6911f4b1fb4522
+MISC ChangeLog 37067 RMD160 2660a9f1b7bca3dfd02c43ff4df88a3028af9144 SHA1 065ee24ecf34d1e7a8bb7a12bcd6c51de65e0094 SHA256 c5c959053821be629c8303479a5eb449bc31197c60ca2b15da979ae893d0de72
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPouYUAAoJEO+t9ga+3I3anMUIAKh7I/bJY7kfzapSry5Z7w0C
-pjVOomg1bsAXRZM5hFL75NtPRIIl111Aj85LN7lLP1xcZ9A0sB8k0wuXmBESbF8k
-PA8q8kX0qqrahZk0OFEkfjKlT6bOSdbbV+5+PN6FeHNFkiRGpUKk+PuOMBtAiyM8
-Wq3Jjl+0PRuemB90RVkdtvwOf0dhMNxFAUSivjQPy9eBad5uilTr9cPttRdPhGiA
-rkCPvZIoBmVdTdvVKQhDpL49M9PtY2/x67veVwdJDOTWzc0J68twSI8lUSXKonM9
-bJJ2Hi4uq6Wcn7p5czL6UtMGMn2UNqMJE1ZRIlkdZYsGoHiv/8pMOztEepKrOOI=
-=16xW
+iQEcBAEBCgAGBQJPo9qlAAoJEO+t9ga+3I3anUQIANKBi1S3t/J+/2GMhDeBcMaI
+l5fBv8YAn7bnNDWigtBqkatQeV1SeenujF6TE6R8c0wEkvNqMU68+I33b7yJPDwe
+sehDHymQ2S9bzDZUVWqCflsR60UcBjXSIm20md3T0mB+oeeO/to+7XcCX+SXFQnh
+1Q1+b+GWh3wpg+/RBwhZ7AT9BQ6p3LUtCTYC8/keLLmo+39RazdJoMUOX+FK3r91
+yyLpOU+EuoW7H2Yqd4nMsU3NSFYTOf6tPtzmH+uE0tt6sUBFCRY3ruACFCSsd/5v
+rG2gSS7RiFtXZAmu1nK7QwVUlJhh3ZmGzzVUKI4oFdOSbfK+TBj5CYxHFpiZXfY=
+=nmn0
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch b/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
new file mode 100644
index 000000000000..a6c553260feb
--- /dev/null
+++ b/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
@@ -0,0 +1,13 @@
+--- a/messageviewer/viewer_p.cpp
++++ b/messageviewer/viewer_p.cpp
+@@ -1930,8 +1930,10 @@ void ViewerPrivate::slotToggleHtmlMode()
+ 
+ void ViewerPrivate::slotFind()
+ {
++#if QT_VERSION >= 0x040800
+   if ( mViewer->hasSelection() )
+     mFindBar->setText( mViewer->selectedText() );
++#endif  
+   mFindBar->show();
+   mFindBar->focusAndSetCursor();
+ }
diff --git a/kde-base/kmail/kmail-4.8.3.ebuild b/kde-base/kmail/kmail-4.8.3.ebuild
index 28b73116b57e..79708ced9d3f 100644
--- a/kde-base/kmail/kmail-4.8.3.ebuild
+++ b/kde-base/kmail/kmail-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.8.3.ebuild,v 1.1 2012/05/03 20:08:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.8.3.ebuild,v 1.2 2012/05/04 13:33:25 johu Exp $
 
 EAPI=4
 
@@ -55,6 +55,8 @@ KMEXTRA="
 
 KMLOADLIBS="kdepim-common-libs"
 
+PATCHES=( "${FILESDIR}/${P}-qt47-compat.patch" )
+
 src_configure() {
 	# Bug 308903
 	use ppc64 && append-flags -mminimal-toc