rpms/commoncpp2/devel commoncpp2-1.7.3-gcc44.patch, NONE, 1.1 commoncpp2.spec, 1.9, 1.10

Andreas Thienemann ixs at fedoraproject.org
Mon Apr 6 19:54:01 UTC 2009


Author: ixs

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

Modified Files:
	commoncpp2.spec 
Added Files:
	commoncpp2-1.7.3-gcc44.patch 
Log Message:
Added patch to compile on gcc44

commoncpp2-1.7.3-gcc44.patch:

--- NEW FILE commoncpp2-1.7.3-gcc44.patch ---
diff -up commoncpp2-1.7.3/src/cidr.cpp.orig commoncpp2-1.7.3/src/cidr.cpp
--- commoncpp2-1.7.3/src/cidr.cpp.orig	2009-04-06 21:24:07.857718325 +0200
+++ commoncpp2-1.7.3/src/cidr.cpp	2009-04-06 21:50:26.874088776 +0200
@@ -202,7 +202,7 @@ void IPV4Cidr::set(const char *cp)
 #if defined(_MSC_VER) && _MSC_VER >= 1500
 	ep = (char *)strchr(cp, '/');
 #else
- 	ep = strchr(cp, '/');
+ 	ep = (char *)strchr(cp, '/');
 #endif
 
 	if(ep)
@@ -332,7 +332,7 @@ void IPV6Cidr::set(const char *cp)
 	memset(&netmask, 0, sizeof(netmask));
 	bitset((bit_t *)&netmask, getMask(cp));
 	setString(cbuf, sizeof(cbuf), cp);
-	ep = strchr(cp, '/');
+	ep = (char *)strchr(cp, '/');
 	if(ep)
 		*ep = 0;
 


Index: commoncpp2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/commoncpp2/devel/commoncpp2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- commoncpp2.spec	6 Apr 2009 13:27:25 -0000	1.9
+++ commoncpp2.spec	6 Apr 2009 19:53:30 -0000	1.10
@@ -6,6 +6,7 @@
 Group: System Environment/Libraries
 Source0: http://www.gnutelephony.org/dist/tarballs/commoncpp2-%{version}.tar.gz
 URL: http://www.gnu.org/software/commoncpp/
+Patch0: commoncpp2-1.7.3-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel, zlib-devel, doxygen
 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \




More information about the scm-commits mailing list