Chris Cheney writes:
> There appears to be another RC bug now that needs to be fixed as
> well, which I unfortunately don't know how to fix. It causes kdebase
> to fail to build on both mips/mipsel.
> <snip>
Apparently there's a discussion on #kde-devel going on about this.
DanielS is there, fixing the syscall invocations in CVS to something
more portable. I took his patch for kdebase ( there were some
problems in kdeutils too, but those are less urgent, I guess ), and
built it into a patch against the debian/* dirs. Attaching below.
I have tested the "debian/rules configure", and it still works, the
new patch in debian/patches applies cleanly. I have not tested the
entire compilation, but I assume DanielS has done this properly.
> IMHO we should fix this problem in the next upload as well.
Agreed. It's just that before the last upload was made, there were
some 2 months that kdebase had major RC bugs, and I don't think we can
afford that again, especially at this stage in the Debian release
cycle.
Thanks for your work.
cheers
domi
diff -u -rNubB kdebase-3.1.4/debian/patches/07_syscall.diff kdebase-3.1.4.mod/debian/patches/07_syscall.diff
--- kdebase-3.1.4/debian/patches/07_syscall.diff 1970-01-01 01:00:00.000000000 +0100
+++ kdebase-3.1.4.mod/debian/patches/07_syscall.diff 2003-12-23 00:55:47.000000000 +0100
@@ -0,0 +1,29 @@
+Index: kcontrol/info/memory_linux.cpp
+===================================================================
+RCS file: /home/kde/kdebase/kcontrol/info/memory_linux.cpp,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -u -b -B -r1.5 -r1.6
+--- kdebase/kcontrol/info/memory_linux.cpp 27 Jan 2002 17:34:24 -0000 1.5
++++ kdebase.mod/kcontrol/info/memory_linux.cpp 22 Dec 2003 23:22:10 -0000 1.6
+@@ -1,17 +1,17 @@
+-#include <syscall.h>
++#include <sys/sysinfo.h>
+ #include <linux/kernel.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <qfile.h>
+
+-/* $Id: memory_linux.cpp,v 1.5 2002/01/27 17:34:24 adrian Exp $ */
++/* $Id: memory_linux.cpp,v 1.6 2003/12/22 23:22:10 dstone Exp $ */
+
+ void KMemoryWidget::update()
+ {
+ struct sysinfo info;
+ int shift_val;
+
+- syscall(SYS_sysinfo, &info); /* Get Information from system... */
++ sysinfo(&info); /* Get Information from system... */
+
+ /* try to fix the change, introduced with kernel 2.3.25, which
+ now counts the memory-information in pages (not bytes anymore) */
