SVN commit 728094 by adridg: Make-it-compile on FreeBSD, which needs extra includes for the VFS stuff in Solid. Tested on Mandriva One 2007 and FBSD 6-STABLE. CCMAIL: kde-freebsd@kde.org
M +3 -0 ConfigureChecks.cmake M +9 -0 config-workspace.h.cmake M +16 -0 plasma/dataengines/soliddevice/soliddeviceengine.cpp --- trunk/KDE/kdebase/workspace/ConfigureChecks.cmake #728093:728094 @@ -48,6 +48,9 @@ check_include_files(limits.h HAVE_LIMITS_H) check_include_files(sys/time.h HAVE_SYS_TIME_H) # ksmserver, ksplashml, sftp check_include_files(stdint.h HAVE_STDINT_H) # kcontrol/kfontinst +check_include_files("sys/stat.h;sys/vfs.h" HAVE_SYS_VFS_H) # statvfs for plasma/solid +check_include_files(sys/param.h HAVE_SYS_PARAM_H) +check_include_files("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H) macro_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) # kcontrol/{fonts,kfontinst} macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL) # kwin macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash --- trunk/KDE/kdebase/workspace/config-workspace.h.cmake #728093:728094 @@ -54,6 +54,12 @@ /* Define to 1 if you have the <sys/loadavg.h> header file. */ #cmakedefine HAVE_SYS_LOADAVG_H 1 +/* Define to 1 if you have the <sys/mount.h> header file. */ +#cmakedefine HAVE_SYS_MOUNT_H 1 + +/* Define to 1 if you have the <sys/param.h> header file. */ +#cmakedefine HAVE_SYS_PARAM_H 1 + /* Define to 1 if you have the <sys/select.h> header file. */ #cmakedefine HAVE_SYS_SELECT_H 1 @@ -66,6 +72,9 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #cmakedefine HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the <sys/vfs.h> header file. */ +#cmakedefine HAVE_SYS_VFS_H 1 + /* Define to 1 if you have the <sys/wait.h> header file. */ #cmakedefine HAVE_SYS_WAIT_H 1 --- trunk/KDE/kdebase/workspace/plasma/dataengines/soliddevice/soliddeviceengine.cpp #728093:728094 @@ -16,6 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "config-workspace.h" + #include "soliddeviceengine.h" #include <KDebug> @@ -23,8 +25,22 @@ #include "plasma/datacontainer.h" +// The pattern here is: +// FreeBSD: param + mount +// Linux: stat + vfs +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + +#ifdef HAVE_SYS_MOUNT_H +#include <sys/mount.h> +#endif + #include <sys/stat.h> + +#ifdef HAVE_SYS_VFS_H #include <sys/vfs.h> +#endif SolidDeviceEngine::SolidDeviceEngine(QObject* parent, const QVariantList& args) : Plasma::DataEngine(parent) _______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd