[SCM] Qt 4 packaging branch, master, updated. debian/4.8.2-1-4-g330efa4

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=625e5db

The following commit has been merged in the master branch:
commit 625e5db15bc94c7aed6c808b0f03b186cf53d916
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jul 20 12:34:14 2012 -0300

    Add a patch to solve assistant's segfault on startup.
    
    QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch made by
    Than Ngo.
---
 debian/changelog                                   |    3 ++
 ..._assistant_segfault_on_start_with_gcc_4.7.patch |   21 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2441e49..363322f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qt4-x11 (4:4.8.2-2) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch made by
+    Than Ngo to solve a segfault during assistant's startup (Closes: #679874).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 20 Jul 2012 12:28:16 -0300
 
diff --git a/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
new file mode 100644
index 0000000..c56c6a4
--- /dev/null
+++ b/debian/patches/QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
@@ -0,0 +1,21 @@
+Description: fixes segfault on Assistant's startup
+ This patch calls the static method QApplication::allWidgets()
+ intead of storing them first.
+Author: Than Ngo <than at redhat.com>
+Origin: https://bugreports.qt-project.org/browse/QTBUG-25324?focusedCommentId=179933&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-179933
+Bug: https://bugreports.qt-project.org/browse/QTBUG-25324
+Bug-Debian: http://bugs.debian.org/679874
+Forwarded: not-needed
+
+--- qt4-x11-4.8.2.orig/tools/assistant/tools/assistant/mainwindow.cpp
++++ qt4-x11-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp
+@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont()
+     if (helpEngine.usesAppFont())
+         font = helpEngine.appFont();
+ 
+-    const QWidgetList &widgets = qApp->allWidgets();
+-    foreach (QWidget* widget, widgets)
++    foreach (QWidget* widget, QApplication::allWidgets())
+         widget->setFont(font);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8bd1e5f..f7b6174 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -45,3 +45,4 @@ add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 CVE-2011-3922.patch
 qt_atomic_sparc64.patch
 no_libicu_message.diff
+QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch

-- 
Qt 4 packaging