[packages/peercast] - fix compilation and linking - rel 3

baggins baggins at pld-linux.org
Tue Jan 28 01:19:18 CET 2014


commit 0f55d3921669b042d11674eff8c1cef1fcd68b35
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 28 01:19:04 2014 +0100

    - fix compilation and linking
    - rel 3

 peercast.spec  |  7 +++++--
 typeconv.patch | 11 +++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/peercast.spec b/peercast.spec
index 7cacad3..328cc0e 100644
--- a/peercast.spec
+++ b/peercast.spec
@@ -2,7 +2,7 @@ Summary:	PeerCast: a peer-to-peer streaming client/server
 Summary(pl.UTF-8):	PeerCast: klient/serwer strumieni w systemie peer-to-peer
 Name:		peercast
 Version:	0.1217
-Release:	2
+Release:	3
 License:	GPL
 Group:		Applications/Multimedia
 Source0:	http://www.peercast.org/src/%{name}-%{version}-src.tgz
@@ -12,6 +12,7 @@ Patch1:		%{name}-ini-location.patch
 Patch2:		%{name}-amd64.patch
 Patch3:		%{name}-makefile.patch
 Patch4:		%{name}-paths.patch
+Patch5:		typeconv.patch
 URL:		http://www.peercast.org/
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,12 +42,14 @@ find '(' -name '*.cpp' -o -name '*.h' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__make} -C ui/linux \
 	CC="%{__cc}" \
 	CPPFLAGS="%{rpmcxxflags} -D_UNIX" \
-	LDFLAGS="%{rpmldflags} -lpthread"
+	LDFLAGS="%{rpmldflags}" \
+	LIBS="-lpthread"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/typeconv.patch b/typeconv.patch
new file mode 100644
index 0000000..303f9e1
--- /dev/null
+++ b/typeconv.patch
@@ -0,0 +1,11 @@
+--- peercast-0.1217/core/common/sys.cpp~	2014-01-28 01:13:04.000000000 +0100
++++ peercast-0.1217/core/common/sys.cpp	2014-01-28 01:14:48.850115210 +0100
+@@ -745,7 +745,7 @@
+ 	if (!str)
+ 		return NULL;
+ 
+-	char *s = strstr(str,arg);
++	char *s = strstr((char *)str,arg);
+ 
+ 	if (!s)
+ 		return NULL;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/peercast.git/commitdiff/0f55d3921669b042d11674eff8c1cef1fcd68b35



More information about the pld-cvs-commit mailing list