[SCM] KDE Base Workspace module packaging branch, squeeze, updated. debian/4.4.5-4-9-g27d3cde

Didier Raboud odyx-guest at alioth.debian.org
Sun Nov 28 10:44:30 UTC 2010


The following commit has been merged in the squeeze branch:
commit 27d3cde3479b33aabe8023457d7bab26b5ada6f5
Author: Didier Raboud <didier at raboud.com>
Date:   Sun Nov 28 11:43:15 2010 +0100

    Fix a segfault in qguiplatformplugin_kde, thanks to David Alan Gilbert (patch 33_qguiplatformplugin_kde_NULL_check.diff). (Closes: #603480)
---
 debian/changelog                                   |    5 +++++
 .../33_qguiplatformplugin_kde_NULL_check.diff      |   19 +++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1897fc2..b7cd106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 kdebase-workspace (4:4.4.5-5) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Add patch 31_kdm_vt_switching_on_kfreebsd.diff which implements VT
     switching and status detection support in KDM on kFreeBSD. This should
     fix an issue with with KDM hijacking VT2 on bootup. (Closes: #586540)
   * Fix ksmserver crash on logout. It's 100% reproducible on kfreebsd-amd64.
   * Make kdebase-workspace-bin Replace and Break kdesktop. (Closes: #605135)
 
+  [ Didier Raboud ]
+  * Fix a segfault in qguiplatformplugin_kde, thanks to David Alan Gilbert
+    (patch 33_qguiplatformplugin_kde_NULL_check.diff). (Closes: #603480)
+
  -- Modestas Vainius <modax at debian.org>  Sat, 27 Nov 2010 01:02:53 +0200
 
 kdebase-workspace (4:4.4.5-4) unstable; urgency=low
diff --git a/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff b/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
new file mode 100644
index 0000000..78b03e4
--- /dev/null
+++ b/debian/patches/33_qguiplatformplugin_kde_NULL_check.diff
@@ -0,0 +1,19 @@
+Description: Fixes crashes caused by making objects hidden before they have
+ ever been set as visible.
+Author: "Dr. David Alan Gilbert" <debian at treblig.org>
+Signed-By: Didier Raboud <didier at raboud.com>
+Bugs-Debian: #603480
+Last-Update: 2010-11-28
+--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
++++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+@@ -246,7 +246,9 @@
+             kdefd->setConfirmOverwrite(qfd->confirmOverwrite());
+             kdefd->setSelection(qfd->selectedFiles().value(0));
+         }
+-        kdefd->setVisible(visible);
++        if (kdefd) {
++            kdefd->setVisible(visible);
++        }
+         return true;
+     }
+     virtual QDialog::DialogCode fileDialogResultCode(QFileDialog *qfd)
diff --git a/debian/patches/series b/debian/patches/series
index bbea0bf..6badc34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,5 +17,6 @@
 30_plasma_netbook_fix_autostart.diff
 31_kdm_vt_switching_on_kfreebsd.diff
 32_ksmserver_fadeeffect_use_sse2_free.diff
+33_qguiplatformplugin_kde_NULL_check.patch
 97_fix_target_link_libraries.diff
 99_solid_network_use_ntrack.diff

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list