Fix compilation with gcc-4.4. Patch by Victor Ostorga <vostorga AT gentoo DOT org>; bug #272514

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 32 insertions, 9 deletions

diff --git a/media-plugins/vdr-xxvautotimer/ChangeLog b/media-plugins/vdr-xxvautotimer/ChangeLog
index d50b4aa09f25..ce601a0bdec4 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/ChangeLog,v 1.4 2009/04/12 06:55:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/ChangeLog,v 1.5 2009/07/25 21:24:06 halcy0n Exp $
+
+  25 Jul 2009; Mark Loeser <halcy0n@gentoo.org>
+  vdr-xxvautotimer-0.1.2-r1.ebuild,
+  +files/vdr-xxvautotimer-0.1.2_gcc-4.4.diff:
+  Fix compilation with gcc-4.4. Patch by Victor Ostorga <vostorga AT gentoo
+  DOT org>; bug #272514
 
   12 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
   vdr-xxvautotimer-0.1.2.ebuild, vdr-xxvautotimer-0.1.2-r1.ebuild:
diff --git a/media-plugins/vdr-xxvautotimer/Manifest b/media-plugins/vdr-xxvautotimer/Manifest
index 5a7b3d01ba55..e9db9207964b 100644
--- a/media-plugins/vdr-xxvautotimer/Manifest
+++ b/media-plugins/vdr-xxvautotimer/Manifest
@@ -7,15 +7,16 @@ AUX vdr-1.5.7-gettext.diff 9452 RMD160 ee204592fc6aea6e95c36fb97bf7087244d0e502
 AUX vdr-xxvautotimer-0.1.2-makefile-fix.diff 492 RMD160 374b8b57b4b31d7c78641c329a86432997ec030a SHA1 8e018baf0c032245a53481fcfd35d4dfea0106d4 SHA256 41b82c70507cf3e63910a87dd8e4457e1cc812765db6e8aaa4d92315b69d901f
 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
+AUX vdr-xxvautotimer-0.1.2_gcc-4.4.diff 494 RMD160 3e0be9aae0d68ea0eb3951607d7c448434b41bdf SHA1 73ee6106c88ff9c404fffc9dc56c297292edc76b SHA256 615fe7c2bd8725315390d37b827114a62b170b222dbeacf4c6022d098603633a
 DIST vdr-xxvautotimer-0.1.2.tgz 52457 RMD160 40c9f7c730c3a2730af74fcdeab3462c6ab5d629 SHA1 7d49348e64b1ffdad1c2366735cb401d0396f6f4 SHA256 464a394a83d5ac71e954496f456b0d701bfac0c5a550fa2b16a5367fcb3936f2
-EBUILD vdr-xxvautotimer-0.1.2-r1.ebuild 835 RMD160 c142a9281f7fac7b167ef8d845b639a3b115758f SHA1 3458435f319521fade4c0480567bf0e16311500c SHA256 2c5d2fb6f60d6f5e0c2aa50f6d08c436f2d49abdc19c9ed47e0ae1a5eb0b74b4
+EBUILD vdr-xxvautotimer-0.1.2-r1.ebuild 873 RMD160 e1fd999fbdcb182aa8d71e1486aee453e3c28c76 SHA1 f19e27b7adf1a6354025d3800abf9e2dd8eebb51 SHA256 7a96a187995f50b922f3707d9bc79fafd251f00942ce7a16eabf7a927adf6c16
 EBUILD vdr-xxvautotimer-0.1.2.ebuild 754 RMD160 e284375ca784440be41d39743a659a6623ede590 SHA1 0322de5fb9384ee172a4900f35d0bf7bbd890d2d SHA256 150b7026c17bda287200b051ea17df67ef94d2498c30ea6e483c44acaa34b1ba
-MISC ChangeLog 1182 RMD160 a0e1aca8d378f58b092da03b1259fe2a969533ae SHA1 21cb1c1361ba3c0cf3ef14f3718aa92e38d8d08e SHA256 a34f25991dcab0ab30bc70e3fb192025ef1c52becd1f87ab856fcaf37a83f142
+MISC ChangeLog 1417 RMD160 d4ae71b0e0669ce69390c3a307083e6f78bdb1b0 SHA1 a5920c17e2957717ec7f0bbf04f7be3e1ea7bd1a SHA256 3de4ca1aea1bcc4c70913dbfbc1e3cdfb16b4a40ccc3fa01e65f3851cbbe82ec
 MISC metadata.xml 261 RMD160 5492467546275b17a36bea7c8d1d653e7597e626 SHA1 a27c0bf97b3058f45e3a53a52bc7cfa61a4e0211 SHA256 0f6cdaca412d6fadb859b73b4f872d707040f27369f4dbcbd8f62b0629b864a9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknhkNQACgkQOeoy/oIi7uzoVwCcD7XLRxOB6ERuPUTVTCUp1kqH
-sIQAnjWe4oXWqCKje7QD2DBIz/oCnTCn
-=ye0h
+iEYEARECAAYFAkprd/sACgkQCRZPokWLroRm2gCg0PbnBVG9eaTn/GiEZEsph5qH
+EykAnA/1LEMwFZ0FxSKVX+F7oZiiAyAS
+=2Axj
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.4.diff b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.4.diff
new file mode 100644
index 000000000000..fa3d4f5a9bd6
--- /dev/null
+++ b/media-plugins/vdr-xxvautotimer/files/vdr-xxvautotimer-0.1.2_gcc-4.4.diff
@@ -0,0 +1,15 @@
+diff -NrU5 xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/StderrLog.cpp xxvautotimer-0.1.2/mysqlwrapped-1.4/StderrLog.cpp
+--- xxvautotimer-0.1.2.orig/mysqlwrapped-1.4/StderrLog.cpp	2009-06-10 17:01:27.000000000 -0600
++++ xxvautotimer-0.1.2/mysqlwrapped-1.4/StderrLog.cpp	2009-06-10 17:04:09.000000000 -0600
+@@ -23,10 +23,11 @@
+ */
+ #ifdef _WIN32
+ #pragma warning(disable:4786)
+ #endif
+ 
++#include <cstdio>
+ #include <string>
+ #include <map>
+ #ifdef WIN32
+ #include <config-win.h>
+ #include <mysql.h>
diff --git a/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.ebuild b/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.ebuild
index 66a7ae38f52c..e9b7c7f3910f 100644
--- a/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.ebuild
+++ b/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.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/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.ebuild,v 1.2 2009/04/12 06:55:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xxvautotimer/vdr-xxvautotimer-0.1.2-r1.ebuild,v 1.3 2009/07/25 21:24:06 halcy0n Exp $
 
 inherit vdr-plugin
 
@@ -20,7 +20,8 @@ RDEPEND=">=www-misc/xxv-0.30"
 PATCHES=("${FILESDIR}/vdr-1.5.7-gettext.diff"
 		"${FILESDIR}/${P}_gcc-4.3.x.diff"
 		"${FILESDIR}/${P}_compile-warn.diff"
-		"${FILESDIR}/${P}-makefile-fix.diff")
+		"${FILESDIR}/${P}-makefile-fix.diff"
+		"${FILESDIR}/${P}_gcc-4.4.diff")
 
 src_unpack() {
 	vdr-plugin_src_unpack