From 616d52c4db10e6dd6c86ad79e1c395755414cd75389c217c9483300e842024b2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 12 Apr 2012 07:27:56 +0000 Subject: [PATCH] Accepting request 112293 from KDE:Distro:Factory Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already. (forwarded request 112292 from dimstar) OBS-URL: https://build.opensuse.org/request/show/112293 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=47 --- kaffeine-gcc47.patch | 26 ++++++++++++++++++++++++++ kaffeine.changes | 5 +++++ kaffeine.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 kaffeine-gcc47.patch diff --git a/kaffeine-gcc47.patch b/kaffeine-gcc47.patch new file mode 100644 index 0000000..db015c7 --- /dev/null +++ b/kaffeine-gcc47.patch @@ -0,0 +1,26 @@ +Index: src/dvb/dvbepg.cpp +=================================================================== +--- src/dvb/dvbepg.cpp.orig ++++ src/dvb/dvbepg.cpp +@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(co + // 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 AESentry = eitSection.entries(); (entryCount > 0) && AESentry.isValid(); ++ --entryCount, AESentry.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(AESentry.startTime()); ++ epgEntry.duration = QTime().addSecs(AESentry.duration()); ++ epgEntry.title = AESentry.title(); + +- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); ++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(AESentry.eventId())); + DvbSharedEpgEntry entry = epgEntries.value(id); + + if (entry.isValid() && (entry->channel == epgEntry.channel) && diff --git a/kaffeine.changes b/kaffeine.changes index 905e1ec..6a137b0 100644 --- a/kaffeine.changes +++ b/kaffeine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 2 21:31:27 UTC 2012 - dimstar@opensuse.org + +- Add kaffeine-gcc47.patch: Fix build with gcc 4.7. + ------------------------------------------------------------------- Tue Feb 28 11:27:56 CET 2012 - jslaby@suse.de diff --git a/kaffeine.spec b/kaffeine.spec index e07c7b2..140e48d 100644 --- a/kaffeine.spec +++ b/kaffeine.spec @@ -39,6 +39,8 @@ Patch4: build-fix.diff Patch5: support_mimetypes_bnc671581.diff # PATCH-FIX-UPSTREAM Patch6: crash-on-resume-fix.patch +# PATCH-FIX-UPSTREAM kaffeine-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7 +Patch7: kaffeine-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libkde4-devel @@ -71,6 +73,7 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards. %patch5 %endif %patch6 -p1 +%patch7 %build %cmake_kde4 -d build