[kaffeine] Patch for gcc6 and cmake changes

[Leigh Scott]

commit ed8b668fc05a7f626d5d34e779f58be200b7884c
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Jun 27 07:57:17 2016 +0100

    Patch for gcc6 and cmake changes

 kaffeine-1.2.2-cmake.patch | 11 +++++++++++
 kaffeine-1.2.2-gcc6.patch  | 32 ++++++++++++++++++++++++++++++++
 kaffeine.spec              | 11 +++++++++--
 3 files changed, 52 insertions(+), 2 deletions(-)
---
diff --git a/kaffeine-1.2.2-cmake.patch b/kaffeine-1.2.2-cmake.patch
new file mode 100644
index 0000000..13a89fb
--- /dev/null
+++ b/kaffeine-1.2.2-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,7 @@
+   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)
+
diff --git a/kaffeine-1.2.2-gcc6.patch b/kaffeine-1.2.2-gcc6.patch
new file mode 100644
index 0000000..f52e102
--- /dev/null
+++ b/kaffeine-1.2.2-gcc6.patch
@@ -0,0 +1,32 @@
+--- a/src/dvb/dvbdevice.cpp
++++ b/src/dvb/dvbdevice.cpp
+@@ -353,8 +353,8 @@
+ 
+ 	switch (config->configuration) {
+ 	case DvbConfigBase::DiseqcSwitch: {
+-		char cmd[] = { 0xe0, 0x10, 0x38, 0x00 };
+-		cmd[3] = 0xf0 | (config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
++		char cmd[] = { char(0xe0), 0x10, 0x38, 0x00 };
++		cmd[3] = 0xf0 | char(config->lnbNumber << 2) | (horPolar ? 2 : 0) | (highBand ? 1 : 0);
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 
+@@ -399,7 +399,7 @@
+ 			value |= 0xd000;
+ 		}
+ 
+-		char cmd[] = { 0xe0, 0x31, 0x6e, (value / 256), (value % 256) };
++		char cmd[] = { char(0xe0), 0x31, 0x6e, char(value / 256), char(value % 256) };
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 		moveRotor = true;
+@@ -407,7 +407,7 @@
+ 	    }
+ 
+ 	case DvbConfigBase::PositionsRotor: {
+-		char cmd[] = { 0xe0, 0x31, 0x6b, config->lnbNumber };
++		char cmd[] = { char(0xe0), 0x31, 0x6b, char(config->lnbNumber) };
+ 		backend->sendMessage(cmd, sizeof(cmd));
+ 		usleep(15000);
+ 		moveRotor = true;
+
diff --git a/kaffeine.spec b/kaffeine.spec
index d7a65c6..41bcbe9 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,6 +1,6 @@
 Name:    kaffeine
 Version: 1.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
@@ -14,6 +14,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://commits.kde.org/kaffeine/2da9df1e67004c3cfa879578c351300a99f23da1
 Patch100: kaffeine-1.2.2-gcc47.patch
 
+Patch101: kaffeine-1.2.2-gcc6.patch
+Patch102: kaffeine-1.2.2-cmake.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
@@ -33,7 +36,8 @@ Kaffeine is a KDE media player.
 %prep
 %setup -q -n kaffeine-%{version}
 %patch100 -p1 -b .gcc47
-
+%patch101 -p1 -b .gcc6
+%patch102 -p1 -b .cmake
 
 %build
 mkdir -p %{_target_platform}
@@ -92,6 +96,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 
 %changelog
+* Mon Jun 27 2016 Leigh Scott <leigh123linux at googlemail.com> - 1.2.2-9
+- Patch for gcc6 and cmake changes
+
 * Sun Aug 31 2014 Sérgio Basto <sergio at serjux.com> - 1.2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild