OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Aug-2004 09:27:49
Branch: HEAD Handle: 2004081808274900
Modified files:
openpkg-src/easysoap easysoap.patch easysoap.spec
Log:
port for GCC 3.4.X and remove unneeded build targets from the main
Makefile
Summary:
Revision Changes Path
1.3 +59 -12 openpkg-src/easysoap/easysoap.patch
1.16 +5 -2 openpkg-src/easysoap/easysoap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/easysoap/easysoap.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 easysoap.patch
--- openpkg-src/easysoap/easysoap.patch 20 Jan 2003 18:20:57 -0000 1.2
+++ openpkg-src/easysoap/easysoap.patch 18 Aug 2004 07:27:49 -0000 1.3
@@ -1,6 +1,7 @@
-diff -Naur EasySoap++-0.6.1.orig/include/easysoap/SOAPParameter.h
EasySoap++-0.6.1/include/easysoap/SOAPParameter.h
---- EasySoap++-0.6.1.orig/include/easysoap/SOAPParameter.h 2002-12-10
16:14:57.000000000 +0100
-+++ EasySoap++-0.6.1/include/easysoap/SOAPParameter.h 2002-12-10
16:15:05.000000000 +0100
+Index: include/easysoap/SOAPParameter.h.orig
+diff -Nau include/easysoap/SOAPParameter.h.orig include/easysoap/SOAPParameter.h
+--- include/easysoap/SOAPParameter.h.orig 2002-12-10 16:14:57.000000000 +0100
++++ include/easysoap/SOAPParameter.h 2002-12-10 16:15:05.000000000 +0100
@@ -168,7 +168,7 @@
Data(const Data&);
};
@@ -10,9 +11,10 @@
Pool m_pool;
SOAPParameter *m_parent;
-diff -Naur EasySoap++-0.6.1.orig/src/XMLParser.cpp
EasySoap++-0.6.1/src/XMLParser.cpp
---- EasySoap++-0.6.1.orig/src/XMLParser.cpp 2002-12-10 16:14:57.000000000 +0100
-+++ EasySoap++-0.6.1/src/XMLParser.cpp 2002-12-10 16:20:11.000000000 +0100
+Index: src/XMLParser.cpp
+diff -Nau src/XMLParser.cpp.orig src/XMLParser.cpp
+--- src/XMLParser.cpp.orig 2002-12-10 16:14:57.000000000 +0100
++++ src/XMLParser.cpp 2002-12-10 16:20:11.000000000 +0100
@@ -48,7 +48,7 @@
{
if (m_parser)
@@ -77,9 +79,10 @@
return 0;
}
-diff -Naur EasySoap++-0.6.1.orig/include/easysoap/SOAPDispatchHandler.h
EasySoap++-0.6.1/include/easysoap/SOAPDispatchHandler.h
---- EasySoap++-0.6.1.orig/include/easysoap/SOAPDispatchHandler.h Mon Jan 20
19:03:22 2003
-+++ EasySoap++-0.6.1/include/easysoap/SOAPDispatchHandler.h Mon Jan 20 18:59:32
2003
+Index: include/easysoap/SOAPDispatchHandler.h
+diff -Naur include/easysoap/SOAPDispatchHandler.h.orig
include/easysoap/SOAPDispatchHandler.h
+--- include/easysoap/SOAPDispatchHandler.h Mon Jan 20 19:03:22 2003
++++ include/easysoap/SOAPDispatchHandler.h Mon Jan 20 18:59:32 2003
@@ -61,7 +61,7 @@
bool ExecuteMethod(const SOAPEnvelope& request, SOAPMethod& response)
{
@@ -98,9 +101,10 @@
if (i)
{
-diff -Naur EasySoap++-0.6.1.orig/include/easysoap/SOAPHashMap.h
EasySoap++-0.6.1/include/easysoap/SOAPHashMap.h
---- EasySoap++-0.6.1.orig/include/easysoap/SOAPHashMap.h Mon Jan 20 19:03:37
2003
-+++ EasySoap++-0.6.1/include/easysoap/SOAPHashMap.h Mon Jan 20 18:58:30 2003
+Index: include/easysoap/SOAPHashMap.h
+diff -Nau include/easysoap/SOAPHashMap.h.orig include/easysoap/SOAPHashMap.h
+--- include/easysoap/SOAPHashMap.h.orig Mon Jan 20 19:03:37 2003
++++ include/easysoap/SOAPHashMap.h Mon Jan 20 18:58:30 2003
@@ -117,13 +117,13 @@
{
private:
@@ -192,3 +196,46 @@
for (i = newelements.Begin(); i != newelements.End(); ++i)
*i = 0;
+Index: src/SOAPBase64.cpp
+diff -Nau src/SOAPBase64.cpp.orig src/SOAPBase64.cpp
+--- src/SOAPBase64.cpp.orig 2004-08-17 18:28:29 +0200
++++ src/SOAPBase64.cpp 2004-08-17 18:27:48 +0200
+@@ -61,9 +61,9 @@
+ for (i = '0'; i <= '9'; ++i)
+ base64decode[i] = 52 + i - '0';
+
+- base64decode['+'] = 62;
+- base64decode['/'] = 63;
+- base64decode[base64pad] = 0;
++ base64decode[(int)'+'] = 62;
++ base64decode[(int)'/'] = 63;
++ base64decode[(int)base64pad] = 0;
+
+ return 1;
+ }
+Index: include/easysoap/es_conf.h
+diff -Nau include/easysoap/es_conf.h.orig include/easysoap/es_conf.h
+--- include/easysoap/es_conf.h.orig 2001-11-21 06:59:53 +0100
++++ include/easysoap/es_conf.h 2004-08-17 18:57:37 +0200
+@@ -33,11 +33,17 @@
+ // want the typename keyword before a type declaration.
+ // Some compilers on the other hand don't like it one
+ // bit ....
+-#ifdef HAVE_TEMPLATE_KEYWORD_QUALIFIER
++//
++// The OpenPKG easysoap package depends on GCC, which
++// definitely allows (even requires) 'typename'.
++// This even seems specified by ISO 14882 as well.
+ #define MEMBER_TYPE(T) typename T
+-#else
+-#define MEMBER_TYPE(T) T
+-#endif
++
++// #ifdef HAVE_TEMPLATE_KEYWORD_QUALIFIER
++// #define MEMBER_TYPE(T) typename T
++// #else
++// #define MEMBER_TYPE(T) T
++// #endif
+
+ //
+ // Let's set up a macro for compilers that
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/easysoap/easysoap.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 easysoap.spec
--- openpkg-src/easysoap/easysoap.spec 13 May 2004 18:18:16 -0000 1.15
+++ openpkg-src/easysoap/easysoap.spec 18 Aug 2004 07:27:49 -0000 1.16
@@ -34,7 +34,7 @@
Group: Network
License: LGPL
Version: 0.6.1
-Release: 20040513
+Release: 20040818
# list of sources
Source0: http://osdn.dl.sourceforge.net/easysoap/EasySoap++-%{version}.tar.gz
@@ -62,7 +62,10 @@
%prep
%setup -q -n EasySoap++-%{version}
- %patch -p1
+ %{l_shtool} subst \
+ -e 's;\(SUBDIRS *= *include src\).*;\1;' \
+ Makefile.in
+ %patch -p0
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
