Hello community,
here is the log from the commit of package kaffeine for openSUSE:Factory
checked in at 2012-04-12 09:27:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kaffeine (Old)
and /work/SRC/openSUSE:Factory/.kaffeine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kaffeine", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kaffeine/kaffeine.changes 2012-02-29
14:08:04.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kaffeine.new/kaffeine.changes 2012-04-12
09:27:58.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 2 21:31:27 UTC 2012 - dims...@opensuse.org
+
+- Add kaffeine-gcc47.patch: Fix build with gcc 4.7.
+
+-------------------------------------------------------------------
New:
----
kaffeine-gcc47.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kaffeine.spec ++++++
--- /var/tmp/diff_new_pack.JYVEph/_old 2012-04-12 09:28:01.000000000 +0200
+++ /var/tmp/diff_new_pack.JYVEph/_new 2012-04-12 09:28:01.000000000 +0200
@@ -39,6 +39,8 @@
Patch5: support_mimetypes_bnc671581.diff
# PATCH-FIX-UPSTREAM
Patch6: crash-on-resume-fix.patch
+# PATCH-FIX-UPSTREAM kaffeine-gcc47.patch dims...@opensuse.org -- Fix build
with gcc 4.7
+Patch7: kaffeine-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libkde4-devel
@@ -71,6 +73,7 @@
%patch5
%endif
%patch6 -p1
+%patch7
%build
%cmake_kde4 -d build
++++++ kaffeine-gcc47.patch ++++++
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) &&
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
