packages: xmlrpc++/xmlrpc++-compile.patch, xmlrpc++/xmlrpc++.spec, xmlrpc++...

glen glen at pld-linux.org
Fri Oct 16 11:20:23 CEST 2009 

Author: glen                         Date: Fri Oct 16 09:20:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with gcc44

---- Files affected:
packages/xmlrpc++:
   xmlrpc++-compile.patch (1.1 -> 1.2) , xmlrpc++.spec (1.9 -> 1.10) , gcc44.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xmlrpc++/xmlrpc++-compile.patch
diff -u packages/xmlrpc++/xmlrpc++-compile.patch:1.1 packages/xmlrpc++/xmlrpc++-compile.patch:1.2
--- packages/xmlrpc++/xmlrpc++-compile.patch:1.1	Tue Mar 20 18:45:12 2007
+++ packages/xmlrpc++/xmlrpc++-compile.patch	Fri Oct 16 11:20:18 2009
@@ -1,15 +1,15 @@
 --- xmlrpc++0.7/test/Validator.cpp.orig	2007-03-12 11:56:20.000000000 +0000
 +++ xmlrpc++0.7/test/Validator.cpp	2007-03-12 11:59:38.000000000 +0000
 @@ -136,9 +136,9 @@
-   void execute(XmlRpcValue& params, XmlRpcValue& result)
-   {
-     std::cerr << "ModerateSizeArrayCheck\n";
--    std::string s = params[0][0];
--    s += params[0][params[0].size()-1];
--    result = s;
-+    std::string s0 = params[0][0];
-+    std::string s1 = params[0][params[0].size()-1];
-+    result = s0 + s1;
-   }
- } moderateSizeArrayCheck(&s);
- 
+   void execute(XmlRpcValue& params, XmlRpcValue& result)
+   {
+     std::cerr << "ModerateSizeArrayCheck\n";
+-    std::string s = params[0][0];
+-    s += params[0][params[0].size()-1];
+-    result = s;
++    std::string s0 = params[0][0];
++    std::string s1 = params[0][params[0].size()-1];
++    result = s0 + s1;
+   }
+ } moderateSizeArrayCheck(&s);
+ 

================================================================
Index: packages/xmlrpc++/xmlrpc++.spec
diff -u packages/xmlrpc++/xmlrpc++.spec:1.9 packages/xmlrpc++/xmlrpc++.spec:1.10
--- packages/xmlrpc++/xmlrpc++.spec:1.9	Sat Mar 31 21:22:16 2007
+++ packages/xmlrpc++/xmlrpc++.spec	Fri Oct 16 11:20:18 2009
@@ -14,11 +14,13 @@
 # Source0-md5:	d88f0f9c36d938316d672d16f6c37d7e
 Patch0:		%{name}-compile.patch
 Patch1:		%{name}-use_autotools.patch
+Patch2:		gcc44.patch
 URL:		http://xmlrpcpp.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,12 +31,11 @@
 in your app for easy peer-to-peer support.
 
 %description -l pl.UTF-8
-XmlRpc++ jest implementacją protokołu XML-RPC napisaną w C++.
-Bazuje na znakomitej bibliotece py-xmlrpc autorstwa Shilad Sen.
-XmlRpc++ została zaprojektowana w celu ułatwienia włączenia
-obsługi klienta i serwera XML-RPC do aplikacji napisanych z
-wykorzystaniem C++, lub użycia obiektów klienta i serwera w
-aplikacjach peer-to-peer.
+XmlRpc++ jest implementacją protokołu XML-RPC napisaną w C++. Bazuje
+na znakomitej bibliotece py-xmlrpc autorstwa Shilad Sen. XmlRpc++
+została zaprojektowana w celu ułatwienia włączenia obsługi klienta i
+serwera XML-RPC do aplikacji napisanych z wykorzystaniem C++, lub
+użycia obiektów klienta i serwera w aplikacjach peer-to-peer.
 
 %package devel
 Summary:	Header files for XmlRpc++ library
