diff options
author | Johannes Huber <johu@gentoo.org> | 2016-07-21 20:31:22 +0200 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2016-07-21 20:31:36 +0200 |
commit | d3f06d1312feae858ad63293e326ab3de74f14a3 (patch) | |
tree | 12b7eaa2451df1818e7f8147aad6b990a7a2f20a /media-video/kaffeine/files | |
parent | kde-base/kdeplasma-addons: Remove 4.14.3 (r0) (diff) | |
download | gentoo-d3f06d1312feae858ad63293e326ab3de74f14a3.tar.gz gentoo-d3f06d1312feae858ad63293e326ab3de74f14a3.tar.bz2 gentoo-d3f06d1312feae858ad63293e326ab3de74f14a3.zip |
media-video/kaffeine: Remove slot 4
Package-Manager: portage-2.3.0
Diffstat (limited to 'media-video/kaffeine/files')
-rw-r--r-- | media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch | 32 | ||||
-rw-r--r-- | media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch | 26 |
2 files changed, 0 insertions, 58 deletions
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 deleted file mode 100644 index e74563e0bc67..000000000000 --- a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/files/kaffeine-1.3.1-cmake34.patch b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch deleted file mode 100644 index a8c31f19f69f..000000000000 --- a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Thu, 26 Nov 2015 15:36:26 +0100 -Subject: [PATCH] Explicitly include CheckIncludeFiles. - -This fixes the build with CMake 3.4.0. We were calling check_include_files() -and implicitly relying on CheckIncludeFiles being included. ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d9be8db..b74b44d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,6 +21,7 @@ if(STRICT_BUILD) - -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS) - endif(STRICT_BUILD) - -+include(CheckIncludeFiles) - check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB) - - if(NOT HAVE_DVB) --- -2.4.10 - |