rpms/linphone/devel linphone-2.1.0-ni_maxhost_hack.patch, NONE, 1.1 linphone-2.1.0-no_werror.patch, NONE, 1.1 linphone.spec, 1.35, 1.36

Jeffrey C. Ollie (jcollie) fedora-extras-commits at redhat.com
Wed Feb 6 12:15:07 UTC 2008


Author: jcollie

Update of /cvs/pkgs/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14383

Modified Files:
	linphone.spec 
Added Files:
	linphone-2.1.0-ni_maxhost_hack.patch 
	linphone-2.1.0-no_werror.patch 
Log Message:
Add patches to fix some compile errors.

linphone-2.1.0-ni_maxhost_hack.patch:

--- NEW FILE linphone-2.1.0-ni_maxhost_hack.patch ---
diff --git a/mediastreamer2/src/ice.c b/mediastreamer2/src/ice.c
index c4296c0..615c7ab 100644
--- a/mediastreamer2/src/ice.c
+++ b/mediastreamer2/src/ice.c
@@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <netdb.h>
 #endif
 
+#ifndef NI_MAXHOST
+#define NI_MAXHOST 1025
+#endif
+
 #include "mediastreamer2/ice.h"
 #include "mediastreamer2/mscommon.h"
 

linphone-2.1.0-no_werror.patch:

--- NEW FILE linphone-2.1.0-no_werror.patch ---
diff --git a/configure.in b/configure.in
index 3cb7bf7..307679b 100644
--- a/configure.in
+++ b/configure.in
@@ -275,7 +275,6 @@ AC_ARG_ENABLE(strict,
 
 if test "$GCC$strictness" = "yesyes" ; then
 	STRICT_OPTIONS="-Wall -Wp,-D_FORTIFY_SOURCE=2"
-	STRICT_OPTIONS="$STRICT_OPTIONS -Werror"
 	CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
 
diff --git a/mediastreamer2/configure.ac b/mediastreamer2/configure.ac
index f663b56..18c1e30 100644
--- a/mediastreamer2/configure.ac
+++ b/mediastreamer2/configure.ac
@@ -109,10 +109,6 @@ if test x$ac_cv_c_bigendian = xyes ; then
 	CFLAGS="$CFLAGS -D_BIGENDIAN "
 fi
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 macosx_found=no
 
 dnl add thread flags


Index: linphone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- linphone.spec	5 Feb 2008 14:15:25 -0000	1.35
+++ linphone.spec	6 Feb 2008 12:14:31 -0000	1.36
@@ -9,6 +9,8 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/2.1.x/sources/%{name}-%{version}.tar.gz
 Patch0:         linphone-2.1.0-imagedir.patch
 Patch1:         linphone-2.1.0-novideo.patch
+Patch2:		linphone-2.1.0-ni_maxhost_hack.patch
+Patch3:		linphone-2.1.0-no_werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libosip2-devel >= 3.0.3-2
@@ -66,6 +68,8 @@
 %setup0 -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 #pushd share/cs
 #for f in *.1




More information about the fedora-extras-commits mailing list