- more lang

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

diff --git a/VirtualBox-qt-paths.patch b/VirtualBox-qt-paths.patch
index 58cef82d23f96cb6d4d6716e6f7fe4a81beaed1a..687da6bb467e9176a45f75e6d29ef9da424659a4 100644 (file)
--- a/VirtualBox-qt-paths.patch
+++ b/VirtualBox-qt-paths.patch
@@ -9,10 +9,10 @@ diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
 -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)
  
  ifeq ($(KBUILD_TARGET),os2)
   # search DLLs in the EXE directory first (unless VBOX_DLL_QT is set)
@@ -21,20 +21,7 @@ diff -urN VirtualBox-2.0.0.orig/Config.kmk VirtualBox-2.0.0/Config.kmk
  TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
  TEMPLATE_VBOXQTGUIEXE_INCS = \
 -      $(VBOX_PATH_QT)/include
-+      /usr/include/qt
++      /usr/include/qt4
  
  ifeq ($(KBUILD_TARGET),win)
   # drag in library configuration (we need QMAKE_PRL_DEFINES)
-@@ -2750,10 +2750,10 @@
- 
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--      $(VBOX_PATH_QT)/lib64 $(VBOX_PATH_QT)/lib
-+      /usr/lib64 /usr/lib
-  else
-   TEMPLATE_VBOXQTGUIEXE_LIBPATH = \
--      $(VBOX_PATH_QT)/lib
-+      /usr/lib
-  endif
- 
-  ifeq ($(KBUILD_TARGET),linux)