Merge remote-tracking branch 'x/master'

* x/master:
  qt: enable gtk theme support, requested by davehome.
This commit is contained in:
davehome 2011-11-09 02:51:09 -07:00
commit cc79e609a1

View file

@ -1,7 +1,7 @@
# Template file for 'qt' # Template file for 'qt'
pkgname=qt pkgname=qt
version=4.7.4 version=4.7.4
revision=1 revision=2
_distname=qt-everywhere-opensource-src _distname=qt-everywhere-opensource-src
wrksrc=${_distname}-${version} wrksrc=${_distname}-${version}
homepage="http://qt.nokia.com/" homepage="http://qt.nokia.com/"
@ -69,6 +69,7 @@ Add_dependency build libICE-devel
Add_dependency build libmysqlclient-devel Add_dependency build libmysqlclient-devel
Add_dependency build postgresql-libs-devel Add_dependency build postgresql-libs-devel
Add_dependency build pulseaudio-devel Add_dependency build pulseaudio-devel
Add_dependency build gtk+-devel
do_configure() { do_configure() {
export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${wrksrc}/lib:${LD_LIBRARY_PATH}"
@ -90,11 +91,11 @@ do_configure() {
-system-libtiff -system-libpng -system-libmng -system-libjpeg \ -system-libtiff -system-libpng -system-libmng -system-libjpeg \
-openssl-linked -optimized-qmake -no-rpath -reduce-relocations \ -openssl-linked -optimized-qmake -no-rpath -reduce-relocations \
-no-separate-debug-info -gtkstyle -opengl -glib \ -no-separate-debug-info -gtkstyle -opengl -glib \
-no-sql-db2 -no-sql-ibase \ -no-sql-db2 -no-sql-ibase -gtkstyle \
-plugin-sql-mysql -plugin-sql-psql -no-sql-oci \ -plugin-sql-mysql -plugin-sql-psql -no-sql-oci \
-no-sql-odbc -no-sql-sqlite2 \ -no-sql-odbc -no-sql-sqlite2 \
-no-cups -dbus-linked -no-nas-sound -iconv -shared \ -no-cups -dbus-linked -no-nas-sound -iconv -shared \
-release -fast -no-sql-tds -no-gtkstyle -release -fast -no-sql-tds
} }
do_build() { do_build() {