diff -Naur kdelibs-3.0beta2.orig/arts/flow/gsl/gslengine.h kdelibs-3.0beta2/arts/flow/gsl/gslengine.h
--- kdelibs-3.0beta2.orig/arts/flow/gsl/gslengine.h	Sat Jan 26 08:51:56 2002
+++ kdelibs-3.0beta2/arts/flow/gsl/gslengine.h	Wed Feb 13 17:24:49 2002
@@ -88,13 +88,13 @@
 {
   const gfloat *values;
   guint		user_flags : 16;
-  const guint	connected : 1;
+  guint	connected : 1;
 };
 struct _GslOStream
 {
   gfloat     *values;
   guint	      user_flags : 16;
-  const guint connected : 1;
+  guint connected : 1;
   guint	      zero_initialize : 1;
 };
 
diff -Naur kdelibs-3.0beta2.orig/arts/flow/gsl/gslglib.h kdelibs-3.0beta2/arts/flow/gsl/gslglib.h
--- kdelibs-3.0beta2.orig/arts/flow/gsl/gslglib.h	Thu Jan  3 12:33:03 2002
+++ kdelibs-3.0beta2/arts/flow/gsl/gslglib.h	Wed Feb 13 17:24:49 2002
@@ -23,6 +23,7 @@
 #include <float.h>
 #include <stddef.h>
 #include <stdarg.h>
+#include <config.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -157,10 +158,10 @@
 /* GCC does the right thing */
 # undef alloca
 # define alloca(size)   __builtin_alloca (size)
-#elif defined (GLIB_HAVE_ALLOCA_H)
+#elif defined (HAVE_ALLOCA_H)
 /* a native and working alloca.h is there */ 
 # include <alloca.h>
-#else /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
+#else /* !__GNUC__ && !HAVE_ALLOCA_H */
 # ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
@@ -173,7 +174,7 @@
 #   endif /* !alloca */
 #  endif /* !_AIX */
 # endif /* !_MSC_VER */
-#endif /* !__GNUC__ && !GLIB_HAVE_ALLOCA_H */
+#endif /* !__GNUC__ && !HAVE_ALLOCA_H */
 
 #define g_alloca(size) alloca (size)
 #define g_newa(struct_type, n_structs)  ((struct_type*) g_alloca (sizeof (struct_type) * (gsize) (n_structs)))
diff -Naur kdelibs-3.0beta2.orig/arts/flow/gsl/gslopnode.h kdelibs-3.0beta2/arts/flow/gsl/gslopnode.h
--- kdelibs-3.0beta2.orig/arts/flow/gsl/gslopnode.h	Sat Jan 26 08:51:57 2002
+++ kdelibs-3.0beta2/arts/flow/gsl/gslopnode.h	Wed Feb 13 17:24:49 2002
@@ -193,6 +193,8 @@
 void _gsl_op_debug    (GslEngineDebugLevel lvl,
 		       const gchar        *format,
 		       ...) G_GNUC_PRINTF (2,3);
+#else
+#define OP_DEBUG
 #endif
 
 void	_op_engine_inc_counter	(guint64	delta);
diff -Naur kdelibs-3.0beta2.orig/arts/flow/gsl/gsltests.c kdelibs-3.0beta2/arts/flow/gsl/gsltests.c
--- kdelibs-3.0beta2.orig/arts/flow/gsl/gsltests.c	Sat Jan 26 08:51:57 2002
+++ kdelibs-3.0beta2/arts/flow/gsl/gsltests.c	Wed Feb 13 17:24:49 2002
@@ -531,7 +531,7 @@
 	}
       } while (f[0] && v[0]);
 
-      gsl_filter_fir_approx (iorder, a, freq, value, n_points);
+      gsl_filter_fir_approx (iorder, a, n_points, freq, value);
       g_print ("FIR%u(z)=%s\n", iorder, gsl_poly_str (iorder-1, a, "z"));
     }
   else if (strncmp (arg, "poly", 4) == 0)
diff -Naur kdelibs-3.0beta2.orig/kdeui/kmenubar.cpp kdelibs-3.0beta2/kdeui/kmenubar.cpp
--- kdelibs-3.0beta2.orig/kdeui/kmenubar.cpp	Fri Feb  8 18:05:23 2002
+++ kdelibs-3.0beta2/kdeui/kmenubar.cpp	Wed Feb 13 17:24:49 2002
@@ -112,7 +112,7 @@
     // why is this still needed? (Simon)
     if ( d->topLevel && isVisible() )
 	return;
-    return QMenuBar::show();
+    QMenuBar::show();
 }
 
 void KMenuBar::slotReadConfig()
diff -Naur kdelibs-3.0beta2.orig/khtml/dom/dom_element.cpp kdelibs-3.0beta2/khtml/dom/dom_element.cpp
--- kdelibs-3.0beta2.orig/khtml/dom/dom_element.cpp	Thu Jan 10 14:55:12 2002
+++ kdelibs-3.0beta2/khtml/dom/dom_element.cpp	Wed Feb 13 17:24:49 2002
@@ -151,7 +151,7 @@
 
 void Element::removeAttribute( const DOMString &name )
 {
-    return removeAttributeNS(DOMString(), name);
+    removeAttributeNS(DOMString(), name);
 }
 
 Attr Element::getAttributeNode( const DOMString &name )
diff -Naur kdelibs-3.0beta2.orig/kio/kio/kfilemetainfo.h kdelibs-3.0beta2/kio/kio/kfilemetainfo.h
--- kdelibs-3.0beta2.orig/kio/kio/kfilemetainfo.h	Tue Jan 29 10:46:50 2002
+++ kdelibs-3.0beta2/kio/kio/kfilemetainfo.h	Wed Feb 13 17:24:49 2002
@@ -255,7 +255,6 @@
      **/
     KFilePlugin * const plugin() const;
 
-    class Data;
     Data* d;
 };
 
--- kdelibs-3.0beta2.orig/configure.in	Sat Feb  9 08:29:41 2002
+++ kdelibs-3.0beta2/configure.in	Wed Feb 13 17:57:55 2002
@@ -653,7 +653,7 @@
 
 dnl check for IRIX audio support
 AC_MSG_CHECKING([for IRIX])
-if test `uname` = "IRIX" ; then
+if test `uname` = "IRIX" -o `uname` = "IRIX64" ; then
   AC_DEFINE(HAVE_IRIX, 1, [Define if you compile under IRIX])
   AC_MSG_RESULT("yes")
 else