Mercurial > mxe-octave

diff src/qt.mk @ 822:4a0fe1fd4abc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix: phonon backend does not depend on glib and gstreamer in package qt The configure script assumes that gstreamer is the phonon backend but ds9 is used for mingw32. This patch fixes this in the configure script. We now invoke configure with -no-glib and -no-gstreamer. Also fixed case of GL include directory reference. Some syntactic improvements suggested upstream.
author Mark Brand <mabrand@mabrand.nl>
date Mon, 01 Mar 2010 00:45:03 +0100
parents 6d2133800cef
children 77ecd36317c2
line wrap: on
line diff
--- a/src/qt.mk	Fri Feb 26 16:56:01 2010 +0100
+++ b/src/qt.mk	Mon Mar 01 00:45:03 2010 +0100
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://qt.nokia.com/
 $(PKG)_URL      := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl libgcrypt zlib libpng jpeg libmng tiff sqlite libiconv glib
+$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl libgcrypt zlib libpng jpeg libmng tiff sqlite libiconv
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
@@ -116,6 +116,8 @@
         -script \
         -opengl desktop \
         -no-webkit \
+        -no-glib \
+        -no-gstreamer \
         -no-phonon \
         -no-phonon-backend \
         -accessibility \