Added patch to fix building with gcc 4.7, wrt bug 424057

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 55 insertions, 6 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index b8e2e3c25472..3dfc4e1e0cad 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kaffeine
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.122 2011/06/01 19:49:53 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.123 2012/06/30 01:20:52 creffett Exp $
+
+  30 Jun 2012; <creffett@gentoo.org> kaffeine-1.2.2.ebuild,
+  +files/kaffeine-1.2.2-gcc4.7.patch:
+  Added patch to fix building with gcc 4.7, wrt bug 424057
 
   01 Jun 2011; Brent Baude <ranger@gentoo.org> kaffeine-1.2.2.ebuild:
   Marking kaffeine-1.2.2 ppc stable for bug 354033
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 9fd64bb2516d..2bc6c8008d21 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kaffeine-1.2.2-gcc4.7.patch 1480 RMD160 8c5b0d6f974c182b6ed6ae968c536b2a78207c3b SHA1 7f15f0997314800d4690327f126f98f587ca752a SHA256 2b60cdd57c446233c2f010270d3b09a222f5d3b0707204d3d3f07635a924ce33
 DIST kaffeine-1.2.2.tar.gz 489727 RMD160 a432de95b0808e85f0467d1745d216559f10e9a3 SHA1 5ba44be69995d24159a185ede3b9a00959ae2ed6 SHA256 b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb
-EBUILD kaffeine-1.2.2.ebuild 990 RMD160 a936660fbe1c04798b099b1e584db198ad1fb3b5 SHA1 a3117a6b6a2b4f167a39289d1591c5754f9cb095 SHA256 34ed9e182089d3a73605ad05aca30830b11f134e5dfe8d9f0385c2f19e9beb63
-MISC ChangeLog 18196 RMD160 d43dddc7e40c30e0c8c1187014b5acf5ce5fe0d7 SHA1 157d0789644542661d25e720385cd563856e3ca3 SHA256 e6948334ab4b83409e33daf28ab9adc618c30b75670d2c36c29fb180bb35eba2
+EBUILD kaffeine-1.2.2.ebuild 1044 RMD160 a479af3dde61f9f13f6419bc3406555af091fe5c SHA1 4ab7443af0298cc6bb7c390cd4b9a865d3baaec9 SHA256 f1c31046334d092c22d98ac805aac946e4a07d6893d701ad58d16ce17f49b7cb
+MISC ChangeLog 18356 RMD160 8ec4e51d2600079f5144cd26827b0dc7f7d91313 SHA1 4c1852d2511c390cf2586831cbc557ea982674e2 SHA256 12b4f44f73938cd9b1d87e8beb7a5cdd946b338dacd9b0573e8f23f86efa0d8e
 MISC metadata.xml 301 RMD160 5424abb33cb1576f2742e6bbd75fa370c40214d1 SHA1 ce66e4b54d1cd620faddeacacceac59b5ede47ed SHA256 76010afeff62952f70b9b598778d4d198eabd1ec9e233902acd2c4019911745a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk/uVHsACgkQ23laikJhg1Sx5wCfaQucXiLol5RMtCwPM7RVD3CU
+bbMAnikxXkCB5+lDASoYKS7tCbgaqCvC
+=LvLI
+-----END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch b/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch
new file mode 100644
index 000000000000..e74563e0bc67
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch
@@ -0,0 +1,32 @@
+commit 2da9df1e67004c3cfa879578c351300a99f23da1
+Author: Christoph Pfister <christophpfister@gmail.com>
+Date:   Wed Apr 4 21:22:09 2012 +0200
+
+    fix build for gcc 4.7
+
+diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
+index 7fc8f68..e70d8b8 100644
+--- a/src/dvb/dvbepg.cpp
++++ b/src/dvb/dvbepg.cpp
+@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
+ 	// 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
+ 	QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
+ 
+-	for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
+-	     --entryCount, entry.advance()) {
++	for (AtscEitSectionEntry eitEntry = eitSection.entries();
++	     (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
+ 		DvbEpgEntry epgEntry;
+ 		epgEntry.channel = channel;
+-		epgEntry.begin = baseDateTime.addSecs(entry.startTime());
+-		epgEntry.duration = QTime().addSecs(entry.duration());
+-		epgEntry.title = entry.title();
++		epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
++		epgEntry.duration = QTime().addSecs(eitEntry.duration());
++		epgEntry.title = eitEntry.title();
+ 
+-		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
++		quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
+ 		DvbSharedEpgEntry entry = epgEntries.value(id);
+ 
+ 		if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/media-video/kaffeine/kaffeine-1.2.2.ebuild b/media-video/kaffeine/kaffeine-1.2.2.ebuild
index 9595a6ec475b..ff5f1a23bb8a 100644
--- a/media-video/kaffeine/kaffeine-1.2.2.ebuild
+++ b/media-video/kaffeine/kaffeine-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2.ebuild,v 1.4 2011/06/01 19:49:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-1.2.2.ebuild,v 1.5 2012/06/30 01:20:52 creffett Exp $
 
 EAPI=4
 
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( Changelog NOTES )
 
+PATCHES=( "${FILESDIR}/${PN}-1.2.2-gcc4.7.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_build debug DEBUG_MODULE)