summaryrefslogtreecommitdiffstats
path: root/tderesources/groupwise/soap/patches/broken_namespace.diff
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:50 -0600
commitb363d2579af0a11b77e698aed2e1021c2233b644 (patch)
treef4a47b87354b7a6a3b266c8121bd8ddaeb7accaa /tderesources/groupwise/soap/patches/broken_namespace.diff
parent61bddfe3a7226b18c68a76124b727c736f431688 (diff)
downloadtdepim-b363d2579af0a11b77e698aed2e1021c2233b644.tar.gz
tdepim-b363d2579af0a11b77e698aed2e1021c2233b644.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/groupwise/soap/patches/broken_namespace.diff')
-rw-r--r--tderesources/groupwise/soap/patches/broken_namespace.diff20
1 files changed, 20 insertions, 0 deletions
diff --git a/tderesources/groupwise/soap/patches/broken_namespace.diff b/tderesources/groupwise/soap/patches/broken_namespace.diff
new file mode 100644
index 000000000..46c5eee41
--- /dev/null
+++ b/tderesources/groupwise/soap/patches/broken_namespace.diff
@@ -0,0 +1,20 @@
+--- /build/progs/gsoap-linux-2.7/stdsoap2.cpp 2004-10-10 20:33:26.000000000 +0200
++++ ../stdsoap2.cpp 2004-10-25 15:44:05.707573480 +0200
+@@ -2249,10 +2249,15 @@
+ SOAP_FMAC1
+ int
+ SOAP_FMAC2
+-soap_match_tag(struct soap *soap, const char *tag1, const char *tag2)
++soap_match_tag(struct soap *soap, const char *tag1, const char *tag2_)
+ { register const char *s, *t;
+- if (!tag1 || !tag2 || !*tag2)
++ if (!tag1 || !tag2_ || !*tag2_)
+ return SOAP_OK;
++
++ const char *tag2;
++ if ( strncmp( tag2_, "ns1:", 4 ) == 0 ) tag2 = tag2_ + 4;
++ else tag2 = tag2_;
++
+ s = strchr(tag1, ':');
+ t = strchr(tag2, ':');
+ if (t)