[kde-solaris] Patches for KDE libs and base on solaris
Ian Reinhart Geiser
kde-solaris@mail.kde.org
Tue Nov 12 05:44:11 2002
--Boundary-00=_ibI09KAerO1pWuh
Content-Type: Text/Plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Description: clearsigned data
Content-Disposition: inline
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Greetings
can people review these patches to ensure that I have not forgotten or
screwed anything up?
Basicly these allow for openldap and openssl to compile.
There where some other silly fixes for things to build on gcc 2.95.3
Also is there a good reason why we strip /usr/local/* from the lib and inc
dirs without checking if they are there? Its very frustraiting to have your
ssl and ldap includes silently ignored :)
Cheers
-ian reinhart geiser
- --
========================================
If you live to the age of a hundred you have it made because very few
people die past the age of a hundred.
-- George Burns
========================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQE90IbiPy62TRm8dvgRAnSIAJwLnIUUAfJf60aA1yA/g78fvTdIJgCglFx2
3Jj73lYji6m3ZaXSAaTbpkQ=
=OW3s
-----END PGP SIGNATURE-----
--Boundary-00=_ibI09KAerO1pWuh
Content-Type: text/x-diff;
charset="us-ascii";
name="solaris-kdebase.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="solaris-kdebase.patch"
Index: admin/acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.301
diff -u -r2.301 acinclude.m4.in
--- admin/acinclude.m4.in 2002/10/24 21:21:50 2.301
+++ admin/acinclude.m4.in 2002/11/12 04:25:29
@@ -5230,13 +5230,13 @@
fi
fi
-if test "$ssl_includes" = "/usr/include" || test "$ssl_includes" = "/usr/local/include" || test -z "$ssl_includes"; then
+if test "$ssl_includes" = "/usr/include" || test -z "$ssl_includes"; then
SSL_INCLUDES="";
else
SSL_INCLUDES="-I$ssl_includes"
fi
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries"; then
+if test "$ssl_libraries" = "/usr/lib" || test -z "$ssl_libraries"; then
SSL_LDFLAGS=""
else
SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
--Boundary-00=_ibI09KAerO1pWuh
Content-Type: text/x-diff;
charset="us-ascii";
name="solaris-kdelibs.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="solaris-kdelibs.patch"
Index: admin/acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.301
diff -u -r2.301 acinclude.m4.in
--- admin/acinclude.m4.in 2002/10/24 21:21:50 2.301
+++ admin/acinclude.m4.in 2002/11/12 04:15:19
@@ -5230,13 +5230,13 @@
fi
fi
-if test "$ssl_includes" = "/usr/include" || test "$ssl_includes" = "/usr/local/include" || test -z "$ssl_includes"; then
+if test "$ssl_includes" = "/usr/include" || test -z "$ssl_includes"; then
SSL_INCLUDES="";
else
SSL_INCLUDES="-I$ssl_includes"
fi
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries"; then
+if test "$ssl_libraries" = "/usr/lib" || test -z "$ssl_libraries"; then
SSL_LDFLAGS=""
else
SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
Index: kabc/plugins/ldap/Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kabc/plugins/ldap/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- kabc/plugins/ldap/Makefile.am 2002/07/13 09:05:21 1.5
+++ kabc/plugins/ldap/Makefile.am 2002/11/12 04:15:21
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/kabc $(all_includes)
+INCLUDES = $(LDAP_INCS) -I$(top_srcdir)/kabc $(all_includes)
# these are the headers for your project
noinst_HEADERS = resourceldap.h resourceldapconfig.h
Index: kabc/plugins/ldap/resourceldap.cpp
===================================================================
RCS file: /home/kde/kdelibs/kabc/plugins/ldap/resourceldap.cpp,v
retrieving revision 1.13
diff -u -r1.13 resourceldap.cpp
--- kabc/plugins/ldap/resourceldap.cpp 2002/11/01 15:16:58 1.13
+++ kabc/plugins/ldap/resourceldap.cpp 2002/11/12 04:15:21
@@ -17,6 +17,8 @@
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
+#include <lber.h>
+#include <ldap.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -95,14 +97,14 @@
if ( mPort.isEmpty() )
mPort = "389";
- mLdap = ldap_init( mHost.local8Bit(), mPort.toInt() );
+ mLdap = ldap_init( mHost.local8Bit().data(), mPort.toInt() );
if ( !mLdap ) {
addressBook()->error( i18n( "Unable to connect to server '%1' on port '%2'" ).arg( mHost ).arg( mPort ) );
return false;
}
if ( !mUser.isEmpty() && !mAnonymous ) {
- if ( ldap_simple_bind_s( mLdap, mUser.local8Bit(), mPassword.local8Bit() ) != LDAP_SUCCESS ) {
+ if ( ldap_simple_bind_s( mLdap, mUser.local8Bit().data(), mPassword.local8Bit().data() ) != LDAP_SUCCESS ) {
addressBook()->error( i18n( "Unable to bind to server '%1'" ).arg( mHost ) );
return false;
}
@@ -153,7 +155,7 @@
"uid",
0 };
- if ( ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, QString( "(%1)" ).arg( mFilter ).local8Bit(),
+ if ( ldap_search_s( mLdap, mDn.local8Bit().data(), LDAP_SCOPE_SUBTREE, QString( "(%1)" ).arg( mFilter ).local8Bit().data(),
(char **)LdapSearchAttr, 0, &res ) != LDAP_SUCCESS ) {
addressBook()->error( i18n( "Unable to search on server '%1'" ).arg( mHost ) );
return false;
@@ -253,7 +255,7 @@
QString dn = "cn=" + (*it).assembledName() + "," + mDn;
int retval;
- if ( (retval = ldap_add_s( mLdap, dn.local8Bit(), mods )) != LDAP_SUCCESS )
+ if ( (retval = ldap_add_s( mLdap, dn.local8Bit().data(), mods )) != LDAP_SUCCESS )
addressBook()->error( i18n( "Unable to modify '%1' on server '%2'" ).arg( (*it).uid() ).arg( mHost ) );
ldap_mods_free( mods, 1 );
@@ -275,7 +277,7 @@
kdDebug(5700) << "ldap:removeAddressee" << filter << endl;
- ldap_search_s( mLdap, mDn.local8Bit(), LDAP_SCOPE_SUBTREE, filter.local8Bit(),
+ ldap_search_s( mLdap, mDn.local8Bit().data(), LDAP_SCOPE_SUBTREE, filter.local8Bit().data(),
0, 0, &res );
for ( msg = ldap_first_entry( mLdap, res ); msg; msg = ldap_next_entry( mLdap, msg ) ) {
Index: kabc/plugins/ldap/resourceldap.h
===================================================================
RCS file: /home/kde/kdelibs/kabc/plugins/ldap/resourceldap.h,v
retrieving revision 1.5
diff -u -r1.5 resourceldap.h
--- kabc/plugins/ldap/resourceldap.h 2002/07/28 16:19:19 1.5
+++ kabc/plugins/ldap/resourceldap.h 2002/11/12 04:15:21
@@ -23,9 +23,6 @@
#include <kconfig.h>
-#include <lber.h>
-#include <ldap.h>
-
#include "addressbook.h"
#include "resource.h"
Index: kdecore/kdesktopfile.h
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kdesktopfile.h,v
retrieving revision 1.30
diff -u -r1.30 kdesktopfile.h
--- kdecore/kdesktopfile.h 2002/09/28 12:28:47 1.30
+++ kdecore/kdesktopfile.h 2002/11/12 04:15:23
@@ -115,7 +115,6 @@
/**
* Returns the value of the "Path=" entry.
* @return the path or QString::null if not specified
- * @deprecated
*/
QString readPath() const;
Index: kdecore/kextsock.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kextsock.cpp,v
retrieving revision 1.42
diff -u -r1.42 kextsock.cpp
--- kdecore/kextsock.cpp 2002/10/07 11:09:09 1.42
+++ kdecore/kextsock.cpp 2002/11/12 04:15:26
@@ -21,6 +21,11 @@
**/
#include <config.h>
+#include "kdebug.h"
+#include "kextsock.h"
+#include "ksockaddr.h"
+#include "ksocks.h"
+
#include <sys/types.h>
#include <sys/socket.h>
@@ -49,10 +54,6 @@
#include <qdns.h>
#include <qguardedptr.h>
-#include "kdebug.h"
-#include "kextsock.h"
-#include "ksockaddr.h"
-#include "ksocks.h"
#ifndef HAVE_SOCKADDR_IN6
// The system doesn't have sockaddr_in6
@@ -60,7 +61,6 @@
#define CLOBBER_IN6
#endif
#include "netsupp.h"
-
#include "kextsocklookup.h"
//
@@ -1437,6 +1437,9 @@
d->status = lookupDone;
}
+#ifdef open
+#undef open
+#endif
bool KExtendedSocket::open(int mode)
{
if (mode != IO_Raw | IO_ReadWrite)
Index: kdecore/kextsock.h
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kextsock.h,v
retrieving revision 1.30
diff -u -r1.30 kextsock.h
--- kdecore/kextsock.h 2002/10/03 13:44:52 1.30
+++ kdecore/kextsock.h 2002/11/12 04:15:29
@@ -46,6 +46,7 @@
#define IO_AcceptError (IO_UnspecifiedError+2)
#define IO_LookupError (IO_UnspecifiedError+3)
+
class KExtendedSocketPrivate;
/**
* The extended socket class.
Index: kio/kssl/Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kio/kssl/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- kio/kssl/Makefile.am 2002/05/25 10:58:51 1.27
+++ kio/kssl/Makefile.am 2002/11/12 04:15:46
@@ -1,4 +1,4 @@
-INCLUDES=$(all_includes) $(SSL_INCLUDES)
+INCLUDES=$(SSL_INCLUDES) $(all_includes)
noinst_LTLIBRARIES = libkssl.la
KSSLVERSION= 2.9.8
--Boundary-00=_ibI09KAerO1pWuh--