Hello community, here is the log from the commit of package chromium-bsu for openSUSE:Factory checked in at 2016-06-29 15:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chromium-bsu (Old) and /work/SRC/openSUSE:Factory/.chromium-bsu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "chromium-bsu" Changes: -------- --- /work/SRC/openSUSE:Factory/chromium-bsu/chromium-bsu.changes 2014-11-28 08:48:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chromium-bsu.new/chromium-bsu.changes 2016-06-29 15:10:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 24 18:25:08 UTC 2016 - i@marguerite.su + +- add patch: chromium-bsu-0.9.15.1-gcc6.patch + * fix boo#985196 + * fix call of overloaded 'abs(float&)' is ambiguous + +------------------------------------------------------------------- New: ---- chromium-bsu-0.9.15.1-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chromium-bsu.spec ++++++ --- /var/tmp/diff_new_pack.jOlt2e/_old 2016-06-29 15:10:41.000000000 +0200 +++ /var/tmp/diff_new_pack.jOlt2e/_new 2016-06-29 15:10:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package chromium-bsu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,20 +23,23 @@ License: ClArtistic and MIT Group: Amusements/Games/Action/Shoot Url: http://sourceforge.net/projects/chromium-bsu/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # hiscore patch -Patch0: %{name}-%{version}-src_HiScore.cpp.patch -%if 0%{?suse_version} -BuildRequires: fdupes -BuildRequires: hicolor-icon-theme -BuildRequires: update-desktop-files -%endif +Patch: %{name}-%{version}-src_HiScore.cpp.patch +#PATCH-FIX-UPSTREAM marguerite@opensuse.org - gcc6: call of overloaded 'abs(float&)' is ambiguous +Patch1: %{name}-%{version}-gcc6.patch BuildRequires: dejavu-fonts BuildRequires: gcc-c++ BuildRequires: libGLC-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(SDL_image) BuildRequires: pkgconfig(freealut) BuildRequires: pkgconfig(sdl) +%if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +%endif %description Chromium B.S.U. is a fast paced, arcade-style, top-scrolling space shooter. @@ -48,14 +51,15 @@ %prep %setup -q -%patch0 +%patch +%patch1 -p1 %build %configure --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install rm -f %{buildroot}/%{name}-%{version}/data/doc/Makefile* rm -f %{buildroot}/%{name}-%{version}/data/doc/images/Makefile* ++++++ chromium-bsu-0.9.15.1-gcc6.patch ++++++ Index: b/src/MainSDL_Event.cpp =================================================================== --- a/src/MainSDL_Event.cpp +++ b/src/MainSDL_Event.cpp @@ -19,6 +19,7 @@ #include <cstdlib> #include <cstdio> #include <cstring> +#include <cmath> #include "Config.h" @@ -417,14 +418,14 @@ void MainSDL::keyMove() #else Uint8 *keystate = SDL_GetKeyState(NULL); #endif - if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4; - if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4; - if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4; - if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4; - if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } - if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; } + if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4; + if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + std::abs(key_speed_x)*0.4; + if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4; + if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + std::abs(key_speed_y)*0.4; + if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4; key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + std::abs(key_speed_x)*0.4; key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + std::abs(key_speed_x)*0.4; key_speed_y += 2.0 + std::abs(key_speed_y)*0.4; } + if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4; key_speed_y += 2.0 + std::abs(key_speed_y)*0.4; } //float s = (1.0-game->speedAdj)+(game->speedAdj*0.7); float s = 0.7; key_speed_x *= s;