- updated to 1.39.12 (from super stable branch)

[packages/xmlrpc-c.git] / xmlrpc-c-soname.patch

diff --git a/xmlrpc-c-soname.patch b/xmlrpc-c-soname.patch
index c98402572c6b2c3b5fdaec400ddeeea959616197..719b649277a889cebd59ecfa818a4d76b413f077 100644 (file)
--- a/xmlrpc-c-soname.patch
+++ b/xmlrpc-c-soname.patch
@@ -1,5 +1,5 @@
---- xmlrpc-c/src/Makefile.orig 2013-03-03 16:31:13.000000000 +0100
-+++ xmlrpc-c/src/Makefile      2013-03-03 17:08:21.062194251 +0100
+--- xmlrpc-c-1.39.12/src/Makefile.orig 2014-12-28 19:55:09.000000000 +0100
++++ xmlrpc-c-1.39.12/src/Makefile      2018-02-18 21:01:54.376804414 +0100
 @@ -15,7 +15,7 @@
    SUBDIRS += cpp
  endif
@@ -26,8 +26,8 @@
 +  $(call shliblefn, libxmlrpc-c)
  $(LIBXMLRPC_SERVER): LIBOBJECTS = $(LIBXMLRPC_SERVER_MODS:%=%.osh)
  $(LIBXMLRPC_SERVER): LIBDEP = \
--   -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
-+   -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+-   -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
++   -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
  
  LIBXMLRPC_SERVER_ABYSS = $(call shlibfn, libxmlrpc_server_abyss)
  
@@ -41,8 +41,8 @@
  $(LIBXMLRPC_SERVER_ABYSS): LIBDEP = \
    -L. -lxmlrpc_server \
    -L$(LIBXMLRPC_ABYSS_DIR) -lxmlrpc_abyss \
--  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
-+  -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+-  -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
++  -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
  ifeq ($(MSVCRT),yes)
    $(LIBXMLRPC_SERVER_ABYSS):  LIBDEP += -lws2_32 -lwsock32
  endif
@@ -55,8 +55,8 @@
  $(LIBXMLRPC_SERVER_CGI): LIBOBJECTS = $(LIBXMLRPC_SERVER_CGI_MODS:%=%.osh)
  $(LIBXMLRPC_SERVER_CGI): LIBDEP = \
    -L. -lxmlrpc_server \
--  -L. -lxmlrpc $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
-+  -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) -L$(LIBXMLRPC_UTIL_DIR) -lxmlrpc_util
+-  -L. -lxmlrpc $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
++  -L. -lxmlrpc-c $(XML_PARSER_LIBDEP) $(LIBXMLRPC_UTIL_LIBDEP)
  
  LIBXMLRPC_CLIENT = $(call shlibfn, libxmlrpc_client)
  
@@ -109,14 +109,14 @@
  LIBXMLRPC_CLIENT_A       = $(BLDDIR)/src/libxmlrpc_client.a
  LIBXMLRPC_SERVER_A       = $(BLDDIR)/src/libxmlrpc_server.a
  LIBXMLRPC_SERVER_ABYSS_A = $(BLDDIR)/src/libxmlrpc_server_abyss.a
---- xmlrpc-c/xmlrpc-c-config.main.orig 2013-03-03 17:06:35.282198688 +0100
-+++ xmlrpc-c/xmlrpc-c-config.main      2013-03-03 17:44:58.868768683 +0100
-@@ -45,7 +45,7 @@
+--- xmlrpc-c-1.39.12/xmlrpc-c-config.main.orig 2018-02-18 18:00:53.710261758 +0100
++++ xmlrpc-c-1.39.12/xmlrpc-c-config.main      2018-02-18 21:02:28.870137355 +0100
+@@ -46,7 +46,7 @@
  
  the_libdirs="-L$LIBINST_DIR $the_libdirs"
  
--the_libs="-lxmlrpc  ${LIBXML} -lxmlrpc_util"
-+the_libs="-lxmlrpc-c ${LIBXML} -lxmlrpc_util"
+-the_libs="-lxmlrpc  ${LIBXML} -lxmlrpc_util -lpthread"
++the_libs="-lxmlrpc-c ${LIBXML} -lxmlrpc_util -lpthread"
  the_rpath="-R$LIBINST_DIR $the_rpath"
  the_wl_rpath="-Wl,-rpath,$LIBINST_DIR $the_wl_rpath"
  
