[arch-commits] Commit in qt/trunk (PKGBUILD fix-crash-in-assistant.patch)

[Andrea Scarpino]

    Date: Monday, September 17, 2012 @ 12:05:35
  Author: andrea
Revision: 166747

upgpkg: qt 4.8.3-2

Fix crash in assistant (FS29469)

Added:
  qt/trunk/fix-crash-in-assistant.patch
Modified:
  qt/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   11 ++++++++---
 fix-crash-in-assistant.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-17 15:48:51 UTC (rev 166746)
+++ PKGBUILD	2012-09-17 16:05:35 UTC (rev 166747)
@@ -5,7 +5,7 @@
 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 @@
 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}

Added: fix-crash-in-assistant.patch
===================================================================
--- fix-crash-in-assistant.patch	                        (rev 0)
+++ fix-crash-in-assistant.patch	2012-09-17 16:05:35 UTC (rev 166747)
@@ -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);
+ }