From 00f7abc576af26f96728b28e40eab5c704c6c341 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 3 Jun 2010 15:00:38 +0000 Subject: [PATCH] - rel 3 - fix building with latest gcc/g++ Changed files: alsaplayer-g++.patch -> 1.1 alsaplayer.spec -> 1.102 --- alsaplayer-g++.patch | 20 ++++++++++++++++++++ alsaplayer.spec | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 alsaplayer-g++.patch diff --git a/alsaplayer-g++.patch b/alsaplayer-g++.patch new file mode 100644 index 0000000..f680ad6 --- /dev/null +++ b/alsaplayer-g++.patch @@ -0,0 +1,20 @@ +--- alsaplayer-0.99.80/input/flac/FlacPlugin.cpp.orig 2007-10-29 22:00:16.000000000 +0100 ++++ alsaplayer-0.99.80/input/flac/FlacPlugin.cpp 2010-06-03 16:59:52.987826407 +0200 +@@ -239,7 +239,7 @@ + else + { + // use stream name +- char * fname = strrchr (f->name ().c_str (), '/'); ++ char * fname = (char *)strrchr (f->name ().c_str (), '/'); + if (fname) + { + fname++; +@@ -270,7 +270,7 @@ + if (strncmp(name, "http://", 7) == 0) { + return 0.0; + } +- char *ext = strrchr(name, '.'); ++ char *ext = (char *)strrchr(name, '.'); + if (!ext) + return 0.0; + ext++; diff --git a/alsaplayer.spec b/alsaplayer.spec index 4d9c376..3ce3674 100644 --- a/alsaplayer.spec +++ b/alsaplayer.spec @@ -10,7 +10,7 @@ Summary: Alsaplayer - CD/FLAC/MOD/MP3/Ogg/WAV player Summary(pl.UTF-8): Alsaplayer - odtwarzacz CD/FLAC/MOD/MP3/Ogg/WAV Name: alsaplayer Version: 0.99.80 -Release: 2 +Release: 3 License: GPL v3+ Group: Applications/Sound Source0: http://www.alsaplayer.org/%{name}-%{version}.tar.bz2 @@ -18,6 +18,7 @@ Source0: http://www.alsaplayer.org/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Patch0: %{name}-docs.patch +Patch1: %{name}-g++.patch URL: http://www.alsaplayer.org/ BuildRequires: OpenGL-devel BuildRequires: alsa-lib-devel @@ -378,6 +379,7 @@ Biblioteka statyczna Alsaplayera. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build rm -f missing -- 2.44.0