Patches for KDE libs and base on solaris

[Simon Hausmann]

On Mon, Nov 11, 2002 at 11:43:14PM -0500, Ian Reinhart Geiser wrote:
Content-Description: clearsigned data
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Greetings 
> 	can people review these patches to ensure that I have not forgotten or 
> screwed anything up?

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"

These look wrong to me (I can already hear the
we-have-installed-everything-in-usr-local-freebsd guys :-)

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)

Looks good to me.
 
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;

Agreed. Hell knows why this one was marked deprecated :)

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.

Bogus.

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)

Good catch.


Simon