changeset 471:db393d589865

more bugfixes for package qt
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 06 Oct 2009 14:08:28 +0200
parents a07d9f69e2ee
children bc555b3ffd33
files src/qt-win32.patch src/qt.mk
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt-win32.patch	Tue Oct 06 12:17:40 2009 +0200
+++ b/src/qt-win32.patch	Tue Oct 06 14:08:28 2009 +0200
@@ -32,15 +32,13 @@
  QMakeVar add decorations "default windows styled"
  QMakeVar add mouse-drivers "pc"
  if [ "$UNAME_SYSTEM" = "Linux" ] ; then
-@@ -4961,7 +4961,11 @@
+@@ -4961,7 +4961,9 @@
          echo "Basic XLib functionality test failed!"
          echo " You might need to modify the include and library search paths by editing"
          echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
 -        exit 1
 +echo NOTICE: This is a specially modifed configure script!
-+echo For our purposes we do not need or want X11.
-+echo For the natve target we only build the tools.
-+echo For the win32-g++ target there is no X11
++echo For our purposes we do not want X11.
 +#        exit 1
      fi
  
--- a/src/qt.mk	Tue Oct 06 12:17:40 2009 +0200
+++ b/src/qt.mk	Tue Oct 06 14:08:28 2009 +0200
@@ -43,6 +43,8 @@
     # Native, unpatched build of Qt for moc, rcc, uic and qmake
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt)
     mv '$(1)/$(qt_SUBDIR)' '$(1).native'
+    $(SED) 's,PLATFORM_X11=yes,PLATFORM_X11=no,'           -i '$(1)'.native/configure
+    $(SED) 's,PLATFORM=solaris-cc$$,PLATFORM=solaris-g++,' -i '$(1)'.native/configure
     cd '$(1)'.native && ./configure \
         -opensource \
         -confirm-license \
@@ -115,6 +117,7 @@
         -confirm-license \
         -xplatform win32-g++ \
         -host-arch i386 \
+        -host-little-endian \
         -little-endian \
         -exceptions \
         -static \