Bug#542591: kdebase-workspace: FTBFS on GNU/kFreeBSD
Package: kdebase-workspace
Version: 4:4.3.0-2
Severity: important
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs changes to debian packaging and tweaks for sources.
Please find attached two patches with them.
The debian packaging part excludes linux only packages from
build-depends and adds kfreebsd only build-depends (libdevstat-dev)
and adds corresponding install file.
The sources part is mainly
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
and
-#if __FreeBSD_version >= 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
It would also be nice if you can ask upstream
to include changes from kdebase-workspace-src.diff.
Thanks in advance
Petr
diff -u kdebase-workspace-4.3.0/debian/control kdebase-workspace-4.3.0/debian/control
--- kdebase-workspace-4.3.0/debian/control
+++ kdebase-workspace-4.3.0/debian/control
@@ -7,8 +7,13 @@
kdelibs5-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.3.0), libboost-dev,
python-support (>= 0.6), python-dev,
libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libck-connector-dev, libdbus-1-dev, libnm-util-dev (>= 0.7), network-manager-dev (>= 0.7.0),
- libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2), libraw1394-dev, libsensors-dev,
+ libck-connector-dev, libdbus-1-dev,
+ libnm-util-dev (>= 0.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ network-manager-dev (>= 0.7.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libpam0g-dev, libqimageblitz-dev (>= 1:0.0.4-2),
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
libstrigiqtdbusclient-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libusb-dev, libxkbfile-dev,
libxcomposite-dev, libxdamage-dev, libxfixes-dev, libxklavier12-dev,
libxrandr-dev, libxrender-dev, libxxf86misc-dev, libxi-dev,
only in patch2:
unchanged:
--- kdebase-workspace-4.3.0.orig/debian/kdebase-workspace-bin.install.kfreebsd
+++ kdebase-workspace-4.3.0/debian/kdebase-workspace-bin.install.kfreebsd
@@ -0,0 +1,162 @@
+usr/bin/kaccess
+usr/bin/kapplymousetheme
+usr/bin/kblankscrn.kss
+usr/bin/kcheckrunning
+usr/bin/kcminit
+usr/bin/kcminit_startup
+usr/bin/kdostartupconfig4
+usr/bin/kfontinst
+usr/bin/kfontview
+usr/bin/kmenuedit
+usr/bin/krandom.kss
+usr/bin/krandrtray
+usr/bin/krdb
+usr/bin/krunner
+usr/bin/ksmserver
+usr/bin/ksplashsimple
+usr/bin/ksplashx
+usr/bin/ksplashx_scale
+usr/bin/kstartupconfig4
+usr/bin/ksystraycmd
+usr/bin/kwrited
+usr/bin/kxkb
+usr/bin/plasma-desktop
+usr/bin/plasma-overlay
+usr/bin/plasmaengineexplorer
+usr/bin/plasmawallpaperviewer
+usr/bin/plasmoidviewer
+usr/bin/polkit-kde-authorization
+usr/bin/safestartkde
+usr/bin/solid-action-desktop-gen
+usr/bin/startkde
+usr/lib/kconf_update_bin/krdb_clearlibrarypath
+usr/lib/kconf_update_bin/plasma-add-shortcut-to-menu
+usr/lib/kconf_update_bin/plasma-to-plasma-desktop
+usr/lib/kde4/fontthumbnail.so
+usr/lib/kde4/kcm_access.so
+usr/lib/kde4/kcm_autostart.so
+usr/lib/kde4/kcm_bell.so
+usr/lib/kde4/kcm_clock.so
+usr/lib/kde4/kcm_desktopthemedetails.so
+usr/lib/kde4/kcm_display.so
+usr/lib/kde4/kcm_energy.so
+usr/lib/kde4/kcm_fontinst.so
+usr/lib/kde4/kcm_hotkeys.so
+usr/lib/kde4/kcm_input.so
+usr/lib/kde4/kcm_keyboard.so
+usr/lib/kde4/kcm_keyboard_layout.so
+usr/lib/kde4/kcm_keys.so
+usr/lib/kde4/kcm_ksplashthemes.so
+usr/lib/kde4/kcm_launch.so
+usr/lib/kde4/kcm_pkk_authorization.so
+usr/lib/kde4/kcm_powerdevilconfig.so
+usr/lib/kde4/kcm_randr.so
+usr/lib/kde4/kcm_screensaver.so
+usr/lib/kde4/kcm_smserver.so
+usr/lib/kde4/kcm_solid.so
+usr/lib/kde4/kcm_solid_actions.so
+usr/lib/kde4/kcm_standard_actions.so
+usr/lib/kde4/kcm_xinerama.so
+usr/lib/kde4/kded_kephal.so
+usr/lib/kde4/kded_khotkeys.so
+usr/lib/kde4/kded_notificationitemwatcher.so
+usr/lib/kde4/kded_powerdevil.so
+usr/lib/kde4/kfontviewpart.so
+usr/lib/kde4/kio_fonts.so
+usr/lib/kde4/krunner_bookmarksrunner.so
+usr/lib/kde4/krunner_calculatorrunner.so
+usr/lib/kde4/krunner_locations.so
+usr/lib/kde4/krunner_nepomuksearchrunner.so
+usr/lib/kde4/krunner_placesrunner.so
+usr/lib/kde4/krunner_powerdevil.so
+usr/lib/kde4/krunner_recentdocuments.so
+usr/lib/kde4/krunner_services.so
+usr/lib/kde4/krunner_sessions.so
+usr/lib/kde4/krunner_shell.so
+usr/lib/kde4/krunner_webshortcuts.so
+usr/lib/kde4/kstyle_keramik_config.so
+usr/lib/kde4/libexec/kcheckpass
+usr/lib/kde4/libexec/kcmdatetimehelper
+usr/lib/kde4/libexec/kfontprint
+usr/lib/kde4/libexec/kio_fonts_helper
+usr/lib/kde4/libexec/kscreenlocker
+usr/lib/kde4/libexec/polkit-kde-manager
+usr/lib/kde4/libexec/test_kcm_xinerama
+usr/lib/kde4/plasma_wallpaper_color.so
+usr/lib/kde4/plasma_wallpaper_image.so
+usr/lib/kde4/solid_fakenet.so
+usr/lib/kde4/solid_wicd.so
+usr/lib/libkdeinit4_kaccess.so
+usr/lib/libkdeinit4_kcminit.so
+usr/lib/libkdeinit4_kcminit_startup.so
+usr/lib/libkdeinit4_kmenuedit.so
+usr/lib/libkdeinit4_krunner.so
+usr/lib/libkdeinit4_ksmserver.so
+usr/lib/libkdeinit4_kxkb.so
+usr/lib/libkdeinit4_plasma-desktop.so
+usr/lib/libkhotkeysprivate.so.4
+usr/lib/libkhotkeysprivate.so.4.3.0
+usr/lib/libpolkitkdeprivate.so.4
+usr/lib/libpolkitkdeprivate.so.4.3.0
+usr/lib/strigi/strigita_font.so
+usr/share/applications/kde4/kfontview.desktop
+usr/share/applications/kde4/kmenuedit.desktop
+usr/share/applications/kde4/krandrtray.desktop
+usr/share/autostart/krunner.desktop
+usr/share/autostart/kwrited-autostart.desktop
+usr/share/autostart/plasma-desktop.desktop
+usr/share/kde4/apps/kcmsolidactions/solid-action-template.desktop
+usr/share/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+usr/share/kde4/services/ScreenSavers/kblank.desktop
+usr/share/kde4/services/ScreenSavers/krandom.desktop
+usr/share/kde4/services/ServiceMenus/installfont.desktop
+usr/share/kde4/services/autostart.desktop
+usr/share/kde4/services/bell.desktop
+usr/share/kde4/services/clock.desktop
+usr/share/kde4/services/desktopthemedetails.desktop
+usr/share/kde4/services/display.desktop
+usr/share/kde4/services/energy.desktop
+usr/share/kde4/services/fontinst.desktop
+usr/share/kde4/services/fontthumbnail.desktop
+usr/share/kde4/services/kaccess.desktop
+usr/share/kde4/services/kcm_keyboard.desktop
+usr/share/kde4/services/kcm_pkk_authorization.desktop
+usr/share/kde4/services/kcm_solid.desktop
+usr/share/kde4/services/kcmaccess.desktop
+usr/share/kde4/services/kcmlaunch.desktop
+usr/share/kde4/services/kcmsmserver.desktop
+usr/share/kde4/services/kded/kephal.desktop
+usr/share/kde4/services/kded/khotkeys.desktop
+usr/share/kde4/services/kded/notificationitemwatcher.desktop
+usr/share/kde4/services/kded/powerdevil.desktop
+usr/share/kde4/services/keyboard.desktop
+usr/share/kde4/services/keyboard_layout.desktop
+usr/share/kde4/services/keys.desktop
+usr/share/kde4/services/kfontviewpart.desktop
+usr/share/kde4/services/khotkeys.desktop
+usr/share/kde4/services/ksplashthememgr.desktop
+usr/share/kde4/services/mouse.desktop
+usr/share/kde4/services/plasma-runner-bookmarks.desktop
+usr/share/kde4/services/plasma-runner-calculator.desktop
+usr/share/kde4/services/plasma-runner-locations.desktop
+usr/share/kde4/services/plasma-runner-nepomuksearch.desktop
+usr/share/kde4/services/plasma-runner-places.desktop
+usr/share/kde4/services/plasma-runner-powerdevil.desktop
+usr/share/kde4/services/plasma-runner-services.desktop
+usr/share/kde4/services/plasma-runner-sessions.desktop
+usr/share/kde4/services/plasma-runner-shell.desktop
+usr/share/kde4/services/plasma-runner-webshortcuts.desktop
+usr/share/kde4/services/plasma-wallpaper-color.desktop
+usr/share/kde4/services/plasma-wallpaper-image.desktop
+usr/share/kde4/services/powerdevilconfig.desktop
+usr/share/kde4/services/randr.desktop
+usr/share/kde4/services/recentdocuments.desktop
+usr/share/kde4/services/screensaver.desktop
+usr/share/kde4/services/settings-input-actions.desktop
+usr/share/kde4/services/solid-actions.desktop
+usr/share/kde4/services/solidbackends/solid_fakenet.desktop
+usr/share/kde4/services/solidbackends/solid_wicd.desktop
+usr/share/kde4/services/standard_actions.desktop
+usr/share/kde4/services/xinerama.desktop
+usr/share/kde4/servicetypes/screensaver.desktop
+usr/share/man/man1/plasmaengineexplorer.1
only in patch2:
unchanged:
--- kdebase-workspace-4.3.0.orig/ksysguard/ksysguardd/CMakeLists.txt
+++ kdebase-workspace-4.3.0/ksysguard/ksysguardd/CMakeLists.txt
@@ -18,6 +18,10 @@
configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h)
+if( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
+ add_subdirectory( "FreeBSD" )
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
+else( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
add_subdirectory( "FreeBSD" )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD )
@@ -30,6 +34,7 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" )
+endif( ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD" )
########### next target ###############
only in patch2:
unchanged:
--- kdebase-workspace-4.3.0.orig/ksysguard/ksysguardd/FreeBSD/ProcessList.c
+++ kdebase-workspace-4.3.0/ksysguard/ksysguardd/FreeBSD/ProcessList.c
@@ -33,7 +33,7 @@
#include <sys/resourcevar.h>
#endif
-#if __FreeBSD_version > 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
#include <sys/priority.h>
#endif
#include <sys/sysctl.h>
@@ -203,7 +203,7 @@
if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len)
return -1;
-#if __FreeBSD_version >= 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
ps->pid = p.ki_pid;
ps->ppid = p.ki_ppid;
ps->uid = p.ki_uid;
@@ -231,7 +231,7 @@
#endif
/* this isn't usertime -- it's total time (??) */
-#if __FreeBSD_version >= 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
ps->userTime = p.ki_runtime / 10000;
#elif defined(__DragonFly__)
#if __DragonFly_version >= 190000
@@ -260,7 +260,7 @@
if (fscale == 0)
ps->userLoad = 0;
else
-#if __FreeBSD_version >= 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
ps->userLoad = 100.0 * (double) p.ki_pctcpu / fscale;
ps->vmSize = p.ki_size;
ps->vmRss = p.ki_rssize * getpagesize();
@@ -380,7 +380,7 @@
sysctl(mib, 3, p, &len, NULL, 0);
for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
-#if __FreeBSD_version >= 500015
+#if (__FreeBSD_version > 500015) || (__FreeBSD_kernel_version > 500015)
updateProcess(p[num].ki_pid);
#elif __DragonFly_version >= 190000
/* Skip kernel threads with pid -1. Swapper with pid 0 also
only in patch2:
unchanged:
--- kdebase-workspace-4.3.0.orig/libs/ksysguard/processcore/processes_local_p.cpp
+++ kdebase-workspace-4.3.0/libs/ksysguard/processcore/processes_local_p.cpp
@@ -21,7 +21,7 @@
#if defined __linux__
#include "processes_linux_p.cpp"
-#elif defined __FreeBSD__ || defined __DragonFly__
+#elif defined __FreeBSD__ || defined __FreeBSD_kernel__ || defined __DragonFly__
#include "processes_freebsd_p.cpp"
#elif defined __OpenBSD__
#include "processes_openbsd_p.cpp"
only in patch2:
unchanged:
--- kdebase-workspace-4.3.0.orig/libs/ksysguard/processcore/processes_freebsd_p.cpp
+++ kdebase-workspace-4.3.0/libs/ksysguard/processcore/processes_freebsd_p.cpp
@@ -78,7 +78,7 @@
process->setTracerpid(0);
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
process->setEuid(p->ki_uid);
process->setUid(p->ki_ruid);
process->setEgid(p->ki_svgid);
@@ -98,7 +98,7 @@
{
int status;
struct rusage pru;
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
ps->setUserTime(p->ki_rusage.ru_utime.tv_sec * 100 + p->ki_rusage.ru_utime.tv_usec / 10000);
ps->setSysTime(p->ki_rusage.ru_stime.tv_sec * 100 + p->ki_rusage.ru_stime.tv_usec / 10000);
ps->setNiceLevel(p->ki_nice);
@@ -185,7 +185,7 @@
struct kinfo_proc p;
if(d->readProc(pid, &p))
{
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
ppid = p.ki_ppid;
#elif defined(__DragonFly__) && __DragonFly_version >= 190000
ppid = p.kp_ppid;
@@ -230,7 +230,7 @@
for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
{
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
long pid = p[num].ki_pid;
long long ppid = p[num].ki_ppid;
#elif defined(__DragonFly__) && __DragonFly_version >= 190000
Reply to: