gcc-4.3.x compile fix added; thx to Arrtu Valo on bug 255873

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.21-xen-main-r1 i686

5 files changed, 94 insertions, 9 deletions

diff --git a/media-plugins/vdr-xxvautotimer/ChangeLog b/media-plugins/vdr-xxvautotimer/ChangeLog
index ad91868421b1..f8a195bbf174 100644
--- a/media-plugins/vdr-xxvautotimer/ChangeLog
+++ b/media-plugins/vdr-xxvautotimer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-xxvautotimer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/ChangeLog,v 1.1 2008/03/22 18:27:10 hd_brummy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/ChangeLog,v 1.2 2009/01/24 13:35:38 hd_brummy Exp $
+
+  24 Jan 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-xxvautotimer-0.1.2_compile-warn.diff,
+  +files/vdr-xxvautotimer-0.1.2_gcc-4.3.x.diff,
+  vdr-xxvautotimer-0.1.2.ebuild:
+  gcc-4.3.x compile fix added; thx to Arrtu Valo on bug 255873
 
 *vdr-xxvautotimer-0.1.2 (22 Mar 2008)
 
diff --git a/media-plugins/vdr-xxvautotimer/Manifest b/media-plugins/vdr-xxvautotimer/Manifest
index 2817bfd053c8..2f269735ac98 100644
--- a/media-plugins/vdr-xxvautotimer/Manifest
+++ b/media-plugins/vdr-xxvautotimer/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 AUX confd 334 RMD160 14a9f4513062e69356bd81fe17587559b31c7274 SHA1 c67be9f2f049941a5db84ff7b20819fcea1ee52a SHA256 8e24b547076cd8476120af6700776f9d3d9dabeb76b2d827bbd7b7cb45eaac16
 AUX rc-addon.sh 322 RMD160 ccddd6006d4ba3e76be6005395399b9b72855ca5 SHA1 f3927335fedeb2b86e185cd88ac5ea5d77f30bb6 SHA256 1c3b044078d49140f9ff67e587bd462a62608c46e3bf74adbc8c86749930ca1b
+AUX vdr-xxvautotimer-0.1.2_compile-warn.diff 1046 RMD160 917c2d940e3eb45ff8d760a5fd8079e47e806dc7 SHA1 bf172e93c3b15ebadc9ee2d071f3fb5fccd5ef95 SHA256 5c8d7f783904cc02c8552e941fad962345f5aa0a0f80a4d7621731586f7f8895
+AUX vdr-xxvautotimer-0.1.2_gcc-4.3.x.diff 1289 RMD160 b80a9f4a9b988230a04483dbde11fb5a568bbfca SHA1 ceccd10888aac8b3fbc13e7ec1b23b0789043a98 SHA256 a9331b4c43eddc6bc7e31fd016608f90bc459587281f8e7e98a07c0531a56099
 DIST vdr-xxvautotimer-0.1.2.tgz 52457 RMD160 40c9f7c730c3a2730af74fcdeab3462c6ab5d629 SHA1 7d49348e64b1ffdad1c2366735cb401d0396f6f4 SHA256 464a394a83d5ac71e954496f456b0d701bfac0c5a550fa2b16a5367fcb3936f2
-EBUILD vdr-xxvautotimer-0.1.2.ebuild 675 RMD160 8981fa1384f57c7c5bb21c84e8a0b8c51e7a0125 SHA1 caa8e1765adaaf457da0c23d8562ad44220b284a SHA256 d3d854698887b7674f575daf7f74870e6f55867c43654eb439da610fde1c7664
-MISC ChangeLog 463 RMD160 510a522dc15ff33e4de6cb431d23be427c079364 SHA1 384cfa6ec52d0915cca33fbcbe624b170d294db2 SHA256 dd9e5017750f38c6cde60de8e2541cedd7ef15bf6d1d21afbf090a3b924e249f
+EBUILD vdr-xxvautotimer-0.1.2.ebuild 759 RMD160 dca6cb293105f4f1d610fe95d62b24ba295d4a6c SHA1 ab78ba50834386fdb1630bb54f49b6008c229540 SHA256 bb9bb1e0a26469154b8c79b5f3688e5945a19f2dd5b295ccde22d397d898d381
+MISC ChangeLog 714 RMD160 5c8bb11d781ccf405b32a6271101baedae25e739 SHA1 4151e7ef183c0635f1f0bb578821881b22caea84 SHA256 9757bad375cecf5eea63584098c1186e449f329dd1777de860593c9b8d51257a
 MISC metadata.xml 261 RMD160 5492467546275b17a36bea7c8d1d653e7597e626 SHA1 a27c0bf97b3058f45e3a53a52bc7cfa61a4e0211 SHA256 0f6cdaca412d6fadb859b73b4f872d707040f27369f4dbcbd8f62b0629b864a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFH5U+Sdn07HTTCgIoRApuSAKCzl7DOImdLY892dfU/lysRRjtzLwCfbMgx
