diff options
| author |   Chris Reffett <creffett@gentoo.org> | 2012-06-30 01:20:52 +0000 |
|---|---|---|
| committer | Chris Reffett <creffett@gentoo.org> | 2012-06-30 01:20:52 +0000 |
| commit | de34eb242f71a3c1a7f4f8bcffa858f63b87c85e (patch) | |
| tree | 9bec788d0522770e9c258ea1fe610a5e70a7d692 | |
| parent | initial commit (diff) | |
| download | gentoo-2-de34eb242f71a3c1a7f4f8bcffa858f63b87c85e.tar.gz gentoo-2-de34eb242f71a3c1a7f4f8bcffa858f63b87c85e.tar.bz2 gentoo-2-de34eb242f71a3c1a7f4f8bcffa858f63b87c85e.zip | |
Added patch to fix building with gcc 4.7, wrt bug 424057
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
| -rw-r--r-- | media-video/kaffeine/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch | 32 | ||||
| -rw-r--r-- | media-video/kaffeine/kaffeine-1.2.2.ebuild | 6 |
3 files changed, 42 insertions, 4 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/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) |