- more lang

[packages/VirtualBox.git] / VirtualBox-qt-paths.patch

diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch
index 080f96964d6695831409ec1aee486ef35777541c..687da6bb467e9176a45f75e6d29ef9da424659a4 100644 (file)
--- a/VirtualBox-qt-paths.patch
+++ b/VirtualBox-qt-paths.patch
@@ -1,6 +1,7 @@
---- Config.kmk.orig    2007-01-16 11:39:32.000000000 +0100
-+++ Config.kmk 2007-01-18 14:32:24.000000000 +0100
-@@ -838,10 +838,10 @@
+diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
+--- VirtualBox-2.0.0.orig/Config.kmk   2008-09-03 20:16:30.000000000 +0200
++++ VirtualBox-2.0.0/Config.kmk        2008-09-04 20:06:51.000000000 +0200
+@@ -1694,10 +1694,10 @@
  else
   VBOX_PATH_QT_HOST ?= $(QTDIR)
  endif
@@ -8,28 +9,19 @@
 -VBOX_MOC      ?= $(VBOX_PATH_QT_HOST)/bin/moc$(HOSTSUFF_EXE)
 -VBOX_LUPDATE  ?= $(VBOX_PATH_QT_HOST)/bin/lupdate$(HOSTSUFF_EXE)
 -VBOX_LRELEASE ?= $(VBOX_PATH_QT_HOST)/bin/lrelease$(HOSTSUFF_EXE)
-+VBOX_UIC      ?= /usr/bin/uic$(HOSTSUFF_EXE)
-+VBOX_MOC      ?= /usr/bin/moc$(HOSTSUFF_EXE)
-+VBOX_LUPDATE  ?= /usr/bin/lupdate$(HOSTSUFF_EXE)
-+VBOX_LRELEASE ?= /usr/bin/lrelease$(HOSTSUFF_EXE)
++VBOX_UIC      ?= /usr/bin/uic-qt4$(HOSTSUFF_EXE)
++VBOX_MOC      ?= /usr/bin/moc-qt4$(HOSTSUFF_EXE)
++VBOX_LUPDATE  ?= /usr/bin/lupdate-qt4$(HOSTSUFF_EXE)
++VBOX_LRELEASE ?= /usr/bin/lrelease-qt4$(HOSTSUFF_EXE)
  
- #
- # The linux kernel headers(/sources).
-@@ -1441,7 +1441,7 @@
+ ifeq ($(KBUILD_TARGET),os2)
+  # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
+@@ -2686,7 +2686,7 @@
+ TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
  TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
  TEMPLATE_VBOXQTGUIEXE_INCS = \
-       $(PATH_BIN)/sdk/include \
 -      $(VBOX_PATH_QT)/include
-+      /usr/include/qt
++      /usr/include/qt4
  
- ifeq ($(BUILD_TARGET),win)
-  TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_VCC_TOOL)
-@@ -1498,7 +1498,7 @@
-       $(PATH_LIB)/VBoxXPCOMGlue$(VBOX_SUFF_LIB)
- 
-  TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--      $(VBOX_PATH_QT)/lib \
-+      /usr/lib \
-       /usr/X11R6/lib
- 
- endif
+ ifeq ($(KBUILD_TARGET),win)
+  # drag in library configuration (we need QMAKE_PRL_DEFINES)