1 |
commit: 54e8206a73b4900d55b28424720f95640a3d8850 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jan 26 07:14:41 2021 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 27 18:22:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e8206a |
7 |
|
8 |
net-libs/gsoap: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/19219 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
14 |
|
15 |
net-libs/gsoap/files/gsoap-2.8.70-parallel.patch | 10 -- |
16 |
.../gsoap/files/gsoap-2.8.70-shared_libs.patch | 141 --------------------- |
17 |
.../files/gsoap-2.8.93-fix-parallel-build.patch | 17 --- |
18 |
3 files changed, 168 deletions(-) |
19 |
|
20 |
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch b/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch |
21 |
deleted file mode 100644 |
22 |
index 8abd36d937c..00000000000 |
23 |
--- a/net-libs/gsoap/files/gsoap-2.8.70-parallel.patch |
24 |
+++ /dev/null |
25 |
@@ -1,10 +0,0 @@ |
26 |
---- gsoap-2.8/gsoap/src/Makefile.am |
27 |
-+++ gsoap-2.8/gsoap/src/Makefile.am |
28 |
-@@ -5,6 +5,7 @@ |
29 |
- ## you have all needed files, that a GNU package needs |
30 |
- AUTOMAKE_OPTIONS = foreign 1.4 |
31 |
- |
32 |
-+include MakefileManual |
33 |
- |
34 |
- #LIBS= |
35 |
- AM_YFLAGS=-d -v |
36 |
|
37 |
diff --git a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch |
38 |
deleted file mode 100644 |
39 |
index cb3f11ed129..00000000000 |
40 |
--- a/net-libs/gsoap/files/gsoap-2.8.70-shared_libs.patch |
41 |
+++ /dev/null |
42 |
@@ -1,141 +0,0 @@ |
43 |
---- gsoap-2.8/configure.ac |
44 |
-+++ gsoap-2.8/configure.ac |
45 |
-@@ -17,7 +17,7 @@ |
46 |
- AC_PROG_YACC |
47 |
- AC_PROG_CPP |
48 |
- AC_PROG_RANLIB |
49 |
--#AM_PROG_LIBTOOL |
50 |
-+AM_PROG_LIBTOOL |
51 |
- AC_PROG_LN_S |
52 |
- AC_PROG_AWK |
53 |
- AC_PROG_INSTALL |
54 |
-@@ -278,15 +278,17 @@ |
55 |
- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz" |
56 |
- SAMPLE_INCLUDES= |
57 |
- SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz" |
58 |
-- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" |
59 |
-+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" |
60 |
-+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
61 |
- else |
62 |
- AC_MSG_RESULT(no) |
63 |
- WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP" |
64 |
- # compile with wsdl2h when OPENSSL is available |
65 |
-- WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz" |
66 |
-+ WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto" |
67 |
- SAMPLE_INCLUDES= |
68 |
- SAMPLE_SSL_LIBS="-lssl -lcrypto -lz" |
69 |
-- WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a" |
70 |
-+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a" |
71 |
-+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
72 |
- fi |
73 |
- if test -n "$ZLIB"; then |
74 |
- WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}" |
75 |
-@@ -305,7 +307,8 @@ |
76 |
- WSDL2H_EXTRA_FLAGS= |
77 |
- SAMPLE_SSL_LIBS= |
78 |
- SAMPLE_INCLUDES= |
79 |
-- WSDL2H_SOAP_CPP_LIB="libgsoap++.a" |
80 |
-+ WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a" |
81 |
-+ WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la" |
82 |
- fi |
83 |
- AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes") |
84 |
- AC_SUBST(WITH_OPENSSL) |
85 |
-@@ -313,7 +316,8 @@ |
86 |
- AC_SUBST(WSDL2H_EXTRA_LIBS) |
87 |
- AC_SUBST(SAMPLE_INCLUDES) |
88 |
- AC_SUBST(SAMPLE_SSL_LIBS) |
89 |
--AC_SUBST(WSDL2H_SOAP_CPP_LIB) |
90 |
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB) |
91 |
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB) |
92 |
- |
93 |
- # enable the compile of the samples |
94 |
- AC_ARG_ENABLE(samples, |
95 |
---- gsoap-2.8/gsoap/Makefile.am |
96 |
-+++ gsoap-2.8/gsoap/Makefile.am |
97 |
-@@ -49,6 +49,29 @@ |
98 |
- libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp |
99 |
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
100 |
- |
101 |
-+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la |
102 |
-+SOVERSION = 0 |
103 |
-+libgsoap_la_SOURCES = stdsoap2.c dom.c |
104 |
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) |
105 |
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION) |
106 |
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp |
107 |
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) |
108 |
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION) |
109 |
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c |
110 |
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES |
111 |
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION) |
112 |
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp |
113 |
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES |
114 |
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION) |
115 |
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c |
116 |
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
117 |
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION) |
118 |
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz |
119 |
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp |
120 |
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES |
121 |
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION) |
122 |
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz |
123 |
-+ |
124 |
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp |
125 |
- |
126 |
- include_HEADERS = stdsoap2.h |
127 |
---- gsoap-2.8/gsoap/samples/autotest/Makefile.am |
128 |
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am |
129 |
-@@ -14,7 +14,7 @@ |
130 |
- WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl |
131 |
- SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h |
132 |
- SOAP_CPP_SRC=soapC.cpp soapServer.cpp |
133 |
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a |
134 |
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a |
135 |
- |
136 |
- $(SOAP_CPP_SRC) : $(WSDLINPUT) |
137 |
- $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) |
138 |
-@@ -40,6 +40,6 @@ |
139 |
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) |
140 |
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) |
141 |
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp |
142 |
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS) |
143 |
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS) |
144 |
- |
145 |
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap |
146 |
---- gsoap-2.8/gsoap/samples/databinding/Makefile.am |
147 |
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am |
148 |
-@@ -14,7 +14,7 @@ |
149 |
- WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd |
150 |
- SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h |
151 |
- SOAP_CPP_SRC=addressC.cpp |
152 |
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a |
153 |
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a |
154 |
- |
155 |
- $(SOAP_CPP_SRC) : $(WSDLINPUT) |
156 |
- $(WSDL) $(WSDL_FLAGS) $(WSDLINPUT) |
157 |
-@@ -28,6 +28,6 @@ |
158 |
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform) |
159 |
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS) |
160 |
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp |
161 |
--address_LDADD=$(SOAP_CPP_LIB) |
162 |
-+address_LDADD=$(SOAP_CPP_SHARED_LIB) |
163 |
- |
164 |
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap |
165 |
---- gsoap-2.8/gsoap/wsdl/Makefile.am |
166 |
-+++ gsoap-2.8/gsoap/wsdl/Makefile.am |
167 |
-@@ -10,7 +10,7 @@ |
168 |
- AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin |
169 |
- AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin |
170 |
- SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT) |
171 |
--SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB) |
172 |
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB) |
173 |
- SOAP_CPP_SRC=wsdlC.cpp |
174 |
- SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h |
175 |
- SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import |
176 |
-@@ -32,6 +32,6 @@ |
177 |
- if WITH_OPENSSL |
178 |
- wsdl2h_SOURCES += $(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c $(top_srcdir)/gsoap/plugin/threads.c |
179 |
- endif |
180 |
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS) |
181 |
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS) |
182 |
- |
183 |
- CLEANFILES= *~ *C.cpp *H.h *Stub.h *.nsmap |
184 |
|
185 |
diff --git a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch b/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch |
186 |
deleted file mode 100644 |
187 |
index 27e2a94d14e..00000000000 |
188 |
--- a/net-libs/gsoap/files/gsoap-2.8.93-fix-parallel-build.patch |
189 |
+++ /dev/null |
190 |
@@ -1,17 +0,0 @@ |
191 |
---- a/gsoap/src/Makefile.am |
192 |
-+++ b/gsoap/src/Makefile.am |
193 |
-@@ -10,11 +10,13 @@ AUTOMAKE_OPTIONS = foreign 1.4 |
194 |
- AM_YFLAGS=-d -v |
195 |
- AM_LFLAGS=$(LEX_FLAGS) |
196 |
- |
197 |
-+BUILT_SOURCES = soapcpp2_yacc.h |
198 |
-+ |
199 |
- bin_PROGRAMS=soapcpp2 |
200 |
- |
201 |
- soapcpp2_CFLAGS=$(BISON_DEFINE) $(LEX_DEFINE) $(C_DEBUG_FLAGS) $(SOAPCPP2_IMPORTPATH) -D$(platform) |
202 |
- soapcpp2_LDADD=$(YACC_LIB) $(LEXLIB) |
203 |
--soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_yacc.h soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c |
204 |
-+soapcpp2_SOURCES= soapcpp2_yacc.y soapcpp2_lex.l symbol2.c error2.c init2.c soapcpp2.c |
205 |
- |
206 |
- CLEANFILES= *~ soapcpp2_lex.c soapcpp2_yacc.c soapcpp2_yacc.h soapcpp2_yacc.output |
207 |
- |