diff options
author | 2013-02-27 06:19:23 +0000 | |
---|---|---|
committer | 2013-02-27 06:19:23 +0000 | |
commit | 292f785d5330ee3e2e20ae541897d001ea9efdbe (patch) | |
tree | f9f22b3500c59d779a6fb80e149cccf264e9dc75 /dev-libs/xmlrpc-c | |
parent | Add ~arm-linux keyword. (diff) | |
download | gentoo-2-292f785d5330ee3e2e20ae541897d001ea9efdbe.tar.gz gentoo-2-292f785d5330ee3e2e20ae541897d001ea9efdbe.tar.bz2 gentoo-2-292f785d5330ee3e2e20ae541897d001ea9efdbe.zip |
Enable -Wimplicit only for C, not for C++.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'dev-libs/xmlrpc-c')
20 files changed, 41 insertions, 1163 deletions
diff --git a/dev-libs/xmlrpc-c/ChangeLog b/dev-libs/xmlrpc-c/ChangeLog index 6fcb9b16741a..8461cf7573ca 100644 --- a/dev-libs/xmlrpc-c/ChangeLog +++ b/dev-libs/xmlrpc-c/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for dev-libs/xmlrpc-c # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.133 2013/02/26 14:54:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/ChangeLog,v 1.134 2013/02/27 06:19:23 jer Exp $ + + 27 Feb 2013; Jeroen Roovers <jer@gentoo.org> -files/xmlrpc-c-1.05-pic.patch, + -files/xmlrpc-c-1.06.02-strsol.patch, + -files/xmlrpc-c-1.06.02-threadupdatestatus.patch, + -files/xmlrpc-c-1.06.03-mustbuildclient.patch, + -files/xmlrpc-c-1.06.09+curl-7.18.patch, + -files/xmlrpc-c-1.06.09-asneeded.patch, -files/xmlrpc-c-1.06.09-strsol.patch, + -files/xmlrpc-c-1.06.27-abyss-header-fixup.patch, + -files/xmlrpc-c-1.06.27-curl-easy-setopt.patch, + -files/xmlrpc-c-1.06.27-curl-headers.patch, + -files/xmlrpc-c-1.06.27-gcc43-test-fix.patch, + -files/xmlrpc-c-1.28.00-advanced-test.patch, + +files/xmlrpc-c-1.32.05-Wimplicit.patch, -files/xmlrpc-c-gcc43.patch, + -files/xmlrpc-c-1.18.02/cpp-depends.patch, + -files/xmlrpc-c-1.18.02/curl-headers.patch, + -files/xmlrpc-c-1.18.02/dump-symlinks.patch, + -files/xmlrpc-c-1.18.02/dumpvalue.patch, xmlrpc-c-1.32.05.ebuild: + Enable -Wimplicit only for C, not for C++. 26 Feb 2013; Agostino Sarubbo <ago@gentoo.org> xmlrpc-c-1.32.05.ebuild: Stable for s390, wrt bug #457298 diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.05-pic.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.05-pic.patch deleted file mode 100644 index 4f8496e524df..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.05-pic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xmlrpc-c-1.05/src/cpp/Makefile -=================================================================== ---- xmlrpc-c-1.05.orig/src/cpp/Makefile -+++ xmlrpc-c-1.05/src/cpp/Makefile -@@ -135,7 +135,7 @@ libxmlrpc_client++.a: $(LIBXMLRPC_CLIENT - # RULES TO COMPILE OBJECT MODULES FOR LIBRARIES - #----------------------------------------------------------------------------- - --CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) -+CXXFLAGS = $(CXXFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) -fPIC - - XmlRpcCpp.o:%.o:%.cpp - $(CXX) -c $(BASIC_INCLUDES) $(CXXFLAGS) $< diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch deleted file mode 100644 index 5de5751b8450..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-strsol.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: xmlrpc-c-1.06.02/tools/Makefile.common -=================================================================== ---- xmlrpc-c-1.06.02.orig/tools/Makefile.common -+++ xmlrpc-c-1.06.02/tools/Makefile.common -@@ -1,6 +1,8 @@ - # -*-makefile-*- <-- an Emacs control - --CLIENT_LDLIBS = -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc -+CLIENT_LDLIBS = -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util -+ -+CLIENT_LDLIBS += -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc - - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - CLIENT_LDLIBS += $(shell libwww-config --libs) -@@ -14,7 +16,6 @@ endif - - CLIENT_LDLIBS += $(LDLIBS_XML) - --CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util - - - UTIL_DIR = $(BUILDDIR)/lib/util diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-threadupdatestatus.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-threadupdatestatus.patch deleted file mode 100644 index b52647316a6a..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.02-threadupdatestatus.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: xmlrpc-c-1.06.02/lib/abyss/src/thread_fork.c -=================================================================== ---- xmlrpc-c-1.06.02.orig/lib/abyss/src/thread_fork.c -+++ xmlrpc-c-1.06.02/lib/abyss/src/thread_fork.c -@@ -281,11 +281,6 @@ ThreadForks(void) { - - - --void --ThreadUpdateStatus(TThread * const threadP) { -- /* Necessary only for primitive Unix forking */ --} -- - - /********************************************************************* - ** Mutex diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch deleted file mode 100644 index 4ceb2e8fbfb3..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.03-mustbuildclient.patch +++ /dev/null @@ -1,151 +0,0 @@ -Index: xmlrpc-c-1.06.03/src/cpp/Makefile -=================================================================== ---- xmlrpc-c-1.06.03.orig/src/cpp/Makefile -+++ xmlrpc-c-1.06.03/src/cpp/Makefile -@@ -17,12 +17,15 @@ default: all - # libxmlrpc_cpp is the legacy C++ wrapper library. The others are the - # more elaborate replacements. - --TARGET_LIBRARY_NAMES := \ -+TARGET_LIBRARY_NAMES = \ - libxmlrpc_cpp \ - libxmlrpc++ \ - libxmlrpc_server++ \ -- libxmlrpc_server_abyss++ \ -- libxmlrpc_client++ \ -+ libxmlrpc_server_abyss++ -+ -+ifeq ($(MUST_BUILD_CLIENT),yes) -+ TARGET_LIBRARY_NAMES += libxmlrpc_client++ -+endif - - STATIC_LIBRARIES_TO_INSTALL = $(TARGET_STATIC_LIBRARIES) - -@@ -57,7 +60,9 @@ LIBXMLRPCPP_OBJS = \ - - LIBXMLRPC_SERVERPP_OBJS = registry.o - LIBXMLRPC_SERVER_ABYSSPP_OBJS = server_abyss.o -+ifeq ($(MUST_BUILD_CLIENT),yes) - LIBXMLRPC_CLIENTPP_OBJS = client.o client_simple.o curl.o libwww.o wininet.o -+endif - - ALL_OBJS = \ - XmlRpcCpp.o \ -Index: xmlrpc-c-1.06.03/GNUmakefile -=================================================================== ---- xmlrpc-c-1.06.03.orig/GNUmakefile -+++ xmlrpc-c-1.06.03/GNUmakefile -@@ -36,6 +36,7 @@ OMIT_VERSION_H = Y - OMIT_TRANSPORT_CONFIG_H = Y - - transport_config.h: $(BUILDDIR)/Makefile.config -+ifeq ($(MUST_BUILD_CLIENT),yes) - rm -f $@ - echo '/* This file was generated by a make rule */' >>$@ - ifeq ($(MUST_BUILD_WININET_CLIENT),yes) -@@ -67,6 +68,7 @@ else - endif - endif - endif -+endif - - .PHONY: clean clean-local - clean: $(SUBDIRS:%=%/clean) clean-common clean-local -Index: xmlrpc-c-1.06.03/src/Makefile -=================================================================== ---- xmlrpc-c-1.06.03.orig/src/Makefile -+++ xmlrpc-c-1.06.03/src/Makefile -@@ -68,8 +68,10 @@ endif - # referred-to library before it loads libxxx. Note that the link command - # may require the necessary -L options in addition. - -+ifeq ($(MUST_BUILD_CLIENT),yes) - LIBXMLRPC_CLIENT_OBJS = xmlrpc_client.lo xmlrpc_client_global.lo - LIBXMLRPC_CLIENT_LIBDEP = -lxmlrpc_util -lxmlrpc -+endif - - LIBXMLRPC_SERVER_OBJS = registry.lo system_method.lo - LIBXMLRPC_SERVER_LIBDEP = -lxmlrpc_util -lxmlrpc -@@ -78,8 +80,10 @@ LIBXMLRPC_SERVER_ABYSS_OBJS = xmlrpc_ser - LIBXMLRPC_SERVER_ABYSS_LIBDEP = \ - -lxmlrpc_util -lxmlrpc_server -L$(ABYSS_LIBDIR) -lxmlrpc_abyss -lxmlrpc - -+ifeq ($(ENABLE_CGI_SERVER),yes) - LIBXMLRPC_SERVER_CGI_OBJS = xmlrpc_server_cgi.lo - LIBXMLRPC_SERVER_CGI_LIBDEP = -lxmlrpc_util -lxmlrpc_server -lxmlrpc -+endif - - LIBXMLRPC_OBJS = \ - trace.lo \ -Index: xmlrpc-c-1.06.03/tools/Makefile -=================================================================== ---- xmlrpc-c-1.06.03.orig/tools/Makefile -+++ xmlrpc-c-1.06.03/tools/Makefile -@@ -10,11 +10,12 @@ SUBDIRS = binmode-rpc-kit turbocharger - - ifeq ($(MUST_BUILD_CLIENT),yes) - SUBDIRS += xmlrpc xmlrpc_transport --endif - - ifeq ($(ENABLE_CPLUSPLUS),yes) - SUBDIRS += xml-rpc-api2cpp - endif -+endif -+ - - .PHONY: all clean distclean install check dep - -Index: xmlrpc-c-1.06.03/xmlrpc-c-config.in -=================================================================== ---- xmlrpc-c-1.06.03.orig/xmlrpc-c-config.in -+++ xmlrpc-c-1.06.03/xmlrpc-c-config.in -@@ -108,26 +108,31 @@ while test $# -gt 0; do - ;; - client|libwww-client) - # libwww-client is for backward compatibility -- the_libs="-lxmlrpc_client $the_libs" - -- if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then -- the_libs="@WININET_LDADD@ $the_libs" -- the_rpath="@WININET_RPATH@ $the_rpath" -- the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath" -- fi -- if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then -- the_libs="@CURL_LDADD@ $the_libs" -- the_rpath="@CURL_RPATH@ $the_rpath" -- the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath" -- fi -- if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then -- the_libs="@LIBWWW_LDADD@ $the_libs" -- the_rpath="@LIBWWW_RPATH@ $the_rpath" -- the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath" -- fi -- if test "${needCpp}" = "yes"; then -- the_libs="-lxmlrpc_client++ $the_libs" -+ if test "${MUST_BUILD_WININET_CLIENT}" = "yes" || \ -+ test "${MUST_BUILD_CURL_CLIENT}" = "yes" || \ -+ test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then -+ the_libs="-lxmlrpc_client $the_libs" -+ -+ if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then -+ the_libs="@WININET_LDADD@ $the_libs" -+ the_rpath="@WININET_RPATH@ $the_rpath" -+ the_wl_rpath="@WININET_WL_RPATH@ $the_wl_rpath" - fi -+ if test "${MUST_BUILD_CURL_CLIENT}" = "yes"; then -+ the_libs="@CURL_LDADD@ $the_libs" -+ the_rpath="@CURL_RPATH@ $the_rpath" -+ the_wl_rpath="@CURL_WL_RPATH@ $the_wl_rpath" -+ fi -+ if test "${MUST_BUILD_LIBWWW_CLIENT}" = "yes"; then -+ the_libs="@LIBWWW_LDADD@ $the_libs" -+ the_rpath="@LIBWWW_RPATH@ $the_rpath" -+ the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath" -+ fi -+ if test "${needCpp}" = "yes"; then -+ the_libs="-lxmlrpc_client++ $the_libs" -+ fi -+ fi - ;; - --version) - echo "@VERSION@" diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09+curl-7.18.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09+curl-7.18.patch deleted file mode 100644 index e0c39b7a556d..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09+curl-7.18.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmlrpc-c-1.06.09/lib/curl_transport/xmlrpc_curl_transport.c.orig 2008-04-06 18:34:12.000000000 +0200 -+++ xmlrpc-c-1.06.09/lib/curl_transport/xmlrpc_curl_transport.c 2008-04-06 18:34:35.000000000 +0200 -@@ -1214,7 +1214,7 @@ - curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE, - curlSetupP->sslEngine); - if (curlSetupP->sslEngineDefault) -- curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT); -+ curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT,1); - if (curlSetupP->sslVersion != XMLRPC_SSLVERSION_DEFAULT) - curl_easy_setopt(curlSessionP, CURLOPT_SSLVERSION, - curlSetupP->sslVersion); diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch deleted file mode 100644 index f9611f1faabc..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-asneeded.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: xmlrpc-c-1.06.09/src/Makefile -=================================================================== ---- xmlrpc-c-1.06.09.orig/src/Makefile -+++ xmlrpc-c-1.06.09/src/Makefile -@@ -48,6 +48,7 @@ endif - - ifeq ($(ENABLE_LIBXML2_BACKEND),yes) - LIBXML_INCLUDES = $(shell xml2-config --cflags) -+ LIBXML_LIBS = $(shell xml2-config --libs) - else - LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse - endif -@@ -95,7 +96,7 @@ LIBXMLRPC_OBJS = \ - xmlrpc_utf8.lo \ - xmlrpc_authcookie.lo \ - --LIBXMLRPC_LIBDEP = -lxmlrpc_util -+LIBXMLRPC_LIBDEP = -lxmlrpc_util $(LIBXML_LIBS) - - LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS) - -diff -Naur xmlrpc-c-1.06.09.orig/examples/cpp/Makefile xmlrpc-c-1.06.09/examples/cpp/Makefile ---- xmlrpc-c-1.06.09.orig/examples/cpp/Makefile 2006-01-09 00:36:06.000000000 +0100 -+++ xmlrpc-c-1.06.09/examples/cpp/Makefile 2008-03-02 00:15:42.000000000 +0100 -@@ -63,13 +63,13 @@ - all: $(PROGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CXXLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - $(LEGACY_CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_LEGACY_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_LEGACY_CLIENT) $(LDFLAGS) - - $(CLIENTPROGS):%:%.o -- $(CXXLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CXXLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - %.o:%.cpp - $(CXX) -c $(INCLUDES) $(CXXFLAGS) $< -diff -Naur xmlrpc-c-1.06.09.orig/examples/Makefile xmlrpc-c-1.06.09/examples/Makefile ---- xmlrpc-c-1.06.09.orig/examples/Makefile 2005-11-20 22:39:57.000000000 +0100 -+++ xmlrpc-c-1.06.09/examples/Makefile 2008-03-02 00:15:04.000000000 +0100 -@@ -81,16 +81,16 @@ - $(MAKE) -C $(dir $@) $(notdir $@) - - $(CLIENTPROGS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_CLIENT) -+ $(CCLD) -o $@ $^ $(LDADD_CLIENT) $(LDFLAGS) - - $(SERVERPROGS_CGI):%.cgi:%_cgi.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_CGI) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_CGI) $(LDFLAGS) - - $(SERVERPROGS_ABYSS):%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_SERVER_ABYSS) -+ $(CCLD) -o $@ $^ $(LDADD_SERVER_ABYSS) $(LDFLAGS) - - gen_sample_add_xml:%:%.o -- $(CCLD) -o $@ $(LDFLAGS) $^ $(LDADD_BASE) -+ $(CCLD) -o $@ $^ $(LDADD_BASE) $(LDFLAGS) - - %.o:%.c - $(CC) -c $(INCLUDES) $(CFLAGS) $< diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch deleted file mode 100644 index 094e1c510aaf..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.09-strsol.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- xmlrpc-c-1.06.09/tools/Makefile.common.orig 2006-07-30 05:07:28.000000000 +0200 -+++ xmlrpc-c-1.06.09/tools/Makefile.common 2008-02-29 11:57:06.000000000 +0100 -@@ -1,6 +1,7 @@ - # -*-makefile-*- <-- an Emacs control - - CLIENT_LDLIBS = -L$(BUILDDIR)/src/.libs -lxmlrpc_client -lxmlrpc -+CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util - - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - CLIENT_LDLIBS += $(shell libwww-config --libs) -@@ -14,8 +15,6 @@ - - CLIENT_LDLIBS += $(LDLIBS_XML) - --CLIENT_LDLIBS += -L$(BUILDDIR)/lib/libutil/.libs -lxmlrpc_util -- - - UTIL_DIR = $(BUILDDIR)/lib/util - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-abyss-header-fixup.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-abyss-header-fixup.patch deleted file mode 100644 index 607b8bc7ebdb..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-abyss-header-fixup.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- xmlrpc-c-1.06.27.orig/GNUmakefile -+++ xmlrpc-c-1.06.27/GNUmakefile -@@ -100,13 +100,13 @@ - # Install old names of header files for backward compatibility - cd $(DESTDIR)$(HEADERINST_DIR); \ - rm -f xmlrpc.h xmlrpc_client.h xmlrpc_server.h xmlrpc_cgi.h \ -- xmlrpc_server_abyss.h xmlrpc_server_w32httpsys.h \ -+ xmlrpc_abyss.h xmlrpc_server_w32httpsys.h \ - XmlRpcCpp.h; \ - $(LN_S) xmlrpc-c/oldxmlrpc.h xmlrpc.h; \ - $(LN_S) xmlrpc-c/client.h xmlrpc_client.h; \ - $(LN_S) xmlrpc-c/server.h xmlrpc_server.h; \ - $(LN_S) xmlrpc-c/server_cgi.h xmlrpc_cgi.h; \ -- $(LN_S) xmlrpc-c/server_abyss.h xmlrpc_server_abyss.h; \ -+ $(LN_S) xmlrpc-c/server_abyss.h xmlrpc_abyss.h; \ - $(LN_S) xmlrpc-c/server_w32httpsys.h xmlrpc_server_w32httpsys.h; \ - $(LN_S) xmlrpc-c/oldcppwrapper.hpp XmlRpcCpp.h ;\ -
\ No newline at end of file diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-easy-setopt.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-easy-setopt.patch deleted file mode 100644 index 6ac078709807..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-easy-setopt.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.c -=================================================================== ---- xmlrpc-c.orig/lib/curl_transport/xmlrpc_curl_transport.c -+++ xmlrpc-c/lib/curl_transport/xmlrpc_curl_transport.c -@@ -1214,7 +1214,7 @@ setupCurlSession(xmlrpc_env * - curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE, - curlSetupP->sslEngine); - if (curlSetupP->sslEngineDefault) -- curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT); -+ curl_easy_setopt(curlSessionP, CURLOPT_SSLENGINE_DEFAULT, 1); - if (curlSetupP->sslVersion != XMLRPC_SSLVERSION_DEFAULT) - curl_easy_setopt(curlSessionP, CURLOPT_SSLVERSION, - curlSetupP->sslVersion); - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch deleted file mode 100644 index 897922d943f3..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-curl-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c -index 46099ba..b85d4a1 100644 ---- a/lib/curl_transport/xmlrpc_curl_transport.c -+++ b/lib/curl_transport/xmlrpc_curl_transport.c -@@ -76,7 +76,6 @@ - #include "version.h" - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #include <curl/multi.h> - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-gcc43-test-fix.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-gcc43-test-fix.patch deleted file mode 100644 index e74061170812..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.06.27-gcc43-test-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -NrU5 xmlrpc-c-1.06.27.orig/src/cpp/test/server_abyss.cpp xmlrpc-c-1.06.27/src/cpp/test/server_abyss.cpp ---- xmlrpc-c-1.06.27.orig/src/cpp/test/server_abyss.cpp 2008-05-31 01:21:14.000000000 +0200 -+++ xmlrpc-c-1.06.27/src/cpp/test/server_abyss.cpp 2008-05-31 01:21:43.000000000 +0200 -@@ -12,10 +12,11 @@ - #include <iostream> - #include <vector> - #include <sstream> - #include <memory> - #include <time.h> -+#include <cstring> - - #include "xmlrpc-c/girerr.hpp" - using girerr::error; - using girerr::throwf; - #include "xmlrpc-c/base.hpp" -diff -NrU5 xmlrpc-c-1.06.27.orig/src/cpp/test/test.cpp xmlrpc-c-1.06.27/src/cpp/test/test.cpp ---- xmlrpc-c-1.06.27.orig/src/cpp/test/test.cpp 2008-05-31 01:21:14.000000000 +0200 -+++ xmlrpc-c-1.06.27/src/cpp/test/test.cpp 2008-05-31 01:21:20.000000000 +0200 -@@ -3,10 +3,11 @@ - #include <iomanip> - #include <vector> - #include <sstream> - #include <memory> - #include <time.h> -+#include <cstring> - - #include "xmlrpc-c/girerr.hpp" - using girerr::error; - #include "transport_config.h" - #include "xmlrpc-c/base.hpp" diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/cpp-depends.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/cpp-depends.patch deleted file mode 100644 index dccd12a558fe..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/cpp-depends.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -NrU5 xmlrpc-c-1.18.02.orig/src/Makefile xmlrpc-c-1.18.02/src/Makefile ---- xmlrpc-c-1.18.02.orig/src/Makefile 2009-05-02 12:53:43.000000000 +0200 -+++ xmlrpc-c-1.18.02/src/Makefile 2009-05-02 13:30:00.000000000 +0200 -@@ -128,11 +128,15 @@ - $(SUBDIRS:%=%/all) \ - - # Extra dependencies to make parallel make work in spite of all the submakes - # (See top level make file for details) - ifeq ($MUST_BUILD_CLIENT),yes) --cpp/all: $(BLDDIR)/transport_config.h -+ cpp/all: $(BLDDIR)/transport_config.h -+endif -+ -+ifeq ($(ENABLE_CPLUSPLUS),yes) -+ cpp/all: $(TARGET_SHARED_LIBRARIES) - endif - - #----------------------------------------------------------------------------- - # RULES TO LINK LIBRARIES - #----------------------------------------------------------------------------- diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch deleted file mode 100644 index aed59d4abed1..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/curl-headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/lib/curl_transport/curlmulti.c b/lib/curl_transport/curlmulti.c -index 27f93e3..6897d68 100644 ---- a/lib/curl_transport/curlmulti.c -+++ b/lib/curl_transport/curlmulti.c -@@ -19,7 +19,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 3889462..0745f42 100644 ---- a/lib/curl_transport/curltransaction.c -+++ b/lib/curl_transport/curltransaction.c -@@ -17,7 +17,6 @@ - #include "version.h" - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include "curlversion.h" -diff --git a/lib/curl_transport/xmlrpc_curl_transport.c b/lib/curl_transport/xmlrpc_curl_transport.c -index 812ba2f..0a16835 100644 ---- a/lib/curl_transport/xmlrpc_curl_transport.c -+++ b/lib/curl_transport/xmlrpc_curl_transport.c -@@ -85,7 +85,6 @@ - #include "xmlrpc-c/time_int.h" - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - #include <curl/multi.h> - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dump-symlinks.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dump-symlinks.patch deleted file mode 100644 index d246e42dbf41..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dump-symlinks.patch +++ /dev/null @@ -1,585 +0,0 @@ -diff -NrU5 xmlrpc-c-1.18.02.orig/common.mk xmlrpc-c-1.18.02/common.mk ---- xmlrpc-c-1.18.02.orig/common.mk 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/common.mk 2009-04-28 00:37:21.000000000 +0200 -@@ -282,32 +282,10 @@ - $(TARGET_MODS_PP:%=%.osh):%.osh:%.cpp - $(CXX) -c -o $@ $(INCLUDES) $(CXXFLAGS_ALL) $< - - - ############################################################################## --# MISC BUILD RULES # --############################################################################## -- --# We use the srcdir symbolic link simply to make the make --# rules easier to read in the make output. We could use the $(SRCDIR) --# variable, but that makes the compile and link commands --# a mile long. Note that Make sometime figures that a directory which --# is a dependency is newer than the symbolic link pointing to it and wants --# to rebuild the symbolic link. So we don't make $(SRCDIR) a --# dependency of 'srcdir'. -- --# We should do the same for 'blddir'. We did once before, then undid --# it in an erroneous effort to enable parallel make. It's a little harder --# with blddir; when we did it before, we had to use the non-symlink --# version in a few places. -- --srcdir: -- $(LN_S) $(SRCDIR) $@ --blddir: -- $(LN_S) $(BLDDIR) $@ -- --############################################################################## - # RECURSIVE SUBDIRECTORY BUILD RULES # - ############################################################################## - - .PHONY: $(SUBDIRS:%=%/all) - $(SUBDIRS:%=%/all): %/all: $(CURDIR)/% -@@ -594,11 +572,10 @@ - # especially with built .h files. Better not to burden the user, who - # gains nothing from it, with that. - # - rm -f depend.mk - rm -f Makefile.depend # We used to create a file by this name -- rm -f srcdir blddir - - .PHONY: distdir-common - distdir-common: - @for file in $(DISTFILES); do \ - d=$(SRCDIR); \ -diff -NrU5 xmlrpc-c-1.18.02.orig/lib/abyss/src/Makefile xmlrpc-c-1.18.02/lib/abyss/src/Makefile ---- xmlrpc-c-1.18.02.orig/lib/abyss/src/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/lib/abyss/src/Makefile 2009-04-28 00:48:59.000000000 +0200 -@@ -50,22 +50,17 @@ - - include $(SRCDIR)/common.mk - - CFLAGS_LOCAL = -D_UNIX - --INCLUDES = -Iblddir -Isrcdir -Isrcdir/include -Isrcdir/lib/util/include -+INCLUDES = -I$(BLDDIR) -I$(SRCDIR) -I$(SRCDIR)/include -I$(SRCDIR)/lib/util/include - - ABYSS_SHLIB = $(call shlibfn,libxmlrpc_abyss) - #ABYSS_SHLIB is e.g. libxmlrpc_abyss.so.3.1 - ABYSS_SHLIBLE = $(call shliblefn,libxmlrpc_abyss) - #ABYSS_SHLIBLE is e.g. libxmlrpc_abyss.so - --# This 'common.mk' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/common.mk: srcdir blddir -- - .PHONY: all - all: libxmlrpc_abyss.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS) - - - # Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES -diff -NrU5 xmlrpc-c-1.18.02.orig/lib/expat/xmlparse/Makefile xmlrpc-c-1.18.02/lib/expat/xmlparse/Makefile ---- xmlrpc-c-1.18.02.orig/lib/expat/xmlparse/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/lib/expat/xmlparse/Makefile 2009-04-28 00:39:45.000000000 +0200 -@@ -83,11 +83,6 @@ - distclean: clean distclean-common - - .PHONY: dep - dep: dep-common - --# This 'common.mk' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/common.mk: srcdir -- - include depend.mk -diff -NrU5 xmlrpc-c-1.18.02.orig/lib/expat/xmltok/Makefile xmlrpc-c-1.18.02/lib/expat/xmltok/Makefile ---- xmlrpc-c-1.18.02.orig/lib/expat/xmltok/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/lib/expat/xmltok/Makefile 2009-04-28 00:38:11.000000000 +0200 -@@ -24,11 +24,11 @@ - # we started using the Gcc -Wundef option, that generates a warning, so - # se set it explicitly to 0 here. - - CFLAGS_LOCAL = -DXML_BYTE_ORDER=0 - --# -I. is necessary when blddir != srcdir -+# -I. is necessary when $(BLDDIR) != $(SRCDIR) - INCLUDES = -I. -I$(BLDDIR) -I$(SRCDIR)/lib/util/include - - default: all - - TARGET_LIBRARY_NAMES := libxmlrpc_xmltok -diff -NrU5 xmlrpc-c-1.18.02.orig/lib/libutil/Makefile xmlrpc-c-1.18.02/lib/libutil/Makefile ---- xmlrpc-c-1.18.02.orig/lib/libutil/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/lib/libutil/Makefile 2009-04-28 00:48:59.000000000 +0200 -@@ -41,23 +41,18 @@ - MAJ=3 - # Major number of shared libraries in this directory - - include $(SRCDIR)/common.mk - --INCLUDES = -I$(BLDDIR) -Isrcdir \ -- -I$(BLDDIR)/include -Isrcdir/include -Isrcdir/lib/util/include -+INCLUDES = -I$(BLDDIR) -I$(SRCDIR) \ -+ -I$(BLDDIR)/include -I$(SRCDIR)/include -I$(SRCDIR)/lib/util/include - - UTIL_SHLIB = $(call shlibfn,libxmlrpc_util) - #UTIL_SHLIB is e.g. libxmlrpc_util.so.3.1 - UTIL_SHLIBLE = $(call shliblefn,libxmlrpc_util) - #UTIL_SHLIBLE is e.g. libxmlrpc_util.so - --# This 'common.mk' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/common.mk: srcdir blddir -- - .PHONY: all - all: libxmlrpc_util.a $(TARGET_SHARED_LIBRARIES) $(TARGET_SHARED_LE_LIBS) - - # Rule for this is in common.mk, courtesy of TARGET_LIBRARY_NAMES: - $(UTIL_SHLIB): $(TARGET_MODS:%=%.osh) -diff -NrU5 xmlrpc-c-1.18.02.orig/src/cpp/Makefile xmlrpc-c-1.18.02/src/cpp/Makefile ---- xmlrpc-c-1.18.02.orig/src/cpp/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/src/cpp/Makefile 2009-04-28 00:38:11.000000000 +0200 -@@ -37,18 +37,18 @@ - # INCLUDES and DEP_SOURCES are used by dep-common target - INCLUDES = $(BASIC_INCLUDES) $(CLIENT_INCLUDES) $(LIBXML_INCLUDES) \ - $(SERVER_INCLUDES) $(SERVER_ABYSS_INCLUDES) $(TRANSPORT_INCLUDES) - DEP_SOURCES = *.cpp - --WININET_TRANSPORT_DIR = srcdir/lib/wininet_transport --CURL_TRANSPORT_DIR = srcdir/lib/curl_transport --LIBWWW_TRANSPORT_DIR = srcdir/lib/libwww_transport -+WININET_TRANSPORT_DIR = $(SRCDIR)/lib/wininet_transport -+CURL_TRANSPORT_DIR = $(SRCDIR)/lib/curl_transport -+LIBWWW_TRANSPORT_DIR = $(SRCDIR)/lib/libwww_transport - - ifeq ($(ENABLE_LIBXML2_BACKEND),yes) - LIBXML_INCLUDES = $(LIBXML2_CFLAGS) - else -- LIBXML_INCLUDES = -Isrcdir/lib/expat/xmlparse -+ LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse - endif - - ifeq ($(ENABLE_LIBXML2_BACKEND),yes) - XML_PARSER_LIBDEP = $(shell xml2-config --libs) - else -@@ -80,26 +80,20 @@ - MAJ = 5 - # Major number of shared libraries in this directory - - include $(SRCDIR)/common.mk - -- --# This 'common.mk' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/common.mk: srcdir blddir -- - TRANSPORT_INCLUDES = \ - -I$(WININET_TRANSPORT_DIR) \ - -I$(CURL_TRANSPORT_DIR) \ - -I$(LIBWWW_TRANSPORT_DIR) \ - - BASIC_INCLUDES = \ -- -Iblddir/include \ -- -Isrcdir/include \ -- -Iblddir \ -- -Isrcdir/lib/util/include -+ -I$(BLDDIR)/include \ -+ -I$(SRCDIR)/include \ -+ -I$(BLDDIR) \ -+ -I$(SRCDIR)/lib/util/include - - - # TARGET_STATIC_LIBARIES, etc. are set by common.mk, based on - # TARGET_LIB_NAMES_PP. - -@@ -125,22 +119,22 @@ - $(LIBXMLRPC) \ - $(LIBXMLRPC_SERVER) \ - $(LIBXMLRPC_UTIL) - $(LIBXMLRPC_CPP_SH): LIBOBJECTS = XmlRpcCpp.osh - $(LIBXMLRPC_CPP_SH): LIBDEP = \ -- -Lblddir/src -lxmlrpc_server -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_server -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - LIBXMLRPCPP_SH = $(call shlibfn, lib$(LIBXMLRPCPP_NAME)) - - $(LIBXMLRPCPP_SH): $(LIBXMLRPCPP_MODS:%=%.osh) \ - $(LIBXMLRPC) \ - $(LIBXMLRPC_UTIL) - $(LIBXMLRPCPP_SH): LIBOBJECTS = $(LIBXMLRPCPP_MODS:%=%.osh) - $(LIBXMLRPCPP_SH): LIBDEP = \ -- -Lblddir/src -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - - LIBXMLRPC_SERVERPP_SH = $(call shlibfn, libxmlrpc_server++) -@@ -151,11 +145,11 @@ - $(LIBXMLRPC_UTIL) \ - $(LIBXMLRPC) - $(LIBXMLRPC_SERVERPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVERPP_MODS:%=%.osh) - $(LIBXMLRPC_SERVERPP_SH): LIBDEP = \ - -L. -l$(LIBXMLRPCPP_NAME) \ -- -Lblddir/src -lxmlrpc_server -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_server -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - LIBXMLRPC_SERVER_ABYSSPP_SH = $(call shlibfn, libxmlrpc_server_abyss++) - -@@ -167,11 +161,11 @@ - $(LIBXMLRPC_UTIL) \ - $(LIBXMLRPC) - $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_ABYSSPP_MODS:%=%.osh) - $(LIBXMLRPC_SERVER_ABYSSPP_SH): LIBDEP = \ - -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \ -- -Lblddir/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_server_abyss -lxmlrpc_server -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ - - $(LIBXMLRPC_SERVER_CGIPP_SH): $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) \ -@@ -179,11 +173,11 @@ - $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ - $(LIBXMLRPC) - $(LIBXMLRPC_SERVER_CGIPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGIPP_MODS:%=%.osh) - $(LIBXMLRPC_SERVER_CGIPP_SH): LIBDEP = \ - -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) \ -- -Lblddir/src -lxmlrpc_server -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_server -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - LIBXMLRPC_SERVER_PSTREAMPP_SH = $(call shlibfn, libxmlrpc_server_pstream++) - -@@ -193,11 +187,11 @@ - $(call shliblefn, libxmlrpc_packetsocket) \ - $(call shliblefn, libxmlrpc_server++) - $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBOBJECTS = $(LIBXMLRPC_SERVER_PSTREAMPP_MODS:%=%.osh) - $(LIBXMLRPC_SERVER_PSTREAMPP_SH): LIBDEP = \ - -L. -lxmlrpc_server++ -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \ -- -Lblddir/src -lxmlrpc_server -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_server -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util \ - - LIBXMLRPC_CLIENTPP_SH = $(call shlibfn, libxmlrpc_client++) - -@@ -208,22 +202,22 @@ - $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) \ - $(LIBXMLRPC_CLIENT) - $(LIBXMLRPC_CLIENTPP_SH): LIBOBJECTS = $(LIBXMLRPC_CLIENTPP_MODS:%=%.osh) - $(LIBXMLRPC_CLIENTPP_SH): LIBDEP = \ - -L. -l$(LIBXMLRPCPP_NAME) -lxmlrpc_packetsocket \ -- -Lblddir/src -lxmlrpc_client -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc_client -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - LIBXMLRPC_PACKETSOCKET_SH = $(call shlibfn, libxmlrpc_packetsocket) - - $(LIBXMLRPC_PACKETSOCKET_SH): $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) \ - $(call shliblefn, lib$(LIBXMLRPCPP_NAME)) - $(LIBXMLRPC_PACKETSOCKET_SH): LIBOBJECTS = $(LIBXMLRPC_PACKETSOCKET_MODS:%=%.osh) - $(LIBXMLRPC_PACKETSOCKET_SH): LIBDEP = \ - -L. -l$(LIBXMLRPCPP_NAME) \ -- -Lblddir/src -lxmlrpc \ -+ -L$(BLDDIR)/src -lxmlrpc \ - $(XML_PARSER_LIBDEP) \ - -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util - - libxmlrpc_cpp.a: XmlRpcCpp.o - libxmlrpc_cpp.a: LIBOBJECTS = XmlRpcCpp.o -diff -NrU5 xmlrpc-c-1.18.02.orig/src/cpp/test/Makefile xmlrpc-c-1.18.02/src/cpp/test/Makefile ---- xmlrpc-c-1.18.02.orig/src/cpp/test/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/src/cpp/test/Makefile 2009-04-28 00:48:59.000000000 +0200 -@@ -26,16 +26,11 @@ - LIBS += $(shell libwww-config --libs) - endif - - LIBS += -lpthread - --INCLUDES = -Isrcdir/include -I$(BLDDIR) -Isrcdir -Isrcdir/lib/util/include -- --# This 'Makefile' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --Makefile: srcdir -+INCLUDES = -I$(SRCDIR)/include -I$(BLDDIR) -I$(SRCDIR) -I$(SRCDIR)/lib/util/include - - include $(SRCDIR)/common.mk - - - TEST_OBJS = test.o registry.o server_abyss.o server_pstream.o tools.o -diff -NrU5 xmlrpc-c-1.18.02.orig/src/Makefile xmlrpc-c-1.18.02/src/Makefile ---- xmlrpc-c-1.18.02.orig/src/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/src/Makefile 2009-04-28 00:32:07.000000000 +0200 -@@ -115,15 +115,10 @@ - MAJ=3 - # Major number of shared libraries in this directory - - include $(SRCDIR)/common.mk - --# This 'common.mk' dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/common.mk: srcdir blddir -- - # TARGET_STATIC_LIBRARIES, etc. are set by common.mk, based on - # TARGET_LIBRARY_NAMES. - - - all: \ -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/common.mk xmlrpc-c-1.18.02/tools/common.mk ---- xmlrpc-c-1.18.02.orig/tools/common.mk 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/common.mk 2009-04-28 00:49:45.000000000 +0200 -@@ -5,11 +5,11 @@ - # the corresponding -l. - # - # Note that in a properly configured system, curl-config, etc. do not - # generate -L options for general directories. - --CLIENT_LDLIBS = -Lblddir/src -Lblddir/lib/libutil -+CLIENT_LDLIBS = -L$(BLDDIR)/src -L$(BLDDIR)/lib/libutil - - CLIENT_LDLIBS += -lxmlrpc_client -lxmlrpc -lxmlrpc_util - - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) - CLIENT_LDLIBS += $(shell libwww-config --libs) -@@ -21,17 +21,17 @@ - CLIENT_LDLIBS += $(shell wininet-config --libs) - endif - - CLIENT_LDLIBS += $(LDLIBS_XML) - --CLIENTPP_LDLIBS = -Lblddir/src/cpp -+CLIENTPP_LDLIBS = -L$(BLDDIR)/src/cpp - CLIENTPP_LDLIBS += -lxmlrpc_client++ -lxmlrpc_packetsocket -lxmlrpc++ - - include $(SRCDIR)/common.mk - - ifneq ($(OMIT_LIB_RULE),Y) --srcdir/tools/lib/dumpvalue.o: FORCE -+$(SRCDIR)/tools/lib/dumpvalue.o: FORCE - $(MAKE) -C $(dir $@) -f $(SRCDIR)/tools/lib/Makefile $(notdir $@) - endif - - .PHONY: install - install: install-common -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/lib/Makefile xmlrpc-c-1.18.02/tools/lib/Makefile ---- xmlrpc-c-1.18.02.orig/tools/lib/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/lib/Makefile 2009-04-28 00:40:19.000000000 +0200 -@@ -13,29 +13,24 @@ - OMIT_LIB_RULE = Y - - include $(SRCDIR)/tools/common.mk - - INCLUDES = \ -- -Isrcdir/$(SUBDIR)/include \ -- -Iblddir \ -- -Isrcdir/include \ -- -Isrcdir/lib/util/include \ -+ -I$(SRCDIR)/$(SUBDIR)/include \ -+ -I$(BLDDIR) \ -+ -I$(SRCDIR)/include \ -+ -I$(SRCDIR)/lib/util/include \ - - LIBOBJS = \ - dumpvalue.o \ - - .PHONY: all - all: $(LIBOBJS) - - %.o:%.c - $(CC) -c $(CFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: dep - dep: dep-common - -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xmlrpc/Makefile xmlrpc-c-1.18.02/tools/xmlrpc/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xmlrpc/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xmlrpc/Makefile 2009-04-28 00:38:11.000000000 +0200 -@@ -14,14 +14,14 @@ - - include $(SRCDIR)/tools/common.mk - - INCLUDES = \ - -I../lib/include \ -- -Iblddir \ -- -Iblddir/include \ -- -Isrcdir/include \ -- -Isrcdir/lib/util/include -+ -I$(BLDDIR) \ -+ -I$(BLDDIR)/include \ -+ -I$(SRCDIR)/include \ -+ -I$(SRCDIR)/lib/util/include - - LDFLAGS = $(LADD) - - all: xmlrpc - -@@ -32,11 +32,11 @@ - stripcaseeq.o \ - string_parser.o \ - - UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%) - --DUMPVALUE = srcdir/tools/lib/dumpvalue.o -+DUMPVALUE = $(SRCDIR)/tools/lib/dumpvalue.o - - # Can we just use $(LIBS) in the link? - - LIBS = $(LIBXMLRPC_CLIENT) $(LIBXMLRPC) $(LIBXMLRPC_XML) $(LIBXMLRPC_UTIL) - -@@ -46,15 +46,10 @@ - $(CCLD) -o $@ $(LDFLAGS) $(XMLRPC_OBJS) $(UTILS) $(CLIENT_LDLIBS) - - %.o:%.c $(BLDDIR)/include/xmlrpc-c/config.h - $(CC) -c $(CFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: dep - dep: dep-common - -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xml-rpc-api2cpp/Makefile xmlrpc-c-1.18.02/tools/xml-rpc-api2cpp/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xml-rpc-api2cpp/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xml-rpc-api2cpp/Makefile 2009-04-28 00:31:08.000000000 +0200 -@@ -46,15 +46,10 @@ - $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) - - %.o:%.cpp - $(CXX) -c $(CXXFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: clean - clean: clean-common - rm -f $(PROGS) -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xml-rpc-api2txt/Makefile xmlrpc-c-1.18.02/tools/xml-rpc-api2txt/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xml-rpc-api2txt/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xml-rpc-api2txt/Makefile 2009-04-28 00:30:54.000000000 +0200 -@@ -16,15 +16,10 @@ - - all: $(PROGS) - - include $(SRCDIR)/tools/common.mk - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: clean - clean: clean-common - rm -f $(PROGS) -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xmlrpc_cpp_proxy/Makefile xmlrpc-c-1.18.02/tools/xmlrpc_cpp_proxy/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xmlrpc_cpp_proxy/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xmlrpc_cpp_proxy/Makefile 2009-04-28 00:28:49.000000000 +0200 -@@ -45,15 +45,10 @@ - $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) $(LADD) - - %.o:%.cpp $(BLDDIR)/include/xmlrpc-c/config.h - $(CXX) -c $(CXXFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: clean - clean: clean-common - rm -f xmlrpc_cpp_proxy -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xmlrpc_pstream/Makefile xmlrpc-c-1.18.02/tools/xmlrpc_pstream/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xmlrpc_pstream/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xmlrpc_pstream/Makefile 2009-04-28 00:38:11.000000000 +0200 -@@ -16,22 +16,22 @@ - - include $(SRCDIR)/tools/common.mk - - INCLUDES = \ - -I../lib/include \ -- -Isrcdir/lib/util/include \ -- -Iblddir \ -- -Iblddir/include \ -- -Isrcdir/include \ -+ -I$(SRCDIR)/lib/util/include \ -+ -I$(BLDDIR) \ -+ -I$(BLDDIR)/include \ -+ -I$(SRCDIR)/include \ - - LDFLAGS = $(LADD) - - all: xmlrpc_pstream - - OBJECTS = \ - xmlrpc_pstream.o \ -- srcdir/tools/lib/dumpvalue.o \ -+ $(SRCDIR)/tools/lib/dumpvalue.o \ - - LIBS = \ - $(LIBXMLRPC_CLIENTPP) \ - $(LIBXMLRPCPP) \ - $(LIBXMLRPC_CLIENT) \ -@@ -52,18 +52,13 @@ - UTILS = $(UTIL_OBJS:%=$(UTIL_DIR)/%) - - xmlrpc_pstream: $(OBJECTS) $(LIBS) $(UTILS) - $(CXXLD) -o $@ $(LDFLAGS) $(OBJECTS) $(UTILS) $(LDLIBS) $(LADD) - --%.o:%.cpp blddir/include/xmlrpc-c/config.h -+%.o:%.cpp $(BLDDIR)/include/xmlrpc-c/config.h - $(CXX) -c $(CXXFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: clean - clean: clean-common - rm -f xmlrpc_pstream -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xmlrpc_transport/Makefile xmlrpc-c-1.18.02/tools/xmlrpc_transport/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xmlrpc_transport/Makefile 2009-04-28 00:23:33.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xmlrpc_transport/Makefile 2009-04-28 00:29:09.000000000 +0200 -@@ -39,15 +39,10 @@ - $(CCLD) -o $@ $(LDFLAGS) $< $(CLIENT_LDLIBS) $(UTILS) - - %.o:%.c - $(CC) -c $(CFLAGS_ALL) $< - --# This common.mk dependency makes sure the symlinks get built before --# this make file is used for anything. -- --$(SRCDIR)/tools/common.mk: srcdir blddir -- - include depend.mk - - .PHONY: dep - dep: dep-common - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dumpvalue.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dumpvalue.patch deleted file mode 100644 index d7d49b3ace30..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.18.02/dumpvalue.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -NrU5 xmlrpc-c-1.18.02.orig/tools/xmlrpc_pstream/Makefile xmlrpc-c-1.18.02/tools/xmlrpc_pstream/Makefile ---- xmlrpc-c-1.18.02.orig/tools/xmlrpc_pstream/Makefile 2009-04-26 16:05:12.000000000 +0200 -+++ xmlrpc-c-1.18.02/tools/xmlrpc_pstream/Makefile 2009-04-26 22:37:06.000000000 +0200 -@@ -27,11 +27,11 @@ - - all: xmlrpc_pstream - - OBJECTS = \ - xmlrpc_pstream.o \ -- $(TOOLSDIR)/lib/dumpvalue.o \ -+ srcdir/tools/lib/dumpvalue.o \ - - LIBS = \ - $(LIBXMLRPC_CLIENTPP) \ - $(LIBXMLRPCPP) \ - $(LIBXMLRPC_CLIENT) \ diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch deleted file mode 100644 index 73a552b71a91..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.28.00-advanced-test.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: test/method_registry.c -=================================================================== ---- test/method_registry.c (revision 2200) -+++ test/method_registry.c (working copy) -@@ -37,9 +37,9 @@ - #ifndef WIN32 - /* xmlrpc_server_version_major, etc. are not exported from a Windows DLL */ - -- TEST(major = xmlrpc_server_version_major); -- TEST(minor = xmlrpc_server_version_minor); -- TEST(point = xmlrpc_server_version_point); -+ TEST(major == xmlrpc_server_version_major); -+ TEST(minor == xmlrpc_server_version_minor); -+ TEST(point == xmlrpc_server_version_point); - #endif - } - -Index: test/client.c -=================================================================== ---- test/client.c (revision 2200) -+++ test/client.c (working copy) -@@ -26,9 +26,9 @@ - #ifndef WIN32 - /* xmlrpc_client_version_major, etc. are not exported from a Windows DLL */ - -- TEST(major = xmlrpc_client_version_major); -- TEST(minor = xmlrpc_client_version_minor); -- TEST(point = xmlrpc_client_version_point); -+ TEST(major == xmlrpc_client_version_major); -+ TEST(minor == xmlrpc_client_version_minor); -+ TEST(point == xmlrpc_client_version_point); - #endif - } - -Index: test/test.c -=================================================================== ---- test/test.c (revision 2200) -+++ test/test.c (working copy) -@@ -87,9 +87,9 @@ - #ifndef WIN32 - /* xmlrpc_version_major, etc. are not exported from a Windows DLL */ - -- TEST(major = xmlrpc_version_major); -- TEST(minor = xmlrpc_version_minor); -- TEST(point = xmlrpc_version_point); -+ TEST(major == xmlrpc_version_major); -+ TEST(minor == xmlrpc_version_minor); -+ TEST(point == xmlrpc_version_point); - #endif - } - diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch new file mode 100644 index 000000000000..affa917f7427 --- /dev/null +++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.32.05-Wimplicit.patch @@ -0,0 +1,20 @@ +--- a/common.mk ++++ b/common.mk +@@ -17,7 +17,7 @@ + # fully made. + .DELETE_ON_ERROR: + +-GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef -Wimplicit \ ++GCC_WARNINGS = -Wall -W -Wno-uninitialized -Wundef \ + -Wno-unknown-pragmas + # We need -Wwrite-strings after we fix all the missing consts + # +@@ -27,7 +27,7 @@ + # on -Wuninitialized for all the others. + + GCC_C_WARNINGS = $(GCC_WARNINGS) \ +- -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes ++ -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wimplicit + + GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wsynth + diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-gcc43.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-gcc43.patch deleted file mode 100644 index 6aa705c29a0c..000000000000 --- a/dev-libs/xmlrpc-c/files/xmlrpc-c-gcc43.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -rup xmlrpc-c-1.06.03/examples/cpp/sample_add_client_complex.cpp xmlrpc-c-devel/examples/cpp/sample_add_client_complex.cpp ---- xmlrpc-c-1.06.03/examples/cpp/sample_add_client_complex.cpp 2005-11-06 21:28:00.000000000 +0100 -+++ xmlrpc-c-devel/examples/cpp/sample_add_client_complex.cpp 2008-01-17 16:42:40.000000000 +0100 -@@ -15,6 +15,7 @@ - =============================================================================*/ - - #include <cassert> -+#include <cstdlib> - #include <string> - #include <iostream> - #include <xmlrpc-c/girerr.hpp> -diff -rup xmlrpc-c-1.06.03/examples/cpp/xmlrpc_sample_add_client.cpp xmlrpc-c-devel/examples/cpp/xmlrpc_sample_add_client.cpp ---- xmlrpc-c-1.06.03/examples/cpp/xmlrpc_sample_add_client.cpp 2005-06-05 02:01:35.000000000 +0200 -+++ xmlrpc-c-devel/examples/cpp/xmlrpc_sample_add_client.cpp 2008-01-17 16:42:04.000000000 +0100 -@@ -1,4 +1,5 @@ - #include <string> -+#include <cstdlib> - #include <iostream> - #include <xmlrpc-c/girerr.hpp> - #include <xmlrpc-c/base.hpp> -diff -rup xmlrpc-c-1.06.03/include/xmlrpc-c/oldcppwrapper.hpp xmlrpc-c-devel/include/xmlrpc-c/oldcppwrapper.hpp ---- xmlrpc-c-1.06.03/include/xmlrpc-c/oldcppwrapper.hpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/include/xmlrpc-c/oldcppwrapper.hpp 2008-01-17 16:29:31.000000000 +0100 -@@ -26,6 +26,7 @@ - - - #include <string> -+#include <cstdlib> - #include <xmlrpc-c/base.h> - #include <xmlrpc-c/client.h> - #include <xmlrpc-c/server.h> -diff -rup xmlrpc-c-1.06.03/src/cpp/client_simple.cpp xmlrpc-c-devel/src/cpp/client_simple.cpp ---- xmlrpc-c-1.06.03/src/cpp/client_simple.cpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/src/cpp/client_simple.cpp 2008-01-17 16:27:18.000000000 +0100 -@@ -1,4 +1,5 @@ - #include <string> -+#include <cstring> - - #include "xmlrpc-c/girerr.hpp" - using girerr::error; -diff -rup xmlrpc-c-1.06.03/src/cpp/server_abyss.cpp xmlrpc-c-devel/src/cpp/server_abyss.cpp ---- xmlrpc-c-1.06.03/src/cpp/server_abyss.cpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/src/cpp/server_abyss.cpp 2008-01-17 16:26:23.000000000 +0100 -@@ -1,4 +1,5 @@ - #include <cassert> -+#include <cstdlib> - #include <string> - #include <memory> - #include <signal.h> -diff -rup xmlrpc-c-1.06.03/src/cpp/value.cpp xmlrpc-c-devel/src/cpp/value.cpp ---- xmlrpc-c-1.06.03/src/cpp/value.cpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/src/cpp/value.cpp 2008-01-17 16:25:45.000000000 +0100 -@@ -31,6 +31,7 @@ - #include <string> - #include <vector> - #include <time.h> -+#include <cstdlib> - - #include "xmlrpc-c/girerr.hpp" - using girerr::error; -diff -rup xmlrpc-c-1.06.03/src/cpp/XmlRpcCpp.cpp xmlrpc-c-devel/src/cpp/XmlRpcCpp.cpp ---- xmlrpc-c-1.06.03/src/cpp/XmlRpcCpp.cpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/src/cpp/XmlRpcCpp.cpp 2008-01-17 16:24:46.000000000 +0100 -@@ -25,6 +25,8 @@ - - - #include <string> -+#include <cstdlib> -+#include <memory.h> - #include "xmlrpc-c/oldcppwrapper.hpp" - - using std::string; -diff -rup xmlrpc-c-1.06.03/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp xmlrpc-c-devel/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp ---- xmlrpc-c-1.06.03/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp 2008-01-17 16:43:30.000000000 +0100 -+++ xmlrpc-c-devel/tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cpp 2008-01-17 16:28:34.000000000 +0100 -@@ -1,5 +1,6 @@ - #include <iostream> - #include <stdexcept> -+#include <cstdlib> - - #include "xmlrpc-c/oldcppwrapper.hpp" - diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild index fd2745167a65..0db9c38d65a7 100644 --- a/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild +++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.10 2013/02/26 14:54:24 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlrpc-c/xmlrpc-c-1.32.05.ebuild,v 1.11 2013/02/27 06:19:23 jer Exp $ EAPI="4" @@ -50,6 +50,7 @@ export LC_ALL=C export LANG=C src_prepare() { + epatch "${FILESDIR}"/${PN}-1.32.05-Wimplicit.patch sed -i \ -e "/CFLAGS_COMMON/s|-g -O3$||" \ -e "/CXXFLAGS_COMMON/s|-g$||" \ |