@@ -63,8 +64,10 @@
 
 %prep
 %setup -q -n %{name}%{version}
+find -name '*.cpp' | xargs %{__sed} -i -e 's,\r$,,'
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -89,17 +92,18 @@
 %files
 %defattr(644,root,root,755)
 %doc README.html
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libXmlRpc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libXmlRpc.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libXmlRpc.so
+%{_libdir}/libXmlRpc.la
 %{_includedir}/*.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libXmlRpc.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -107,6 +111,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/10/16 09:20:18  glen
+- fix build with gcc44
+
 Revision 1.9  2007/03/31 19:22:16  qboosh
 - -devel R: libstdc++-devel
 - BR libtool with proper C++ support

================================================================
Index: packages/xmlrpc++/gcc44.patch
diff -u /dev/null packages/xmlrpc++/gcc44.patch:1.1
--- /dev/null	Fri Oct 16 11:20:23 2009
+++ packages/xmlrpc++/gcc44.patch	Fri Oct 16 11:20:18 2009
@@ -0,0 +1,64 @@
+--- xmlrpc++0.7/src/XmlRpcClient.cpp~	2009-10-16 12:06:13.000000000 +0300
++++ xmlrpc++0.7/src/XmlRpcClient.cpp	2009-10-16 12:06:14.897896482 +0300
+@@ -6,7 +6,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#include <strings.h>
++#include <string.h>
+ 
+ using namespace XmlRpc;
+ 
+--- xmlrpc++0.7/src/XmlRpcServerConnection.cpp~	2003-03-06 19:25:37.000000000 +0200
++++ xmlrpc++0.7/src/XmlRpcServerConnection.cpp	2009-10-16 12:06:58.377060636 +0300
+@@ -6,6 +6,8 @@
+ #ifndef MAKEDEPEND
+ # include <stdio.h>
+ # include <stdlib.h>
++# include <strings.h>
++# include <string.h>
+ #endif
+ 
+ using namespace XmlRpc;
+--- xmlrpc++0.7/src/XmlRpcSocket.cpp~	2003-03-06 19:25:37.000000000 +0200
++++ xmlrpc++0.7/src/XmlRpcSocket.cpp	2009-10-16 12:07:38.521221531 +0300
+@@ -22,6 +22,7 @@
+ # include <netdb.h>
+ # include <errno.h>
+ # include <fcntl.h>
++# include <string.h>
+ }
+ #endif  // _WINDOWS
+ 
+--- xmlrpc++0.7/test/HelloClient.cpp~	2003-03-06 19:25:37.000000000 +0200
++++ xmlrpc++0.7/test/HelloClient.cpp	2009-10-16 12:08:23.880898744 +0300
+@@ -3,6 +3,8 @@
+ // on windows)
+ #include "XmlRpc.h"
+ #include <iostream>
++#include <stdlib.h>
++
+ using namespace XmlRpc;
+ 
+ int main(int argc, char* argv[])
+--- xmlrpc++0.7/test/TestValues.cpp~	2003-03-06 19:25:37.000000000 +0200
++++ xmlrpc++0.7/test/TestValues.cpp	2009-10-16 12:08:51.960426846 +0300
+@@ -1,6 +1,7 @@
+ // TestValues.cpp : Test XML encoding and decoding of XmlRpcValues.
+ 
+ #include <stdlib.h>
++#include <stdio.h>
+ 
+ #include "XmlRpcValue.h"
+ 
+--- xmlrpc++0.7/test/Validator.cpp~	2009-10-16 12:04:42.000000000 +0300
++++ xmlrpc++0.7/test/Validator.cpp	2009-10-16 12:09:58.830611032 +0300
+@@ -4,6 +4,7 @@
+ using namespace XmlRpc;
+ 
+ #include <iostream>
++#include <stdlib.h>
+ 
+ 
+ XmlRpcServer s;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmlrpc++/xmlrpc++-compile.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmlrpc++/xmlrpc++.spec?r1=1.9&r2=1.10&f=u

More information about the pld-cvs-commit mailing list