Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=2948d3bf9efc40d7381de7073d6c76abb977effb
commit 2948d3bf9efc40d7381de7073d6c76abb977effb Author: Miklos Vajna <[email protected]> Date: Mon Jun 4 08:04:12 2012 +0200 xmlrpc-c-1.16.41-1-x86_64 - version bump diff --git a/source/network-extra/xmlrpc-c/FrugalBuild b/source/network-extra/xmlrpc-c/FrugalBuild index 0840273..9427036 100644 --- a/source/network-extra/xmlrpc-c/FrugalBuild +++ b/source/network-extra/xmlrpc-c/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: crazy <[email protected]> pkgname=xmlrpc-c -pkgver=1.11.00 -pkgrel=4 +pkgver=1.16.41 +pkgrel=1 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++." depends=('curl>=7.19.0' 'libstdc++' 'libxml2>=2.7.8') groups=('network-extra') @@ -12,19 +12,11 @@ _F_sourceforge_ext=".tgz" Finclude sourceforge url="http://xmlrpc-c.sourceforge.net/"; source=($source \ - no-O3s-thx.patch \ use-fPIC-x86_64.patch \ - gcc4.patch \ - gcc43.diff \ - curl-7.19.diff \ xmlrpc-c-1.06.27-curl-headers.patch) -sha1sums=('b5392268c4b1603d305d01e552ce59b5786e1254' \ - '74fa3a548767ed47010100a636b7159158dd5102' \ +sha1sums=('aee10abad995ff745d10223b7335c374a931aa1f' \ '6e0ddecbd3dd2e8d415a240ab0a9d00df59d22eb' \ - '0ab8746f8580626c3c87234d93564ff943b9a443' \ - '1906b2c924f7cdd9a4c3830dbecba833d157ef85' \ - '984ab160569987be123b7acc5fa67004633304db' \ - 'a9f31b71dca60e7740df9c43e3a56e64b179b8e0') + '43d77bf305a41e256321433a12d55824e8c63270') build() { diff --git a/source/network-extra/xmlrpc-c/gcc4.patch b/source/network-extra/xmlrpc-c/gcc4.patch deleted file mode 100644 index 3ca73f7..0000000 --- a/source/network-extra/xmlrpc-c/gcc4.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -Naurp xmlrpc-c-1.11.00/include/xmlrpc-c/packetsocket.hpp xmlrpc-c-1.11.00-gcc4/include/xmlrpc-c/packetsocket.hpp ---- xmlrpc-c-1.11.00/include/xmlrpc-c/packetsocket.hpp 2007-05-14 01:30:43.000000000 +0200 -+++ xmlrpc-c-1.11.00-gcc4/include/xmlrpc-c/packetsocket.hpp 2007-08-29 02:09:59.000000000 +0200 -@@ -24,22 +24,22 @@ class packet : public girmem::autoObject - public: - packet(); - -- packet::packet(const unsigned char * const data, -+ packet(const unsigned char * const data, - size_t const dataLength); - -- packet::packet(const char * const data, -+ packet(const char * const data, - size_t const dataLength); - - ~packet(); - - unsigned char * -- packet::getBytes() const { return this->bytes; } -+ getBytes() const { return this->bytes; } - - size_t -- packet::getLength() const { return this->length; } -+ getLength() const { return this->length; } - - void -- packet::addData(const unsigned char * const data, -+ addData(const unsigned char * const data, - size_t const dataLength); - - private: -@@ -59,7 +59,7 @@ class packetPtr: public girmem::autoObje - public: - packetPtr(); - -- explicit packetPtr::packetPtr(packet * const packetP); -+ explicit packetPtr(packet * const packetP); - - packet * - operator->() const; -@@ -117,23 +117,23 @@ private: - } escAccum; - - void -- packetSocket::bufferFinishedPacket(); -+ bufferFinishedPacket(); - - void -- packetSocket::takeSomeEscapeSeq(const unsigned char * const buffer, -+ takeSomeEscapeSeq(const unsigned char * const buffer, - size_t const length, - size_t * const bytesTakenP); - - void -- packetSocket::takeSomePacket(const unsigned char * const buffer, -+ takeSomePacket(const unsigned char * const buffer, - size_t const length, - size_t * const bytesTakenP); - - void -- packetSocket::verifyNothingAccumulated(); -+ verifyNothingAccumulated(); - - void -- packetSocket::readFromFile(); -+ readFromFile(); - - }; - -diff -Naurp xmlrpc-c-1.11.00/include/xmlrpc-c/server_pstream.hpp xmlrpc-c-1.11.00-gcc4/include/xmlrpc-c/server_pstream.hpp ---- xmlrpc-c-1.11.00/include/xmlrpc-c/server_pstream.hpp 2007-05-14 01:30:43.000000000 +0200 -+++ xmlrpc-c-1.11.00-gcc4/include/xmlrpc-c/server_pstream.hpp 2007-08-29 02:07:10.000000000 +0200 -@@ -30,12 +30,12 @@ public: - } present; - }; - -- serverPstreamConn::serverPstreamConn(constrOpt const& opt); -+ serverPstreamConn(constrOpt const& opt); - -- serverPstreamConn::~serverPstreamConn(); -+ ~serverPstreamConn(); - - void -- serverPstreamConn::runOnce(bool * const eofP); -+ runOnce(bool * const eofP); - - private: - -@@ -54,10 +54,10 @@ private: - // This is permanently connected to our fixed client. - - void -- serverPstreamConn::establishRegistry(constrOpt const& opt); -+ establishRegistry(constrOpt const& opt); - - void -- serverPstreamConn::establishPacketSocket(constrOpt const& opt); -+ establishPacketSocket(constrOpt const& opt); - }; - - -diff -Naurp xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp xmlrpc-c-1.11.00-gcc4/src/cpp/packetsocket.cpp ---- xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp 2007-05-14 01:30:43.000000000 +0200 -+++ xmlrpc-c-1.11.00-gcc4/src/cpp/packetsocket.cpp 2007-08-29 02:03:28.000000000 +0200 -@@ -39,6 +39,7 @@ - - #define _BSD_SOURCE // gets uint defined - -+#include <cassert> - #include <string> - #include <queue> - #include <iostream> -diff -Naurp xmlrpc-c-1.11.00/src/cpp/pstream.cpp xmlrpc-c-1.11.00-gcc4/src/cpp/pstream.cpp ---- xmlrpc-c-1.11.00/src/cpp/pstream.cpp 2007-05-14 01:30:43.000000000 +0200 -+++ xmlrpc-c-1.11.00-gcc4/src/cpp/pstream.cpp 2007-08-29 02:03:35.000000000 +0200 -@@ -32,6 +32,8 @@ using girerr::throwf; - - #include "xmlrpc-c/client_transport.hpp" - -+using namespace std; -+ - namespace xmlrpc_c { - - -diff -Naurp xmlrpc-c-1.11.00/src/cpp/server_pstream.cpp xmlrpc-c-1.11.00-gcc4/src/cpp/server_pstream.cpp ---- xmlrpc-c-1.11.00/src/cpp/server_pstream.cpp 2007-05-14 01:30:43.000000000 +0200 -+++ xmlrpc-c-1.11.00-gcc4/src/cpp/server_pstream.cpp 2007-08-29 02:03:38.000000000 +0200 -@@ -30,6 +30,8 @@ using girerr::throwf; - - #include "xmlrpc-c/server_pstream.hpp" - -+using namespace std; -+ - namespace xmlrpc_c { - - diff --git a/source/network-extra/xmlrpc-c/gcc43.diff b/source/network-extra/xmlrpc-c/gcc43.diff deleted file mode 100644 index 4976937..0000000 --- a/source/network-extra/xmlrpc-c/gcc43.diff +++ /dev/null @@ -1,61 +0,0 @@ -diff -aur xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp fw_xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp ---- xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp 2005-06-10 23:48:43.000000000 +0200 -+++ fw_xmlrpc-c-1.11.00/include/xmlrpc-c/oldcppwrapper.hpp 2008-10-04 12:31:01.000000000 +0200 -@@ -25,6 +25,7 @@ - // -Bryan 2005.03.12. - - -+#include <cstdlib> - #include <string> - #include <xmlrpc-c/base.h> - #include <xmlrpc-c/client.h> -diff -aur xmlrpc-c-1.11.00/src/cpp/client_simple.cpp fw_xmlrpc-c-1.11.00/src/cpp/client_simple.cpp ---- xmlrpc-c-1.11.00/src/cpp/client_simple.cpp 2006-02-04 20:25:18.000000000 +0100 -+++ fw_xmlrpc-c-1.11.00/src/cpp/client_simple.cpp 2008-10-04 12:42:50.000000000 +0200 -@@ -1,3 +1,4 @@ -+#include <cstring> - #include <string> - - #include "xmlrpc-c/girerr.hpp" -diff -aur xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp fw_xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp ---- xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp 2007-05-14 01:30:43.000000000 +0200 -+++ fw_xmlrpc-c-1.11.00/src/cpp/packetsocket.cpp 2008-10-04 12:40:53.000000000 +0200 -@@ -49,6 +49,7 @@ - #include <fcntl.h> - #include <poll.h> - #include <sys/types.h> -+#include <cstdlib> - - #include "c_util.h" - #include "xmlrpc-c/string_int.h" -diff -aur xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp fw_xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp ---- xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp 2007-05-14 08:28:50.000000000 +0200 -+++ fw_xmlrpc-c-1.11.00/src/cpp/server_abyss.cpp 2008-10-04 12:36:54.000000000 +0200 -@@ -1,4 +1,5 @@ - #include <cassert> -+#include <cstdlib> - #include <string> - #include <memory> - #include <signal.h> -diff -aur xmlrpc-c-1.11.00/src/cpp/value.cpp fw_xmlrpc-c-1.11.00/src/cpp/value.cpp ---- xmlrpc-c-1.11.00/src/cpp/value.cpp 2007-06-05 05:49:49.000000000 +0200 -+++ fw_xmlrpc-c-1.11.00/src/cpp/value.cpp 2008-10-04 12:33:54.000000000 +0200 -@@ -28,6 +28,7 @@ - - *****************************************************************************/ - -+#include <cstdlib> - #include <string> - #include <vector> - #include <ctime> -diff -aur xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp fw_xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp ---- xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp 2005-11-24 04:13:13.000000000 +0100 -+++ fw_xmlrpc-c-1.11.00/src/cpp/XmlRpcCpp.cpp 2008-10-04 12:31:36.000000000 +0200 -@@ -24,6 +24,7 @@ - // SUCH DAMAGE. - - -+#include <cstring> - #include <string> - #include "xmlrpc-c/oldcppwrapper.hpp" - diff --git a/source/network-extra/xmlrpc-c/no-O3s-thx.patch b/source/network-extra/xmlrpc-c/no-O3s-thx.patch deleted file mode 100644 index c13c363..0000000 --- a/source/network-extra/xmlrpc-c/no-O3s-thx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xmlrpc-c-1.06.04/Makefile.common xmlrpc-c-1.06.04-p/Makefile.common ---- xmlrpc-c-1.06.04/Makefile.common 2006-08-30 04:59:05.000000000 +0200 -+++ xmlrpc-c-1.06.04-p/Makefile.common 2006-09-02 00:24:52.178643032 +0200 -@@ -32,7 +32,7 @@ - CXXFLAGS_COMMON = -DNDEBUG - - ifeq ($(C_COMPILER_GNU),yes) -- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3 -+ CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g - endif - - ifeq ($(CXX_COMPILER_GNU),yes) diff --git a/source/network-extra/xmlrpc-c/xmlrpc-c-1.06.27-curl-headers.patch b/source/network-extra/xmlrpc-c/xmlrpc-c-1.06.27-curl-headers.patch index 897922d..b49111b 100644 --- a/source/network-extra/xmlrpc-c/xmlrpc-c-1.06.27-curl-headers.patch +++ b/source/network-extra/xmlrpc-c/xmlrpc-c-1.06.27-curl-headers.patch @@ -10,3 +10,27 @@ index 46099ba..b85d4a1 100644 #include <curl/easy.h> #include <curl/multi.h> +diff --git a/lib/curl_transport/curlmulti.c b/lib/curl_transport/curlmulti.c +index 526a4db..5503b9f 100644 +--- a/lib/curl_transport/curlmulti.c ++++ b/lib/curl_transport/curlmulti.c +@@ -17,7 +17,6 @@ + #endif + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + #include <curl/multi.h> + +diff --git a/lib/curl_transport/curltransaction.c b/lib/curl_transport/curltransaction.c +index 6b60b20..141fa5a 100644 +--- a/lib/curl_transport/curltransaction.c ++++ b/lib/curl_transport/curltransaction.c +@@ -15,7 +15,6 @@ + #include "version.h" + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include "curlversion.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