-3/5rlDAFAAO/UAHNyT82GS0=
-=2jv3
+iD8DBQFJexk7dn07HTTCgIoRArtEAJ4uOdPxQhROK09ORIBj8NWJ8vfO0ACfdDDA
+pnjF0/sClrSeOCuROWvjbfk=
+=W0FW
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_compile-warn.diff b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_compile-warn.diff
new file mode 100644
index 000000000000..56ba37f08a57
--- /dev/null
+++ b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_compile-warn.diff
@@ -0,0 +1,37 @@
+diff -Naur xxvautotimer-0.1.2.orig/setup.h xxvautotimer-0.1.2/setup.h
+--- xxvautotimer-0.1.2.orig/setup.h 2009-01-24 13:24:34.245788686 +0100
++++ xxvautotimer-0.1.2/setup.h  2009-01-24 13:25:52.750838304 +0100
+@@ -22,19 +22,19 @@
+ class cXxvAutotimerSetup
+ {
+ public:
+-    char *allowed;
+-    char *strHost;
+-    char *strTelnetPort;
+-    char *strDatabase;
+-    char *strDatabasePort;
+-    char *strDatabaseUser;
+-    char *strDatabasePasswd;
+-    char *strLifetime;
+-    char *strPriority;
+-    char *strPrevMinutes;
+-    char *strAfterMinutes;
+-    char *strXXV020;
+-    char *strDefaultDone;
++    const char *allowed;
++    const char *strHost;
++    const char *strTelnetPort;
++    const char *strDatabase;
++    const char *strDatabasePort;
++    const char *strDatabaseUser;
++    const char *strDatabasePasswd;
++    const char *strLifetime;
++    const char *strPriority;
++    const char *strPrevMinutes;
++    const char *strAfterMinutes;
++    const char *strXXV020;
++    const char *strDefaultDone;
+
+     char host[50];
+     int  telnetPort;
+
diff --git a/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.3.x.diff b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.3.x.diff
new file mode 100644
index 000000000000..77e082bfd003
--- /dev/null
+++ b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.3.x.diff
@@ -0,0 +1,37 @@
+http://bugs.gentoo.org/show_bug.cgi?id=255873
+diff -Naur xxvautotimer-0.1.2.orig/inifile.cpp xxvautotimer-0.1.2/inifile.cpp
+--- xxvautotimer-0.1.2.orig/inifile.cpp 2009-01-24 12:55:58.165959458 +0100
++++ xxvautotimer-0.1.2/inifile.cpp  2009-01-24 12:58:41.539432919 +0100
+@@ -43,6 +43,9 @@
+ #include <stdarg.h>
+ #include <fstream>
+ #include <float.h>
++#include <cstdlib>
++#include <cstring>
++#include <climits>
+
+ #ifdef WIN32
+ #include <windows.h>
+diff -Naur xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/enum_t.h xxvautotimer-0.1.2/mysqlwrapped-1.4/enum_t.h
+--- xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/enum_t.h   2009-01-24 12:55:58.165959458 +0100
++++ xxvautotimer-0.1.2/mysqlwrapped-1.4/enum_t.h    2009-01-24 12:57:48.299275050 +0100
+@@ -22,6 +22,7 @@
+
+ #include <string>
+ #include <map>
++#include <cstring>
+ #ifdef WIN32
+ #include <config-win.h>
+ #include <mysql.h>
+diff -Naur xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/SysLog.cpp xxvautotimer-0.1.2/mysqlwrapped-1.4/SysLog.cpp
+--- xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/SysLog.cpp 2009-01-24 12:55:58.165959458 +0100
++++ xxvautotimer-0.1.2/mysqlwrapped-1.4/SysLog.cpp  2009-01-24 12:57:14.999276857 +0100
+@@ -25,6 +25,7 @@
+
+ #include <mysql/mysql.h>
+ #include <syslog.h>
++#include <cstring>
+
+ #include "Database.h"
+ #include "Query.h"
+ 
diff --git a/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild b/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild
index e16b9e226d79..b4860be1c927 100644
--- a/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild
+++ b/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild,v 1.1 2008/03/22 18:27:10 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2.ebuild,v 1.2 2009/01/24 13:35:38 hd_brummy Exp $
 
 inherit vdr-plugin
 
@@ -17,6 +17,9 @@ DEPEND=">=media-video/vdr-1.3.0"
 
 RDEPEND=">=net-www/xxv-0.30"
 
+PATCHES=("${FILESDIR}/${P}_gcc-4.3.x.diff"
+		"${FILESDIR}/${P}_compile-warn.diff")
+
 src_unpack() {
 	vdr-plugin_src_unpack