diff options
| author | root <root@rshg054.dnsready.net> | 2012-06-29 00:01:58 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-06-29 00:01:58 +0000 |
| commit | eb4c1f17fe6790f814a67378ed66bddbb93def96 (patch) | |
| tree | 8d9a601807e65342ae8c6c59df40ffd168403e8f /extra/qt | |
| parent | ad4cbb616af1b40790c6533f1d5b98dbd7aaa199 (diff) | |
Fri Jun 29 00:01:58 UTC 2012
Diffstat (limited to 'extra/qt')
| -rw-r--r-- | extra/qt/PKGBUILD | 17 | ||||
| -rw-r--r-- | extra/qt/fix-assistant-crash.patch | 12 |
2 files changed, 23 insertions, 6 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index b62e713bd..43ac1a361 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $ +# $Id: PKGBUILD 162529 2012-06-27 06:33:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' - 'mysql' 'unixodbc' 'cups' 'gtk2') + 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient') options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'improve-cups-support.patch') + 'improve-cups-support.patch' + 'fix-assistant-crash.patch') md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971') + 'c439c7731c25387352d8453ca7574971' + 'e9c11e4606b7f55ae405e3e76f863dc1') build() { cd "${srcdir}"/${_pkgfqn} # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch + + patch -p1 -i "${srcdir}"/fix-assistant-crash.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} @@ -49,7 +53,7 @@ build() { -sysconfdir /etc/xdg \ -examplesdir /usr/share/doc/qt/examples \ -demosdir /usr/share/doc/qt/demos \ - -plugin-sql-{psql,mysql,sqlite,odbc} \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ -system-sqlite \ -no-phonon \ -no-phonon-backend \ @@ -76,6 +80,7 @@ package_qt() { optdepends=('postgresql-libs: PostgreSQL driver' 'libmysqlclient: MySQL driver' 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' 'libxinerama: Xinerama support' 'libxcursor: Xcursor support' 'libxfixes: Xfixes support') diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch new file mode 100644 index 000000000..67bbbc48b --- /dev/null +++ b/extra/qt/fix-assistant-crash.patch @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp 2012-06-26 17:37:47.334536023 +0000 ++++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~ 2012-06-26 17:37:08.531487286 +0000 +@@ -944,8 +944,7 @@ + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } + |