Added patch from https://github.com/gmt/my-kde-sunset to fix compilation with >=gcc-4.6

4 files changed, 46 insertions, 2 deletions

diff --git a/dev-qt/qt-meta/ChangeLog b/dev-qt/qt-meta/ChangeLog
index d30324e4..684840f1 100644
--- a/dev-qt/qt-meta/ChangeLog
+++ b/dev-qt/qt-meta/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $
 
+  21 Mar 2013; Lars Wendler <polynomial-c@gentoo.org> qt-meta-3.3.8b-r2.ebuild,
+  +files/qt-3.3.8b-cstddef.patch:
+  Added patch from https://github.com/gmt/my-kde-sunset to fix compilation with
+  >=gcc-4.6
+
 *qt-meta-3.3.8b-r2 (21 Mar 2013)
 *qt-meta-3.3.8b-r1 (21 Mar 2013)
 
diff --git a/dev-qt/qt-meta/Manifest b/dev-qt/qt-meta/Manifest
index bb1a549a..e92b7dd1 100644
--- a/dev-qt/qt-meta/Manifest
+++ b/dev-qt/qt-meta/Manifest
@@ -12,10 +12,11 @@ AUX qt-3.3.8-seli-xinerama.patch 1960 SHA256 ec72679b69148af1b687a9cf7992e20ee85
 AUX qt-3.3.8-uic-fix.patch 711 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3 SHA512 a7f8387180890aa5c9f495b5f380a0a51f69dc95a474d8f4142718474a17ce9d39623aa640167bb155e47a0d2dc3c74cdeab6fe38fb11602d29bba9fb8ba9a99 WHIRLPOOL 995bfe53624748399a1ccb333af656558a9b4db54524bfe91aa7cc1c8d3f9e0b9af21445ef53fad01f552b1208c305053b2dc9664170d86fb32f9fe652df1867
 AUX qt-3.3.8-visibility.patch 5554 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 SHA512 8257e29311fb890e3c3fe192bc2032c45e1449acc219884ec7da50577ff87ae67a87a3f51dd013c4547b007ccf010a65c8fcf8794c7e11e91a027cc8c48dc5cd WHIRLPOOL 4212dda16e4fd5f6eac078ce0803255f07abd2c6f7109e65e935a81a8051e4246aac71c3548d318b628db75e1f7e4d1d0853f5cf4ad80a0aa749547b7169c71c
 AUX qt-3.3.8b-cjk-fix.patch 1191 SHA256 94369e7cca8531ed89370480c2d5f3a0e99dbb49640df715ef33711b9d1cae4b SHA512 3f09a4463e6f2cdf0b000806717abd54ced3b020b5cf59d29bf8143e94c132b1eebfc658fc6585faf805ef02dc2120eac42aca76db31a580985eaecfcc3901ef WHIRLPOOL 6dc36431247d178e792562ab72645368198e896b7889d753f8cc6c760af3527f1f205b4166357f9232970859e96c4aa031c23f63fdd8a048a3b0c089fb052a81
