rpms/svxlink/devel svxlink-080730-gcc44.patch, NONE, 1.1 svxlink.spec, 1.2, 1.3

Lucian Langa lucilanga at fedoraproject.org
Thu Feb 26 20:02:56 UTC 2009


Author: lucilanga

Update of /cvs/pkgs/rpms/svxlink/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30910

Modified Files:
	svxlink.spec 
Added Files:
	svxlink-080730-gcc44.patch 
Log Message:
* Thu Feb 26 2009 Lucian Langa <cooly at gnome.eu.org> - 080730-8
- patch to fix gcc44 issues

svxlink-080730-gcc44.patch:

--- NEW FILE svxlink-080730-gcc44.patch ---
diff -Naur svxlink-080730/async/audio/AsyncAudioDevice.h svxlink-080730-mod/async/audio/AsyncAudioDevice.h
--- svxlink-080730/async/audio/AsyncAudioDevice.h	2008-06-02 22:57:02.000000000 +0300
+++ svxlink-080730-mod/async/audio/AsyncAudioDevice.h	2009-02-26 21:33:26.000000000 +0200
@@ -37,6 +37,7 @@
  *
  ****************************************************************************/
 
+#include <stdint.h>
 #include <sigc++/sigc++.h>
 
 #include <string>
diff -Naur svxlink-080730/async/core/AsyncSerialDevice.cpp svxlink-080730-mod/async/core/AsyncSerialDevice.cpp
--- svxlink-080730/async/core/AsyncSerialDevice.cpp	2006-11-07 22:44:20.000000000 +0200
+++ svxlink-080730-mod/async/core/AsyncSerialDevice.cpp	2009-02-26 20:24:11.000000000 +0200
@@ -35,6 +35,7 @@
  *
  ****************************************************************************/
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff -Naur svxlink-080730/async/cpp/AsyncCppDnsLookupWorker.cpp svxlink-080730-mod/async/cpp/AsyncCppDnsLookupWorker.cpp
--- svxlink-080730/async/cpp/AsyncCppDnsLookupWorker.cpp	2009-02-26 21:23:34.000000000 +0200
+++ svxlink-080730-mod/async/cpp/AsyncCppDnsLookupWorker.cpp	2009-02-26 21:23:47.000000000 +0200
@@ -38,6 +38,7 @@
  *
  ****************************************************************************/
 
+#include <stdio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff -Naur svxlink-080730/async/demo/AsyncSerial_demo.cpp svxlink-080730-mod/async/demo/AsyncSerial_demo.cpp
--- svxlink-080730/async/demo/AsyncSerial_demo.cpp	2008-05-13 21:57:54.000000000 +0300
+++ svxlink-080730-mod/async/demo/AsyncSerial_demo.cpp	2009-02-26 21:39:11.000000000 +0200
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <iostream>
 #include <cstdlib>
 
diff -Naur svxlink-080730/echolib/EchoLinkStationData.cpp svxlink-080730-mod/echolib/EchoLinkStationData.cpp
--- svxlink-080730/echolib/EchoLinkStationData.cpp	2007-11-26 23:18:27.000000000 +0200
+++ svxlink-080730-mod/echolib/EchoLinkStationData.cpp	2009-02-26 21:44:43.000000000 +0200
@@ -201,7 +201,7 @@
       m_status = STAT_UNKNOWN;
     }
     
-    char *space = strchr(end_desc, ' ');
+    char *space = strchr((char *)end_desc, ' ');
     if (space != 0)
     {
       strncpy(str, space+1, 5);
diff -Naur svxlink-080730/svxlink/remotetrx/remotetrx.cpp svxlink-080730-mod/svxlink/remotetrx/remotetrx.cpp
--- svxlink-080730/svxlink/remotetrx/remotetrx.cpp	2008-05-13 21:57:54.000000000 +0300
+++ svxlink-080730-mod/svxlink/remotetrx/remotetrx.cpp	2009-02-26 21:56:43.000000000 +0200
@@ -619,7 +619,7 @@
     }
 
     int write_len = 0;
-    char *nl = strchr(ptr, '\n');
+    char *nl = strchr((char *)ptr, '\n');
     if (nl != 0)
     {
       write_len = nl-ptr+1;
diff -Naur svxlink-080730/svxlink/svxlink/svxlink.cpp svxlink-080730-mod/svxlink/svxlink/svxlink.cpp
--- svxlink-080730/svxlink/svxlink/svxlink.cpp	2008-05-13 21:57:54.000000000 +0300
+++ svxlink-080730-mod/svxlink/svxlink/svxlink.cpp	2009-02-26 21:48:43.000000000 +0200
@@ -609,7 +609,7 @@
     }
 
     int write_len = 0;
-    char *nl = strchr(ptr, '\n');
+    char *nl = strchr((char *)ptr, '\n');
     if (nl != 0)
     {
       write_len = nl-ptr+1;


Index: svxlink.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svxlink/devel/svxlink.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- svxlink.spec	26 Feb 2009 04:22:12 -0000	1.2
+++ svxlink.spec	26 Feb 2009 20:02:26 -0000	1.3
@@ -1,7 +1,7 @@
 %define main_version 080730
 Name:		svxlink
 Version:	%{main_version}
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Repeater controller and EchoLink (simplex or repeater)
 
 Group:		Applications/Internet
@@ -16,6 +16,7 @@
 Patch2:		svxlink-080730-x86_64.patch
 #aparently echolib is not correctly linked against libasync
 Patch3:		svxlink-080730-libs.patch
+Patch4:		svxlink-080730-gcc44.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libsigc++-devel, libmng-devel, tcl-devel, qt3-devel, gsm-devel
@@ -108,6 +109,7 @@
 %patch1 -p1 -b .spandsp
 %patch2 -p1 -b .x86_64
 %patch3 -p1 -b .libs
+%patch4 -p1 -b .gcc44
 #sed -i -e "s/.SILENT://g" Makefile
 #sed -i -e "s/.SILENT://g" makefile.sub
 #make realclean
@@ -248,6 +250,9 @@
 %{_includedir}/svxlink
 
 %changelog
+* Thu Feb 26 2009 Lucian Langa <cooly at gnome.eu.org> - 080730-8
+- patch to fix gcc44 issues
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 080730-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list