[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Raphael Langerhorst <raphael.langerhorst () kdemail ! net>
Date:       2006-11-25 10:23:16
Message-ID: 1164450196.693803.20307.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 607594 by raphael:

Make kdebase 4 compile on NetBSD.

Note: the infocenter is disabled on NetBSD. It requires more work.
Note: The APM code in ksysguardd/NetBSD/ is only enabled on NetBSD/i386
      because machine/apmvar.h is only available on i386 (/usr/include/i386/apmvar.h)
      and not on amd64 (my current build host)


 M  +5 -1      kcontrol/CMakeLists.txt  
 M  +4 -0      ksysguard/ksysguardd/CMakeLists.txt  
 M  +1 -1      ksysguard/ksysguardd/NetBSD/ProcessList.c  
 M  +3 -0      ksysguard/ksysguardd/NetBSD/apm.c  
 M  +3 -3      ksysguard/ksysguardd/NetBSD/diskstat.c  


--- trunk/KDE/kdebase/workspace/kcontrol/CMakeLists.txt #607593:607594
@@ -50,7 +50,11 @@
 if(X11_Xaccess_FOUND)
 	add_subdirectory( accessibility )
 endif(X11_Xaccess_FOUND)	
-add_subdirectory( infocenter )
+if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
+	message(STATUS "TODO: infocenter is disabled on NetBSD, does not compile yet.")
+else( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
+	add_subdirectory( infocenter )
+endif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
 add_subdirectory( access )
 
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND)
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/CMakeLists.txt #607593:607594
@@ -36,6 +36,10 @@
 if(XRES_LIBRARY)
   TARGET_LINK_LIBRARIES(ksysguardd ${XRES_LIBRARY})
 endif(XRES_LIBRARY)
+if( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
+  message(STATUS "Adding kvm library on NetBSD")
+  TARGET_LINK_LIBRARIES(ksysguardd kvm)
+endif( ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" )
 
 install(TARGETS ksysguardd DESTINATION ${BIN_INSTALL_DIR})
 
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/NetBSD/ProcessList.c #607593:607594
@@ -191,7 +191,7 @@
         ps->ppid      = p.kp_eproc.e_ppid;
         ps->uid       = p.kp_eproc.e_ucred.cr_uid;
         ps->gid       = p.kp_eproc.e_pgid;
-        ps->priority  = p.kp_proc.p_priority;
+        ps->priority  = 0; //p.kp_proc.p_priority; ### TODO NetBSD: migrate to kinfo_proc2
         ps->niceLevel = p.kp_proc.p_nice;
 
         /* this isn't usertime -- it's total time (??) */
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/NetBSD/apm.c #607593:607594
@@ -18,6 +18,8 @@
 
 */
 
+//APM only on NetBSD/i386 ?  raphael.langerhorst@kdemail.net
+#if !defined(__NetBSD__) || defined(__i386__)
 
 #include <fcntl.h>
 #include <machine/apmvar.h>
@@ -98,3 +100,4 @@
 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
 }
 
+#endif
--- trunk/KDE/kdebase/workspace/ksysguard/ksysguardd/NetBSD/diskstat.c #607593:607594
@@ -63,7 +63,7 @@
 
 int numMntPnt(void)
 {
-	struct statfs *fs_info;
+	struct statvfs *fs_info;
 	int i, n, counter = 0;
 
 	n = getmntinfo(&fs_info, MNT_WAIT);
@@ -129,8 +129,8 @@
 
 int updateDiskStat(void)
 {
-	struct statfs *fs_info;
-	struct statfs fs;
+	struct statvfs *fs_info;
+	struct statvfs fs;
 	float percent;
 	int i, mntcount;
 	DiskInfo *disk_info;
[prev in list] [next in list] [prev in thread] [next in thread]