diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2009-10-06 12:08:28 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2009-10-06 12:08:28 (GMT) |
| commit | 6e1a67a02ba8869e92ae9ad9bb48ac7ef0c2a346 (patch) | |
| tree | b507de75b17cc56f3f5329ac9a98c62e9ef25998 /src | |
| parent | 09d2c910d821482f17a2147cd3e1133ee3370056 (diff) | |
| download | mxe-6e1a67a02ba8869e92ae9ad9bb48ac7ef0c2a346.zip mxe-6e1a67a02ba8869e92ae9ad9bb48ac7ef0c2a346.tar.gz mxe-6e1a67a02ba8869e92ae9ad9bb48ac7ef0c2a346.tar.bz2 | |
more bugfixes for package qt
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt-win32.patch | 6 | ||||
| -rw-r--r-- | src/qt.mk | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch index 7921674..e78d819 100644 --- a/src/qt-win32.patch +++ b/src/qt-win32.patch @@ -32,15 +32,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 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 @@ -43,6 +43,8 @@ define $(PKG)_BUILD # 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 @@ define $(PKG)_BUILD -confirm-license \ -xplatform win32-g++ \ -host-arch i386 \ + -host-little-endian \ -little-endian \ -exceptions \ -static \ |