Add patch to fix compilation with gcc-4.4; bug #276510

Package-Manager: portage-2.2_rc33-r1/cvs/Linux i686

4 files changed, 47 insertions, 7 deletions

diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index 53060a9fbb3f..0f2e19dcbd2e 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kadu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.77 2009/06/05 17:45:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.78 2009/07/25 19:42:22 halcy0n Exp $
+
+  25 Jul 2009; Mark Loeser <halcy0n@gentoo.org> kadu-0.6.5.2-r2.ebuild,
+  +files/kadu-0.6.5.2-gcc44.patch:
+  Add patch to fix compilation with gcc-4.4; bug #276510
 
   05 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org> kadu-0.6.5.1.ebuild,
   kadu-0.6.5.2.ebuild, kadu-0.6.5.2-r2.ebuild:
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 4e33cb5564c0..ac8ce8ca3cd3 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX kadu-0.4.3-tcltk-gcc4.patch 576 RMD160 f37fcaba6dafbc84b7bf9efd03d6708f5305195b SHA1 bc31cd2421e923b1680db7a089b8a1f5ff4032c1 SHA256 8974c9948f39100c97269e57591e0090fa017c485e89abbf5a07ece8b7299d86
 AUX kadu-0.6.0.2-kill-strip.patch 1090 RMD160 8c148f779f448a0700d44b2f51a598bf5ef240df SHA1 8a8268e5c85b91e09f2f2b261b06e14b085ffa73 SHA256 bfcc8ed6e1d2527117bdd8bebc7ea05605953acdf5cfd711bd5009ea5c221778
 AUX kadu-0.6.5.1-fix-qt4.5-encoding.patch 920 RMD160 121164df1698219aaad51eb58b9d9040d80979f7 SHA1 5948d0a37b69e85f2c5998b9e63227e7ab05598a SHA256 14654eaa0ad2f10f646d3a63ee9903fb75192146b5f748ce5d375e560a4f77c3
+AUX kadu-0.6.5.2-gcc44.patch 1018 RMD160 90e158d6297047cc42dd02c2e1c95c980ec8c25d SHA1 5292f74bc148fb9e946079b5f8ee0117138ecd2b SHA256 ae7fa3fb1a39240dd4b9deda36db19d07dd72896df77220710ca555df81f15bd
 AUX kadu-toolbar_toggle-gentoo.diff 5983 RMD160 ea7c587b4c3617c2ebb445dce46d6c275a71c0a9 SHA1 bca7202cdae4eea2d5a1d1df1cffad704cf49711 SHA256 2f39f3871c120c3ef1d720b67bb1c536762b5af1a63cf79282a679a65c63b12a
 AUX libgsm-ugly-code.patch 314 RMD160 5c613b7b4eb261d1116fcbd76a6c46b0cc0c3bb3 SHA1 b008af1a900b135b28530fc49a2be11b318f269b SHA256 17c671fe35813ae9b8c72ca7c3563a22a0894e15ddc02aba0a6f56b00e20bad2
 AUX voice-gentoo.patch 468 RMD160 ca260b532be75ea607807263c2b6c306f6820e8e SHA1 c8d2dff872e6611c48b71b221db2cdc450f2f029 SHA256 970a51aa1c5aa90f6f23c96b8d37255e879ee994fc1551b6e340a649c7bf5bd1
@@ -33,14 +34,14 @@ DIST screenshot-20080104.tar.bz2 14130 RMD160 a1d147bb2a678fb4f1faf8cb0d5d39e5c6
 DIST spellchecker-20071230.tar.bz2 9504 RMD160 80eb8ad0f3b7b340507aec958b0bab9e3701b8b1 SHA1 8c32ced4aa4b129ff018994c009fd8435cd3e045 SHA256 ecde5f7ad2b60f53dbd7715df52459531cac8cce06670d016014da82589483d0
 EBUILD kadu-0.6.0.2-r1.ebuild 6138 RMD160 140ffcb8fa2a60dd3230a9583da0bcf6a2c7702d SHA1 fbe8b0df3bdfbced6da3f2365987e48fa79cc515 SHA256 e95dbd63aeef263a1a93befbfb330c4813d8eb61c9fe842d65abba23e7ffc0dd
 EBUILD kadu-0.6.5.1.ebuild 5140 RMD160 37441e3dcb40a3f004718472e72a256bf2600ceb SHA1 064f88618229e58f937ae22e7cc1fa099d2cd11c SHA256 c01e0017b2987fa0d205746777472bfa6438c1f45642f70769838e9228ae23c9