+AUX qt-3.3.8b-cstddef.patch 1197 SHA256 ea2c24d508e6f38f9724a852f1fdd1024a681922a0df1adb81e2ec4b2eeaf071 SHA512 f7a529724cb2d326d32711cb9968d34186628e98c01f8c0a7b249394aa74de77c8028760908fe83d42f09b510898781b659cb775881573acdec9aecd622b455f WHIRLPOOL ca7a37145190f44f1857c8bc57d7d843d07d3c280ed399be0d71e77039ea445830602c796cd0481ddc8ae0f26440c4ec5ed32ef82345dfdc1955753ce89d4379
 AUX qt-ulibc.patch 355 SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d SHA512 8cd3d637bb708fa5396e0e93b711c4fde74851beea7771b27f19ba8e660dc13d74236e15cb10829cbebd64a8b357ebc978a09961c448a54e21d9b41df39e012c WHIRLPOOL 1102370186f512ca28ccc195f2d1aa0cfc793b5fd0ac04725075971fcadf4162ca2e28f9611453fd1026b8e59f477aa9080fc288128cddc7453f06aa04fba14c
 DIST qt-x11-free-3.3.8b.tar.gz 17313883 SHA256 1b7a1ff62ec5a9cb7a388e2ba28fda6f960b27f27999482ebeceeadb72ac9f6e
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 EBUILD qt-meta-3.3.8b-r1.ebuild 10834 SHA256 2c8fc8228ad830a136711a4baa210288ca8a17f048da4f066dde122eee681892 SHA512 564b69df9139aae63592848d73cb3b2d0d123abf55f60434bceda2c13a75c959d85b8a09d5efa534581070b5bd517d3c05556f16ace6d855ff68c0672fbdedef WHIRLPOOL ac7e8b10bb1eb6ae80ff8c164e6cd5aad4a4ffcecdd7e95bcab52c89f6069a889d6622fad0313b6e668125d378ffde2d954b7c8c6838f1975d7ebe3bcf2efff1
-EBUILD qt-meta-3.3.8b-r2.ebuild 10852 SHA256 0cfb210fcce5322474807ee3574b83d8f5cd835104216395cd70b834c835e204 SHA512 4b63241a5ecc9bf2d03f2e989cfcc260fbe2dee5e0778809252626d6fa671ef1fdf9a7428c5bdc2c12b9d7b7cbcd2bad48cc257c3c0c8b8eb807256395db6d17 WHIRLPOOL da5fe6b3403417b676439cfa84ee9597f22849b26b21b9ed32b255a0ebf965a9905b37a278d94025d5d0e6cf2b976e8a2bd27627d69633936873ab8e3b6017f5
-MISC ChangeLog 49768 SHA256 20f59479d3b67d2d3ec629b24825e56030eb1a90af838b625103a80e371d15e4 SHA512 ccdccbb90937221b8ae5c67b47eb414a263c659909fa466e9ecef83006f3fd7dba1bb27af226712fe5fd9819c321227634eead37f5ee5d3c3273a60e1d93537e WHIRLPOOL 132486c7229e9d3d1dcbaa3b4b996709b04495f156bb4603d93298cb4582993d99499912c90b510351fbf3dce1fe3fe83e56c6935542dc3d5d02698aab81a87a
+EBUILD qt-meta-3.3.8b-r2.ebuild 10955 SHA256 b7ce019c7c173dbd8b129fb8532f8d8bd467bdb573bedf13d3e6199eeb6ca59f SHA512 57e1cfc34df511a7394eb722aa4644a04320a9ef0f16ac74d567899dc9c7060ef01d88fa996f157053bbf43c31d46b9ef1477845792c4830388cab2d904f773e WHIRLPOOL 18cd489a814c11723b0dad0c03a31d2dbcb26c0761a8d59de9910a015745af0b44a5450a907c39ec7d11411726e906359c93a571aad50ec1e487e7d43f74cba1
+MISC ChangeLog 49975 SHA256 ea0583bef31b6cf1b92cfc6be116622b8af6fffe032d2171beddf3a784350464 SHA512 5e732e86bd6ce1f682cce50508a1c98503ad16075ddbf82fc08575a1a66034f237d175a4e0102a95f0160267e68a7a68a85d52987fdbc2181daa2fb43889fafd WHIRLPOOL 9d9ca3a7d779086aba00d21f0e503cd45582d87c5c16db064c32ad4ac41152ee273d7c47c6de431cfc298b87eb188b8ba63deefe22d344ae112170b8f0a8ce3b
 MISC metadata.xml 335 SHA256 53934f5173007d42204665e1561d36656c6ecf587162b8eb4e289fcfa88c577a SHA512 006c6c8bb33b0a5a7eca4910a6ba12fb4ed307d8d8478c77d20ee5d659bdab0320491e992c45e225ac4b778a78eea7f5dabe06c3abf848741f2cfe5477fa104a WHIRLPOOL 4978b14b3a69f928cfde293cbf9614d131c1f17d00c4f54420ebe7d20e5305f52cc61e58cc3748618d51a6b0679db40ab1760b000876c742c1d7a522f2c575e0
diff --git a/dev-qt/qt-meta/files/qt-3.3.8b-cstddef.patch b/dev-qt/qt-meta/files/qt-3.3.8b-cstddef.patch
new file mode 100644
index 00000000..9541dc95
--- /dev/null
+++ b/dev-qt/qt-meta/files/qt-3.3.8b-cstddef.patch
@@ -0,0 +1,35 @@
+diff -urpN qt-x11-free-3.3.8b.orig/src/tools/qvaluevector.h qt-x11-free-3.3.8b/src/tools/qvaluevector.h
+--- qt-x11-free-3.3.8b.orig/src/tools/qvaluevector.h	2008-01-15 11:09:13.000000000 -0800
++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2012-12-09 04:11:27.641340594 -0800
+@@ -47,6 +47,7 @@
+
+ #ifndef QT_NO_STL
+ #include <vector>
++#include <cstddef>
+ #endif
+
+ template <class T>
+diff -urpN qt-x11-free-3.3.8b.orig/src/tools/qmap.h qt-x11-free-3.3.8b/src/tools/qmap.h
+--- qt-x11-free-3.3.8b.orig/src/tools/qmap.h	2008-01-15 11:09:13.000000000 -0800
++++ qt-x11-free-3.3.8b/src/tools/qmap.h	2013-01-10 15:30:00.636796209 -0800
+@@ -54,6 +54,8 @@
+ #include <map>
+ #endif
+ 
++#include <cstddef>
++
+ //#define QT_CHECK_MAP_RANGE
+ 
+ struct Q_EXPORT QMapNodeBase
+diff -urpN qt-x11-free-3.3.8b.orig/src/tools/qvaluelist.h qt-x11-free-3.3.8b/src/tools/qvaluelist.h
+--- qt-x11-free-3.3.8b.orig/src/tools/qvaluelist.h	2008-01-15 11:09:13.000000000 -0800
++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2013-01-10 15:30:23.561863215 -0800
+@@ -58,6 +58,8 @@
+ #pragma warning(disable:4284) // "return type for operator -> is not a UDT"
+ #endif
+ 
++#include <cstddef>
++
+ template <class T>
+ class QValueListNode
+ {
diff --git a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
index 831b3d11..153215c8 100644
--- a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
+++ b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
@@ -134,6 +134,9 @@ src_unpack() {
 	# Fix CJK script rendering, bug 229567
 	epatch "${FILESDIR}"/qt-3.3.8b-cjk-fix.patch
 
+	# cstddef contains ptrdiff_t prototype (for >=gcc-4.6)
+	epatch "${FILESDIR}"/qt-3.3.8b-cstddef.patch
+
 	# Fix libpng-1.5 issues
 	epatch "${FILESDIR}"/qt-3.3.8-libpng15.patch