diff options
| author | root <root@rshg054.dnsready.net> | 2012-09-18 00:20:21 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-09-18 00:20:21 -0700 |
| commit | 0eb0f7dcc1b8f07ad3f0eb5086eafba8f627967d (patch) | |
| tree | 5e9211b5c62c88d15ad6652e0575105433af04dc /testing/qt | |
| parent | d1d75c37c446dfbe9cbae503300e17f2973dbf44 (diff) | |
Tue Sep 18 00:20:18 PDT 2012
Diffstat (limited to 'testing/qt')
| -rw-r--r-- | testing/qt/PKGBUILD | 13 | ||||
| -rw-r--r-- | testing/qt/fix-crash-in-assistant.patch | 11 |
2 files changed, 20 insertions, 4 deletions
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD index d9a30c3cc..b7a869a92 100644 --- a/testing/qt/PKGBUILD +++ b/testing/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166631 2012-09-13 15:17:13Z andrea $ +# $Id: PKGBUILD 166748 2012-09-17 16:06:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -18,19 +18,24 @@ _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-crash-in-assistant.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c439c7731c25387352d8453ca7574971') + 'c439c7731c25387352d8453ca7574971' + '57590084078b6379f0501f7728b02ae2') build() { cd "${srcdir}"/${_pkgfqn} # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch + + # (FS#) + patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/testing/qt/fix-crash-in-assistant.patch b/testing/qt/fix-crash-in-assistant.patch new file mode 100644 index 000000000..4246e0532 --- /dev/null +++ b/testing/qt/fix-crash-in-assistant.patch @@ -0,0 +1,11 @@ +--- 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); + } |