6 May 22:56
[PATCH] FreeBSD: pmap_enter() and Qt4 Frontend
Hi vbox-dev! This are some patches that we created to compile virtualbox on FreeBSD. http://home.bluelife.at/ports/virtualbox/upstream/vbox-freebsd-memobj-r0drv.diff The pmap_enter() change already got merged to 7-stable on 26. Feb 2009 so the correct __FreeBSD_version is 701105. http://svn.freebsd.org/viewvc/base?view=revision&revision=189075 http://home.bluelife.at/ports/virtualbox/upstream/vbox-missing-events.diff Qt4 on FreeBSD does intentionally not automatically include QEvent* classes so we needed to include them wherever they were missing. http://home.bluelife.at/ports/virtualbox/upstream/vbox-qt3-includes.diff There are a few Qt3 style includes left which break building when Qt3 and Qt4 headers are installed on the system. All patches are under the MIT License. -- Bernhard Froehlich http://www.bluelife.at/
--- src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c.orig 2009-05-05 18:12:11.000000000 +0200
+++ src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c 2009-05-05 18:27:11.000000000 +0200
@@ -617,7 +617,7 @@
{
vm_page_t Page = PHYS_TO_VM_PAGE(vtophys(AddrToMap));
-#if __FreeBSD_version >= 800002
+#if __FreeBSD_version >= 701105
pmap_enter(pPhysicalMap, AddrR3Dst, VM_PROT_NONE, Page, ProtectionFlags, TRUE);
#else
pmap_enter(pPhysicalMap, AddrR3Dst, Page, ProtectionFlags, TRUE);
diff -ru src.orig/VBox/Frontends/VirtualBox/include/COMDefs.h src/VBox/Frontends/VirtualBox/include/COMDefs.h
--- src.orig/VBox/Frontends/VirtualBox/include/COMDefs.h 2009-02-10 10:14:31.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/include/COMDefs.h 2009-05-06 22:07:49.000000000 +0200
@@ -83,6 +83,7 @@
#include <QString>
#include <QUuid>
#include <QVector>
+#include <QMetaType>
#include <iprt/memory> // for auto_copy_ptr
diff -ru src.orig/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h
--- src.orig/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h 2009-04-23
11:21:43.000000000 +0200
+++ src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h 2009-05-06 22:07:54.000000000 +0200
@@ -29,6 +29,8 @@
#include <QImage>
#include <QPixmap>
#include <QMutex>
+#include <QPaintEvent>
+#include <QMoveEvent>
#if defined (VBOX_GUI_USE_SDL)
#include <SDL.h>
diff -ru src.orig/VBox/Frontends/VirtualBox/src/QILabel.cpp src/VBox/Frontends/VirtualBox/src/QILabel.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/QILabel.cpp 2009-02-19 18:06:40.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/src/QILabel.cpp 2009-05-06 22:08:12.000000000 +0200
@@ -34,6 +34,10 @@
#include <QApplication>
#include <QPainter>
#include <QStyleOptionFocusRect>
+#include <QMouseEvent>
+#include <QMimeData>
+#include <QContextMenuEvent>
+#include <QFocusEvent>
/* @todo: Compare the minimal size behavior in the qt3 & qt4 version. */
diff -ru src.orig/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp src/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp 2009-03-18 18:30:16.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/src/QIMessageBox.cpp 2009-05-06 22:08:16.000000000 +0200
@@ -37,6 +37,7 @@
#include <QStyleOptionFocusRect>
#include <QStylePainter>
#include <QToolButton>
+#include <QKeyEvent>
/** @class QIRichToolButton
*
diff -ru src.orig/VBox/Frontends/VirtualBox/src/VBoxFilePathSelectorWidget.cpp src/VBox/Frontends/VirtualBox/src/VBoxFilePathSelectorWidget.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/VBoxFilePathSelectorWidget.cpp 2009-04-21
18:29:50.000000000 +0200
+++ src/VBox/Frontends/VirtualBox/src/VBoxFilePathSelectorWidget.cpp 2009-05-06
22:08:23.000000000 +0200
@@ -33,6 +33,7 @@
#include <QLineEdit>
#include <QTimer>
#include <QPushButton>
+#include <QFocusEvent>
////////////////////////////////////////////////////////////////////////////////
// VBoxFilePathSelectorWidget
diff -ru src.orig/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2009-04-29 14:14:48.000000000 +0200
+++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2009-05-06 22:08:26.000000000 +0200
@@ -50,6 +50,7 @@
#include <QPainter>
#include <QTimer>
#include <QDir>
+#include <QHelpEvent>
#include <math.h>
diff -ru src.orig/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp 2009-04-28
15:19:14.000000000 +0200
+++ src/VBox/Frontends/VirtualBox/src/VBoxMediaManagerDlg.cpp 2009-05-06 22:08:33.000000000 +0200
@@ -36,7 +36,9 @@
#include <QUrl>
#include <QProgressBar>
#include <QTimer>
-
+#include <QCloseEvent>
+#include <QDragEnterEvent>
+#include <QDropEvent>
class AddVDMUrlsEvent: public QEvent
{
diff -ru src.orig/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp src/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp 2009-03-26
11:34:25.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/src/VBoxProgressDialog.cpp 2009-05-06 22:08:37.000000000 +0200
@@ -31,6 +31,7 @@
/* Qt includes */
#include <QProgressDialog>
#include <QEventLoop>
+#include <QCloseEvent>
const char *VBoxProgressDialog::sOpDescTpl = "%1... (%2/%3)";
diff -ru src.orig/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp
--- src.orig/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp 2008-12-09 16:21:55.000000000 +0100
+++ src/VBox/Frontends/VirtualBox/src/VBoxVMLogViewer.cpp 2009-05-06 22:08:46.000000000 +0200
@@ -37,6 +37,7 @@
#include <QFileDialog>
#include <QDateTime>
#include <QPushButton>
+#include <QKeyEvent>
VBoxVMLogViewer::LogViewersMap VBoxVMLogViewer::mSelfArray = LogViewersMap();
diff -ru src.orig/VBox/Frontends/VirtualBox/include/VBoxDefs.h src/VBox/Frontends/VirtualBox/include/VBoxDefs.h --- src.orig/VBox/Frontends/VirtualBox/include/VBoxDefs.h 2008-12-18 15:46:02.000000000 +0100 +++ src/VBox/Frontends/VirtualBox/include/VBoxDefs.h 2009-05-06 22:01:07.000000000 +0200 @@ -24,7 +24,7 @@ #define __VBoxDefs_h__ /* Qt includes */ -#include <qevent.h> +#include <QEvent> #include <QUuid> #define LOG_GROUP LOG_GROUP_GUI diff -ru src.orig/VBox/Frontends/VirtualBox/src/main.cpp src/VBox/Frontends/VirtualBox/src/main.cpp --- src.orig/VBox/Frontends/VirtualBox/src/main.cpp 2009-04-26 19:31:59.000000000 +0200 +++ src/VBox/Frontends/VirtualBox/src/main.cpp 2009-05-06 22:01:12.000000000 +0200 @@ -40,9 +40,9 @@ #include <QCleanlooksStyle> #include <QPlastiqueStyle> -#include <qmessagebox.h> -#include <qlocale.h> -#include <qtranslator.h> +#include <QMessageBox> +#include <QLocale> +#include <QTranslator> #include <iprt/err.h> #include <iprt/initterm.h>
RSS Feed