Fix build with gcc-4.6, bug #363235.

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

4 files changed, 31 insertions, 11 deletions

diff --git a/media-plugins/vdr-skincurses/ChangeLog b/media-plugins/vdr-skincurses/ChangeLog
index a3016fb7de79..6276d29f1ca1 100644
--- a/media-plugins/vdr-skincurses/ChangeLog
+++ b/media-plugins/vdr-skincurses/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-skincurses
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skincurses/ChangeLog,v 1.11 2009/03/29 16:58:21 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skincurses/ChangeLog,v 1.12 2012/03/18 17:37:32 pacho Exp $
+
+  18 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/vdr-skincurses-0.1.7-gcc46.patch, vdr-skincurses-0.1.7.ebuild:
+  Fix build with gcc-4.6, bug #363235.
 
   29 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-skincurses-0.1.2.ebuild, vdr-skincurses-0.1.7.ebuild:
diff --git a/media-plugins/vdr-skincurses/Manifest b/media-plugins/vdr-skincurses/Manifest
index f113eaeef3ad..5e9d6667755c 100644
--- a/media-plugins/vdr-skincurses/Manifest
+++ b/media-plugins/vdr-skincurses/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-skincurses-0.1.7-gcc46.patch 411 RMD160 eb5bc243f4ca91b6a4ae15b1a53b3884b73c3ff5 SHA1 3d42b0ff69356dd3e251c76e65374de3dcb1968a SHA256 9426cfae6287da2de450a691c8c2b05ef89c908748b3e77b3f332402e20f7541
 DIST vdr-1.4.3.tar.bz2 557370 RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 SHA1 7a3f17c242e557fc95921e6884adc194fc4620bb SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 EBUILD vdr-skincurses-0.0.8.ebuild 578 RMD160 3566e3598b516c9b36a78f42e4ffdc33c3b5a316 SHA1 70895da2c25abc758a7cf0855b0d915ebdc57f20 SHA256 558ef4ad21732048b750ff6e1cbcd2464d720d9e6ac84fbcc9d98189ecb386fc
-EBUILD vdr-skincurses-0.1.7.ebuild 587 RMD160 826daff2ae0fb9d6fee180395dde54b09049b6ce SHA1 2a6fa7c17e07e29ee5e5b082942bc010ea24d6fb SHA256 93dff3cc13d407f3b76133cbbd0f05105241ff40653c334a5342cfe3463da9be
-MISC ChangeLog 1953 RMD160 58f2e10b80442a4ee997876d05c30852aefc20ff SHA1 c71f8c294b73835184dabf59b0223758a1f4970e SHA256 55182eaf126a6722b6dd7c0c8160eca6b89f6fef6bcf9bab1f0f5abf4aba4928
+EBUILD vdr-skincurses-0.1.7.ebuild 688 RMD160 095b0f1e70d7da86b1997ee68421e600b67e5b2a SHA1 7d2a9b3f60c41b7cf95aa0929be3fdfc002a0a33 SHA256 0040e787f9a23897608f16cd87bebfd030f2ad2fed6e765c4bbb3a486f9892a0
+MISC ChangeLog 2107 RMD160 b515575a464e52ac1f0316c175cbabf22f988acb SHA1 618c5c4eda158c0b1e7b057a0b6220e0b8893f43 SHA256 10aef64f5e3caaa9f3b4c78947e69bcbae103a0dbbd6c084eb889d2877e4ae03
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFJz6i5dn07HTTCgIoRAvyqAKCL1/SWWZ96Vgcv2AuvWAGjEApLSQCgra/v
-2HlJacy1PXHjUrsKdwI8QWw=
-=7Rz/
+iEYEARECAAYFAk9mHWIACgkQCaWpQKGI+9TSSgCggOSCBLhdO9s6XcqPO1QIacCU
+SH4AoICJ6eauBXaR+5wBMKiFnERv8yOP
+=62nV
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-skincurses/files/vdr-skincurses-0.1.7-gcc46.patch b/media-plugins/vdr-skincurses/files/vdr-skincurses-0.1.7-gcc46.patch
new file mode 100644
index 000000000000..883667395124
--- /dev/null
+++ b/media-plugins/vdr-skincurses/files/vdr-skincurses-0.1.7-gcc46.patch
@@ -0,0 +1,10 @@
+--- PLUGINS/src/skincurses/skincurses.c	2008-03-14 13:57:14.000000000 +0100
++++ PLUGINS/src/skincurses/skincurses.c	2011-05-04 13:04:53.124920860 +0200
+@@ -19,6 +19,7 @@
+ 
+ class cCursesFont : public cFont {
+ public:
++  cCursesFont() {};
+   virtual int Width(uint c) const { return 1; }
+   virtual int Width(const char *s) const { return s ? Utf8StrLen(s) : 0; }
+   virtual int Height(void) const { return 1; }
diff --git a/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild b/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild
index a9fb371479c4..58f54b16ea81 100644
--- a/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild
+++ b/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild,v 1.2 2009/03/29 16:58:21 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skincurses/vdr-skincurses-0.1.7.ebuild,v 1.3 2012/03/18 17:37:32 pacho Exp $
 
+EAPI=4
 IUSE=""
 
 inherit vdr-plugin
@@ -19,3 +20,8 @@ LICENSE="GPL-2"
 DEPEND=">=media-video/vdr-1.6.0"
 
 S=${WORKDIR}/vdr-${VDR_V}/PLUGINS/src/${VDRPLUGIN}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+	epatch "${FILESDIR}/vdr-skincurses-0.1.7-gcc46.patch"
+}