@@ -203,9 +203,9 @@
 -Libs:                 -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
 +Libs:                 -L${libdir} -lxmlrpc-c @xmlrpc_pkgconfig_libs@
  Cflags:                       -I${includedir}
---- xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:06:26.335153315 +0000
-+++ xmlrpc-c-1.20.3/src/CMakeLists.txt 2009-12-05 22:09:49.944925301 +0000
-@@ -51,8 +51,8 @@
+--- xmlrpc-c-1.39.12/src/CMakeLists.txt.orig   2018-02-25 15:31:16.940125278 +0100
++++ xmlrpc-c-1.39.12/src/CMakeLists.txt        2018-02-25 15:35:10.696789278 +0100
+@@ -48,8 +48,8 @@
  
  
  
@@ -213,12 +213,12 @@
 -add_library(xmlrpc SHARED
 +### libxmlrpc-c.so
 +add_library(xmlrpc-c SHARED
-   double.c parse_datetime.c parse_value.c resource.c trace.c version.c
+   base_global.c double.c parse_datetime.c parse_value.c resource.c trace.c version.c
+   json.c
    ${xmlrpc_xml_parser}
-   xmlrpc_data.c xmlrpc_datetime.c xmlrpc_string.c
-@@ -60,19 +60,19 @@
+@@ -58,19 +58,19 @@
    xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
-   xmlrpc_base64.c xmlrpc_authcookie.c)
+   xmlrpc_authcookie.c)
  
 -set_target_properties(xmlrpc
 +set_target_properties(xmlrpc-c
@@ -240,7 +240,7 @@
  set_target_properties(xmlrpc_client
    PROPERTIES
    COMPILE_FLAGS "${client_CFLAGS}")
-@@ -82,7 +82,7 @@
+@@ -80,7 +80,7 @@
  ### libxmlrpc_server.so
  add_library(xmlrpc_server SHARED
    registry.c method.c system_method.c)
@@ -249,21 +249,21 @@
  list(APPEND lib_TARGETS xmlrpc_server)
  ensc_pkgconfig(xmlrpc_server)
  
---- xmlrpc-c/src/cpp/CMakeLists.txt.orig       2011-03-20 15:41:37.000000000 +0100
-+++ xmlrpc-c/src/cpp/CMakeLists.txt    2011-03-20 15:42:37.524711244 +0100
+--- xmlrpc-c-1.39.12/src/cpp/CMakeLists.txt.orig       2018-02-25 15:31:16.956791945 +0100
++++ xmlrpc-c-1.39.12/src/cpp/CMakeLists.txt    2018-02-25 15:37:15.140121190 +0100
 @@ -4,13 +4,13 @@
  add_library(xmlrpc++ SHARED
-   base64.cpp env_wrap.cpp fault.cpp girerr.cpp girmem.cpp
+   fault.cpp global.cpp
    outcome.cpp param_list.cpp value.cpp xml.cpp)
--target_link_libraries(xmlrpc++ xmlrpc pthread)
-+target_link_libraries(xmlrpc++ xmlrpc-c pthread)
+-target_link_libraries(xmlrpc++ xmlrpc_util++ xmlrpc pthread)
++target_link_libraries(xmlrpc++ xmlrpc_util++ xmlrpc-c pthread)
  list(APPEND lib_TARGETS xmlrpc++)
  ensc_pkgconfig(xmlrpc++)
  
  ####### libxmlrpc_cpp.so
  add_library(xmlrpc_cpp            SHARED XmlRpcCpp)
--target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server xmlrpc_client)
-+target_link_libraries(xmlrpc_cpp xmlrpc-c xmlrpc_server xmlrpc_client)
+-target_link_libraries(xmlrpc_cpp xmlrpc xmlrpc_server)
++target_link_libraries(xmlrpc_cpp xmlrpc-c xmlrpc_server)
  list(APPEND lib_TARGETS xmlrpc_cpp)
  ensc_pkgconfig(xmlrpc_cpp)