[SCM] kaffeine packaging branch, master, updated. debian/1.2.2-4-8-gb3f84d0

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=53158bb

The following commit has been merged in the master branch:
commit 53158bb96ca67cbb244547c6fa1477009c5d6c19
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jun 8 20:46:17 2016 +0200

    update the patches
    
    - ftbfs_gcc47.diff: drop, fixed upstream
    - upstream_Explicitly-include-CheckIncludeFiles.patch: drop, backported
      from upstream
---
 debian/changelog                                   |  4 ++++
 debian/patches/ftbfs_gcc47.diff                    | 28 ----------------------
 debian/patches/series                              |  2 --
 ...ream_Explicitly-include-CheckIncludeFiles.patch | 21 ----------------
 4 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 957670c..8cad70b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ kaffeine (2.0.2-0r1) UNRELEASED; urgency=medium
     - replace the libxine2-dev build dependency with libvlc-dev
     - stop using the xine dh addon
     - do not use the ${xine-ffmpeg:Depends} and ${xine-x:Depends} substvars
+  * Update the patches:
+    - ftbfs_gcc47.diff: drop, fixed upstream
+    - upstream_Explicitly-include-CheckIncludeFiles.patch: drop, backported
+      from upstream
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 08 Jun 2016 20:25:35 +0200
 
diff --git a/debian/patches/ftbfs_gcc47.diff b/debian/patches/ftbfs_gcc47.diff
deleted file mode 100644
index 962947b..0000000
--- a/debian/patches/ftbfs_gcc47.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Christoph Pfister <christophpfister at gmail.com>
-Origin: http://quickgit.kde.org/?p=kaffeine.git&a=commitdiff&h=2da9df1e
-Description: fix build for gcc 4.7
---- a/src/dvb/dvbepg.cpp
-+++ b/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 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/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 69b4b1d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-ftbfs_gcc47.diff
-upstream_Explicitly-include-CheckIncludeFiles.patch
diff --git a/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch b/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
deleted file mode 100644
index aa67461..0000000
--- a/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001
-From: Raphael Kubo da Costa <rakuco at 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(+)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,6 +11,7 @@ if(DEFINED QT_VERSION_MAJOR)
-   add_definitions(-DQT_STRICT_ITERATORS)
- endif(DEFINED QT_VERSION_MAJOR)
- 
-+include(CheckIncludeFiles)
- check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
- 
- if(NOT HAVE_DVB)

-- 
kaffeine packaging