pool/kaffeine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 403110 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Add kaffeine-gcc6.patch to fix build with gcc6 (boo#985371)

OBS-URL: https://build.opensuse.org/request/show/403110
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=9
This commit is contained in:
Raymond Wooninck 2016-06-17 19:10:07 +00:00 committed by Git OBS Bridge
parent e1d8e4d5bc
commit 34c08c1bbd
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kaffeine-gcc6.patch Normal file
View File

@ -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;

5
kaffeine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 17 18:57:21 UTC 2016 - wbauer@tmo.at
- Add kaffeine-gcc6.patch to fix build with gcc6 (boo#985371)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 24 11:47:17 UTC 2016 - cgiboudeaux@gmx.com Wed Feb 24 11:47:17 UTC 2016 - cgiboudeaux@gmx.com

3
kaffeine.spec
View File

@ -45,6 +45,8 @@ Patch7: kaffeine-gcc47.patch
Patch8: support_for_sundtek_tv_tuners.patch Patch8: support_for_sundtek_tv_tuners.patch
#PATCH-FIX-UPSTREAM kaffeine-cmake34.patch -- Include files containing the functions used by the build system #PATCH-FIX-UPSTREAM kaffeine-cmake34.patch -- Include files containing the functions used by the build system
Patch9: kaffeine-cmake34.patch Patch9: kaffeine-cmake34.patch
# PATCH-FIX-UPSTREAM kaffeine-gcc6.patch boo#985371 wbauer@tmo.at -- fix build with gcc6
Patch10: kaffeine-gcc6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libkde4-devel BuildRequires: libkde4-devel
@ -82,6 +84,7 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
%patch7 %patch7
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%build %build
%cmake_kde4 -d build %cmake_kde4 -d build