-EBUILD kadu-0.6.5.2-r2.ebuild 5345 RMD160 6e0e4c8b8195cb4ae8072f2b5752ae9b362d4938 SHA1 98b5a4543fc62db704cf76a7f6dff9e71d6aa541 SHA256 ad2cf61eec4ca1fda345f1c8e35d00162ea8231aaa9900563a0b2c189a595685
+EBUILD kadu-0.6.5.2-r2.ebuild 5375 RMD160 8510ddbed894f875d139c97dfa5ca30204b21e3c SHA1 811cea443b82c256f7020aee778856923f681d50 SHA256 08e988a41c581dd5c151e881b61d4ae382bee5f669650cf1994abb2e11fb3bc1
 EBUILD kadu-0.6.5.2.ebuild 5191 RMD160 1f114379fa2651f54db12c1f8ae62d6d4597fc19 SHA1 dbe000917b264874fad64a6a399c8a2f528c4741 SHA256 a382ca13abde08bd65f09e672f70176253bb01a114095d9043f9170a8d2b2fe2
-MISC ChangeLog 11666 RMD160 45b8909d7ddbd4744feba25119803f6970f745f1 SHA1 d7fff122c9ea1fd8726cf92f461e07756e434f56 SHA256 cdf0b4e6a15fa96a6e7e7188b125fcd6bd1dff3e3843fee95f11ed423f0ad19d
+MISC ChangeLog 11829 RMD160 c1fc213881f39ea599cfe6d8cbafc884e8f0084a SHA1 26f18e5ae61a40809306d5a1a82ce5535b2b214c SHA256 92763536879d1c06743a673d37d0f8af80ef603075d4dd81a2a166ca27e067be
 MISC metadata.xml 1347 RMD160 8c3ef49c65c92864a58c8dd459efb3f36cdb614c SHA1 7fd7754cbf38f10c5fba60d5554c501cf5ed7b1d SHA256 d659b8d45e74ecff43e5cb62b73fd940ddfbbb841eff0bb8c19f36ce54c8278f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkopWcUACgkQjDdoMVfcAHiWUwCg4VUF/aJxmpan/VdhjLRCU7An
-Wc0An35sfSId0tjst/sjpJIiVQLwlWjQ
-=1IDd
+iEYEARECAAYFAkprYCUACgkQCRZPokWLroRzgACg4pCKj+KA7lJAjMIvN0vaVK9b
+EB4An2PWLPbuvnDgeoL2vIUoC1bjpL8B
+=A4W4
 -----END PGP SIGNATURE-----
diff --git a/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch b/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch
new file mode 100644
index 000000000000..868dd3a5165f
--- /dev/null
+++ b/net-im/kadu/files/kadu-0.6.5.2-gcc44.patch
@@ -0,0 +1,34 @@
+--- branches/0.6.5/kadu-core/protocol.h	2009/05/14 16:31:06	6636
++++ branches/0.6.5/kadu-core/protocol.h	2009/05/14 16:32:15	6637
+@@ -4,9 +4,9 @@
+ #include <QtCore/QDateTime>
+ #include <QtCore/QObject>
+ 
+-#ifdef __sun__
++#if defined(__sun__ ) || defined(__linux__)
+ #include <sys/types.h>
+-#endif /* __sun__ */
++#endif /* __sun__ || __linux__ */
+ 
+ #ifdef _MSC_VER
+ #include "kinttypes.h"
+--- branches/0.6.5/kadu-core/protocol.h	2008/09/25 20:10:18	5602
++++ branches/0.6.5/kadu-core/protocol.h	2009/04/24 21:11:43	6584
+@@ -14,6 +14,7 @@
+ 
+ #include "status.h"
+ #include "usergroup.h"
++#include <stdint.h>
+ 
+ typedef uint32_t UinType;
+ 
+--- branches/0.6.5//modules/encryption/pkcs1_certificate.h	2009-07-25 15:26:05.000000000 -0400
++++ branches/0.6.5/modules/encryption/pkcs1_certificate.h	2009-07-25 15:26:27.000000000 -0400
+@@ -26,6 +26,7 @@
+ #define PKCS1_CERTIFICATE_H
+ 
+ #include <QtCrypto>
++#include <stdint.h>
+ 
+ /**
+  * PKCS#1 certificate reader/writer (implemented according to the PKCS#1 v2.1 Specification).
diff --git a/net-im/kadu/kadu-0.6.5.2-r2.ebuild b/net-im/kadu/kadu-0.6.5.2-r2.ebuild
index 4b74b2684995..7d6ade430c8d 100644
--- a/net-im/kadu/kadu-0.6.5.2-r2.ebuild
+++ b/net-im/kadu/kadu-0.6.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.2-r2.ebuild,v 1.2 2009/06/05 17:45:33 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.2-r2.ebuild,v 1.3 2009/07/25 19:42:22 halcy0n Exp $
 
 EAPI="2"
 inherit base cmake-utils flag-o-matic
@@ -43,6 +43,7 @@ S="${WORKDIR}/${PN}"
 
 PATCHES=(
 	"${FILESDIR}/libgsm-ugly-code.patch"
+	"${FILESDIR}/${P}-gcc44.patch"
 )
 
 # set given .config variable to =m or =y